增加法语和德语。

src/main/java/com/neotel/smfcore/core/language/rest/LanguageSetController.java

@@ -21,10 +21,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -36,22 +34,37 @@ public class LanguageSetController {
     @Autowired
     DataCache dataCache;
 
-    public  List<LanguageInfo> getAllLanList() {
-
+    public  List<LanguageInfo> getAllLanList( ) {
+        return getAllLanList(MessageUtils.getDefaultLocal());
+    }
+    public  List<LanguageInfo> getAllLanList(Locale locale) {
 //        List<LanguageInfo> lanList = dataCache.getCache(Constants.CACHE_languageType);
 //        if (lanList == null || lanList.size() <= 0) {
 //            lanList = MessageUtils.getDefaultLanList();
 //            dataCache.updateCache(Constants.CACHE_languageType, lanList);
 //        }
-       return dataCache.getLanguageList();
+        if(locale==null){
+            locale= MessageUtils.getDefaultLocal();
+        }
+
+        List<LanguageInfo> lanList = dataCache.getLanguageList();
+
+        //没有缩写的加上
+        for (int i = 0; i < lanList.size(); i++) {
+            String disName = MessageUtils.getText("smfcore.language.displayLanName." + lanList.get(i).getLanCode(), locale, "");
+            if (ObjectUtil.isEmpty(lanList.get(i).getDisplayLanName())) {
+                lanList.get(i).setDisplayLanName(disName);
+            }
+        }
+        return lanList;
     }
 
     @ApiOperation("获取语言列表")
     @GetMapping
     @AnonymousAccess
 //    @PreAuthorize("@el.check('translation')")
-    public List<LanguageInfo> getList(){
-        return getAllLanList();
+    public List<LanguageInfo> getList(HttpServletRequest request){
+        return getAllLanList(request.getLocale());
     }
     @ApiOperation("新增语言")
     @PostMapping

src/main/java/com/neotel/smfcore/core/language/service/bean/LanguageInfo.java

@@ -24,6 +24,12 @@ public class LanguageInfo implements Serializable {
     private String lanName;
 
     /**
+     * 登录界面显示的语言名称，简写
+     */
+    @ApiModelProperty("登录界面显示文本：CN,EN 等")
+    private String displayLanName;
+
+    /**
      * 语言图标
      */
     @ApiModelProperty("语言图标")

src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java

@@ -85,6 +85,8 @@ public class MessageUtils {
     public static final String ZH_TW = "zh-TW";
     public static final String EN_US = "en-US";
     public static final String JA_JP = "ja-JP";
+    public static final String FR_FR="fr-FR";
+    public static final String DE_DE="de-DE";
 
     //服务器type
     public static final String smfcore="smfcore";
@@ -227,10 +229,12 @@ public class MessageUtils {
         List<LanguageInfo> lanList = new ArrayList<>();
         if (lanList == null || lanList.size() <= 0) {
             lanList=new ArrayList<>();
-            lanList.add(new LanguageInfo(MessageUtils.ZH_CN,"简体中文",""));
-            lanList.add(new LanguageInfo(MessageUtils.ZH_TW,"繁体中文",""));
-            lanList.add(new LanguageInfo(MessageUtils.EN_US,"English",""));
-            lanList.add(new LanguageInfo(MessageUtils.JA_JP,"日本语",""));
+            lanList.add(new LanguageInfo(MessageUtils.ZH_CN,"简体中文","CN",""));
+            lanList.add(new LanguageInfo(MessageUtils.ZH_TW,"繁体中文","TW",""));
+            lanList.add(new LanguageInfo(MessageUtils.EN_US,"English","EN",""));
+            lanList.add(new LanguageInfo(MessageUtils.JA_JP,"日本语","JP",""));
+            lanList.add(new LanguageInfo(MessageUtils.FR_FR,"Français","FR",""));
+            lanList.add(new LanguageInfo(MessageUtils.DE_DE,"Deutsch","DE",""));
         }
         return lanList;
     }

src/main/resources/messages.properties

@@ -414,4 +414,10 @@ smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F
 smfcore.equipApiMsg.updateTime=\u65F6\u95F4
 smfcore.equipApiMsg.state=\u7C7B\u578B
 smfcore.equipment.view.nsgroup=Neo Scan
-smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file
+smfcore.equipment.view.apigroup=Pick and Place Machine
+smfcore.language.displayLanName.zh-CN=CN
+smfcore.language.displayLanName.zh-TW=TW
+smfcore.language.displayLanName.en-US=US
+smfcore.language.displayLanName.ja-JP=JP
+smfcore.language.displayLanName.fr-FR=FR
+smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -405,4 +405,10 @@ smfcore.equipApiMsg.response=Result/Details
 smfcore.equipApiMsg.updateTime=Time
 smfcore.equipApiMsg.state=Type
 smfcore.equipment.view.nsgroup=Neo Scan
-smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file
+smfcore.equipment.view.apigroup=Pick and Place Machine
+smfcore.language.displayLanName.zh-CN=CN
+smfcore.language.displayLanName.zh-TW=TW
+smfcore.language.displayLanName.en-US=US
+smfcore.language.displayLanName.ja-JP=JP
+smfcore.language.displayLanName.fr-FR=FR
+smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -402,3 +402,9 @@ smfcore.equipApiMsg.updateTime=\u6642\u9593
 smfcore.equipApiMsg.state=\u30B9\u30C6\u30FC\u30BF\u30B9
 smfcore.equipment.view.nsgroup=\u30CD\u30AA\u30B9\u30AD\u30E3\u30F3
 smfcore.equipment.view.apigroup=\u30D4\u30C3\u30AF\u30A2\u30F3\u30C9\u30D7\u30EC\u30FC\u30B9\u30DE\u30B7\u30F3
+smfcore.language.displayLanName.zh-CN=CN
+smfcore.language.displayLanName.zh-TW=TW
+smfcore.language.displayLanName.en-US=US
+smfcore.language.displayLanName.ja-JP=JP
+smfcore.language.displayLanName.fr-FR=FR
+smfcore.language.displayLanName.de-DE=DE

src/main/resources/messages_zh_CN.properties

@@ -401,4 +401,10 @@ smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F
 smfcore.equipApiMsg.updateTime=\u65F6\u95F4
 smfcore.equipApiMsg.state=\u7C7B\u578B
 smfcore.equipment.view.nsgroup=Neo Scan
-smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file
+smfcore.equipment.view.apigroup=Pick and Place Machine
+smfcore.language.displayLanName.zh-CN=CN
+smfcore.language.displayLanName.zh-TW=TW
+smfcore.language.displayLanName.en-US=US
+smfcore.language.displayLanName.ja-JP=JP
+smfcore.language.displayLanName.fr-FR=FR
+smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -401,4 +401,10 @@ smfcore.equipApiMsg.response=\u7ED3\u679C\u4FE1\u606F
 smfcore.equipApiMsg.updateTime=\u65F6\u95F4
 smfcore.equipApiMsg.state=\u7C7B\u578B
 smfcore.equipment.view.nsgroup=Neo Scan
-smfcore.equipment.view.apigroup=Pick and Place Machine
\ No newline at end of file
+smfcore.equipment.view.apigroup=Pick and Place Machine
+smfcore.language.displayLanName.zh-CN=CN
+smfcore.language.displayLanName.zh-TW=TW
+smfcore.language.displayLanName.en-US=US
+smfcore.language.displayLanName.ja-JP=JP
+smfcore.language.displayLanName.fr-FR=FR
+smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file