导入功能开发、导出代码优化

application/src/main/java/org/thingsboard/server/glossary/constants/DataConvertMap.java

@@ -4,8 +4,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class DataConvertMap {
-    public static final Map<String, Object> pageConvertMap = new ConcurrentHashMap<>()
-    {{
+    public static final Map<String, Object> pageConvertMap = new ConcurrentHashMap<>();
+    static{
         pageConvertMap.put("companyId", "setCompanyName");
         pageConvertMap.put("reviewedCompany", "setReviewedCompanyName");
         pageConvertMap.put("leadingCompanyId", "setLeadingCompanyName");
@@ -44,7 +44,7 @@ public class DataConvertMap {
         pageConvertMap.put("reviewedUser", "setReviewedUserName");
         pageConvertMap.put("cooperatePersonId", "setCooperatePersonName");
         pageConvertMap.put("leaderId", new String[]{"setLeaderName", "setLeaderPhone"});
-    }};
+    };
 
     public static final String [] basicConvertMap = new String[]{"companyId,leadingCompanyId,liableCompanyId,cooperateCompanyId", "leadingDepartmentId,cooperateDepartmentId"
             , "areaCode", "carTypeCode,typeCode,domainId,industryId,responseLevelCode,eventLevelCode,alarmLevelCode,alarmRiskLevelCode,alarmTypeCode,productId,warningLevelCode" +

application/src/main/java/org/thingsboard/server/service/nanxi/impl/BasicDataConvertServiceImpl.java

@@ -1,9 +1,9 @@
 package org.thingsboard.server.service.nanxi.impl;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
@@ -55,57 +55,59 @@ public class BasicDataConvertServiceImpl implements IBasicDataConvertService {
                 Field field = item.getClass().getDeclaredField(key);
                 field.setAccessible(true);
                 String codeVal = String.valueOf(field.get(item));
-                if(StringUtils.isEmpty(codeVal)) continue;
+                if(StringUtils.isEmpty(codeVal)) {
+                    continue;
+                }
                 if(value instanceof String){
-                    this.invoke(item, codeVal, value.toString(), cache);
+                    this.invoke(item, key, codeVal, value.toString(), cache);
                 } else if (value instanceof String []) {
                     for (String f : (String[]) value) {
-                        this.invoke(item, codeVal, f, cache);
+                        this.invoke(item, key, codeVal, f, cache);
                     }
                 }
             }
         }
     }
-    private void invoke(Object item, String keyVal, String field, Cache cache) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+    private void invoke(Object item, String key, String keyVal, String field, Cache cache) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         Method setMethodName = item.getClass().getMethod(field, String.class);
         if(!cache.containsKey(keyVal)){
-            cache.putCache(keyVal, execute(keyVal));
+            cache.putCache(keyVal, execute(key, keyVal));
         }
         setMethodName.invoke(item, cache.getCache(keyVal));
 
     }
 
-    private String execute(String keyword){
+    private String execute(String keyword, String keyVal){
         if(basicConvertMap[0].contains(keyword)){
-            OrganizationDTO organization = commonService.findTkOrganizationById(keyword);
+            OrganizationDTO organization = commonService.findTkOrganizationById(keyVal);
             return Objects.isNull(organization) ? null : organization.getName();
         } else if (basicConvertMap[1].contains(keyword)) {
-            SysDeptEntity dept = commonService.findDeptById(keyword);
+            SysDeptEntity dept = commonService.findDeptById(keyVal);
             return Objects.isNull(dept) ? null : dept.getDeptName();
         } else if (basicConvertMap[2].contains(keyword)) {
-            SysAreaDTO area = commonService.findAreaById(Long.parseLong(keyword));
+            SysAreaDTO area = commonService.findAreaById(Long.parseLong(keyVal));
             return Objects.isNull(area) ? null : area.getName();
         } else if (basicConvertMap[3].contains(keyword)) {
-            SysDictItemDTO dictItem = commonService.findSysDictItemById(keyword);
+            SysDictItemDTO dictItem = commonService.findSysDictItemById(keyVal);
             return Objects.isNull(dictItem) ? null : dictItem.getItemText();
         } else if (basicConvertMap[4].contains(keyword)) {
-            NxEventTypeManagement eventType = eventTypeManagementService.getById(keyword);
+            NxEventTypeManagement eventType = eventTypeManagementService.getById(keyVal);
             return Objects.isNull(eventType) ? null : eventType.getEventType();
         } else if (basicConvertMap[5].contains(keyword)) {
-            NxStorehouseManagement storehouse = storehouseManagementService.getById(keyword);
+            NxStorehouseManagement storehouse = storehouseManagementService.getById(keyVal);
             return Objects.isNull(storehouse) ? null : storehouse.getName();
         } else if (basicConvertMap[6].contains(keyword)) {
-            NxWarningTypeManagement warningType = warningTypeManagementService.getById(keyword);
+            NxWarningTypeManagement warningType = warningTypeManagementService.getById(keyVal);
             return Objects.isNull(warningType) ? null : warningType.getWarningType();
         } else if (basicConvertMap[7].contains(keyword)) {
-            NxReservePlan reservePlan = reservePlanService.getById(keyword);
+            NxReservePlan reservePlan = reservePlanService.getById(keyVal);
             return Objects.isNull(reservePlan) ? null : reservePlan.getName();
         } else if (basicConvertMap[8].contains(keyword)) {
-            NxExpertDatabase expert = expertDatabaseService.getById(keyword);
+            NxExpertDatabase expert = expertDatabaseService.getById(keyVal);
             return Objects.isNull(expert) ? null : expert.getExpertName();
         } else if (basicConvertMap[9].contains(keyword)) {
             UserInfo userInfo = new UserInfo();
-            userInfo.setId(keyword);
+            userInfo.setId(keyVal);
             List<UserInfo> users = commonService.getUserInfo(userInfo);
             return CollectionUtils.isEmpty(users) ? null : users.get(0).getRealName();
         }

application/src/main/java/org/thingsboard/server/utils/Cache.java

@@ -9,7 +9,7 @@ public class Cache {
     private Map<String, Object> cacheMap;
 
     public Cache() {
-        this.cacheMap = new ConcurrentHashMap<>();
+        this.cacheMap = new HashMap<>();
     }
 
     public Object getCache(String key) {