用户管理增加语言名称。

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

@@ -38,11 +38,6 @@ public class LanguageSetController {
         return getAllLanList(MessageUtils.getDefaultLocal());
         return getAllLanList(MessageUtils.getDefaultLocal());
     }
     }
     public  List<LanguageInfo> getAllLanList(Locale locale) {
     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);
-//        }
         if(locale==null){
         if(locale==null){
             locale= MessageUtils.getDefaultLocal();
             locale= MessageUtils.getDefaultLocal();
         }
         }

src/main/java/com/neotel/smfcore/security/rest/UserController.java

@@ -20,6 +20,8 @@ import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.csv.CsvReader;
 import com.neotel.smfcore.common.csv.CsvReader;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.common.utils.*;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.language.service.bean.LanguageInfo;
 import com.neotel.smfcore.security.bean.FileProperties;
 import com.neotel.smfcore.security.bean.FileProperties;
 import com.neotel.smfcore.security.bean.RsaProperties;
 import com.neotel.smfcore.security.bean.RsaProperties;
 import com.neotel.smfcore.security.rest.bean.dto.UserDto;
 import com.neotel.smfcore.security.rest.bean.dto.UserDto;
@@ -68,6 +70,8 @@ public class UserController {
 
 
     @Autowired
     @Autowired
     private final FileProperties properties;
     private final FileProperties properties;
+    @Autowired
+   private DataCache dataCache;
 
 
     @ApiOperation("导出用户数据")
     @ApiOperation("导出用户数据")
     @GetMapping(value = "/download")
     @GetMapping(value = "/download")
@@ -85,7 +89,17 @@ public class UserController {
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         PageData<User> userPageData = userManager.findByPage(query, pageable);
         PageData<User> userPageData = userManager.findByPage(query, pageable);
         List<UserDto> dtos = userManager.listToDto(userPageData.getContent());
         List<UserDto> dtos = userManager.listToDto(userPageData.getContent());
-        return new PageData<>(dtos,userPageData.getTotalElements());
+        List<LanguageInfo> lanList = dataCache.getLanguageList();
+        for (int i = 0; i < dtos.size(); i++) {
+            String lan=dtos.get(i).getLanguage().replace("_","-");
+            for (LanguageInfo lang : lanList) {
+                if (lang.getLanCode().equalsIgnoreCase(dtos.get(i).getLanguage())||lang.getLanCode().equalsIgnoreCase(lan)) {
+                    dtos.get(i).setLanName(lang.getLanName());
+                    break;
+                }
+            }
+        }
+        return new PageData<>(dtos, userPageData.getTotalElements());
     }
     }
 
 
     @ApiOperation("新增用户")
     @ApiOperation("新增用户")

src/main/java/com/neotel/smfcore/security/rest/bean/dto/UserDto.java

@@ -55,4 +55,7 @@ public class UserDto implements Serializable {
     @ApiModelProperty("头像")
     @ApiModelProperty("头像")
     private String imageStr;
     private String imageStr;
 
 
+    @ApiModelProperty("语言名称：简体中文，繁体中文 等")
+    private String lanName;
+
 }
 }

src/main/resources/messages.properties

@@ -76,7 +76,7 @@ smfcore.barcode=\u6761\u7801\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.user=\u7528\u6237\u7BA1\u7406
 smfcore.user=\u7528\u6237\u7BA1\u7406
-smfcore.peoples=\u7528\u6237\u7BA1\u7406
+smfcore.peoples=\u8D26\u53F7\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
 smfcore.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
 smfcore.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3
 smfcore.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3

src/main/resources/messages_de_DE.properties

@@ -76,7 +76,7 @@ smfcore.barcode=Barcodeverwaltung
 smfcore.log=Protokollverwaltung
 smfcore.log=Protokollverwaltung
 smfcore.taskLog=Materialprotokoll
 smfcore.taskLog=Materialprotokoll
 smfcore.user=Benutzerverwaltung
 smfcore.user=Benutzerverwaltung
-smfcore.peoples=Benutzerverwaltung
+smfcore.peoples=Kontoverwaltung
 smfcore.role=Rollenverwaltung
 smfcore.role=Rollenverwaltung
 smfcore.menuNotExist=Men\u00FC{0} existiert nicht
 smfcore.menuNotExist=Men\u00FC{0} existiert nicht
 smfcore.noValidStorage=Kein verf\u00FCgbares Lagerhaus in der Lagerhausliste gefunden
 smfcore.noValidStorage=Kein verf\u00FCgbares Lagerhaus in der Lagerhausliste gefunden

src/main/resources/messages_en_US.properties

@@ -77,7 +77,7 @@ smfcore.barcode=MA ID Manager
 smfcore.log=Big Data
 smfcore.log=Big Data
 smfcore.taskLog=Material Log
 smfcore.taskLog=Material Log
 smfcore.user=Users
 smfcore.user=Users
-smfcore.peoples=Users
+smfcore.peoples=Account Management
 smfcore.role=Authority
 smfcore.role=Authority
 smfcore.menuNotExist=Menu{0} does not exist
 smfcore.menuNotExist=Menu{0} does not exist
 smfcore.noValidStorage=No available bin found in bin list
 smfcore.noValidStorage=No available bin found in bin list

src/main/resources/messages_fr_FR.properties

@@ -76,7 +76,7 @@ smfcore.barcode=Gestion des codes-barres
 smfcore.log=Gestion des journaux
 smfcore.log=Gestion des journaux
 smfcore.taskLog=Journal des mat\u00E9riaux
 smfcore.taskLog=Journal des mat\u00E9riaux
 smfcore.user=Gestion des utilisateurs
 smfcore.user=Gestion des utilisateurs
-smfcore.peoples=Gestion des utilisateurs
+smfcore.peoples=Gestion de compte
 smfcore.role=Gestion des r\u00F4les
 smfcore.role=Gestion des r\u00F4les
 smfcore.menuNotExist=Le menu {0} n'existe pas
 smfcore.menuNotExist=Le menu {0} n'existe pas
 smfcore.noValidStorage=Aucun silo disponible trouv\u00E9 dans la liste des silos
 smfcore.noValidStorage=Aucun silo disponible trouv\u00E9 dans la liste des silos

src/main/resources/messages_ja_JP.properties

@@ -74,7 +74,7 @@ smfcore.barcode=\u30D0\u30FC\u30B3\u30FC\u30C9\u7BA1\u7406
 smfcore.log=\u30ED\u30B0\u7BA1\u7406
 smfcore.log=\u30ED\u30B0\u7BA1\u7406
 smfcore.taskLog=\u30DE\u30C6\u30EA\u30A2\u30EB\u30ED\u30B0
 smfcore.taskLog=\u30DE\u30C6\u30EA\u30A2\u30EB\u30ED\u30B0
 smfcore.user=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
 smfcore.user=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
-smfcore.peoples=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
+smfcore.peoples=\u30A2\u30AB\u30A6\u30F3\u30C8\u7BA1\u7406
 smfcore.role=\u5F79\u5272\u7BA1\u7406
 smfcore.role=\u5F79\u5272\u7BA1\u7406
 smfcore.menuNotExist=\u30E1\u30CB\u30E5\u30FC{0}\u304C\u5B58\u5728\u3057\u306A\u3044
 smfcore.menuNotExist=\u30E1\u30CB\u30E5\u30FC{0}\u304C\u5B58\u5728\u3057\u306A\u3044
 smfcore.noValidStorage=\u30D3\u30F3\u30EA\u30B9\u30C8\u306B\u5229\u7528\u53EF\u80FD\u306A\u30D3\u30F3\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 smfcore.noValidStorage=\u30D3\u30F3\u30EA\u30B9\u30C8\u306B\u5229\u7528\u53EF\u80FD\u306A\u30D3\u30F3\u304C\u898B\u3064\u304B\u3089\u306A\u3044

src/main/resources/messages_zh_CN.properties

@@ -76,7 +76,7 @@ smfcore.barcode=\u6761\u7801\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.user=\u7528\u6237\u7BA1\u7406
 smfcore.user=\u7528\u6237\u7BA1\u7406
-smfcore.peoples=\u7528\u6237\u7BA1\u7406
+smfcore.peoples=\u8D26\u53F7\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
 smfcore.menuNotExist=\u83DC\u5355{0}\u4E0D\u5B58\u5728
 smfcore.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3
 smfcore.noValidStorage=\u6599\u4ED3\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u4ED3

src/main/resources/messages_zh_TW.properties

@@ -75,7 +75,7 @@ smfcore.barcode=\u689D\u78BC\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.log=\u65E5\u5FD7\u7BA1\u7406
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.taskLog=\u7269\u6599\u65E5\u5FD7
 smfcore.user=\u7528\u6236\u7BA1\u7406
 smfcore.user=\u7528\u6236\u7BA1\u7406
-smfcore.peoples=\u7528\u6236\u7BA1\u7406
+smfcore.peoples=\u8CEC\u865F\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.role=\u89D2\u8272\u7BA1\u7406
 smfcore.menuNotExist=\u83DC\u55AE{0}\u4E0D\u5B58\u5728
 smfcore.menuNotExist=\u83DC\u55AE{0}\u4E0D\u5B58\u5728
 smfcore.noValidStorage=\u6599\u5009\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u5009
 smfcore.noValidStorage=\u6599\u5009\u5217\u8868\u4E2D\u672A\u627E\u5230\u53EF\u7528\u7684\u6599\u5009