添加为空处理

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -638,9 +638,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 //        Map<String, Map<String, Object>> result = responseModel.getResult();
         String alias = String.valueOf(map.get("alias"));
         if (ObjectUtils.isEmpty(alias)) {
-            return null;
+            return new HashMap<>();
         }
         EquipmentTypeEnum equipmentMessage = EquipmentTypeEnum.getEnumByCode(alias);
+        if (equipmentMessage == null && ObjectUtils.isEmpty(equipmentMessage)){
+            return new HashMap<>();
+        }
         HashMap<String, Map<String, Object>> result = new HashMap<>();
         // 使用信息
         Map<String, Object> useInfo = getUseInfo(map);
@@ -681,6 +684,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      */
     private Map<String, Object> getUseInfo(Map<String, Object> map) {
         Map<String, Object> useInfo = equipmentCategoryMapper.selectTzsUseInfo(String.valueOf(map.get("id")));
+        if (ObjectUtils.isEmpty(useInfo)){
+            return new HashMap<>();
+        }
         useInfo.put("LONGITUDE_LATITUDE", JSON.parse(String.valueOf(useInfo.get("LONGITUDE_LATITUDE"))));
         return useInfo;
     }
@@ -708,11 +714,17 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             case "3000":
                 // 电梯
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 result.put("EXPLOSIONPROOF_SIGN_COMPLETE", JSON.parseArray(String.valueOf(result.get("EXPLOSIONPROOF_SIGN_COMPLETE"))));
                 break;
             case "4000":
                 // 起重机械
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 List<Map<String, Object>> lbjJriInfo = equipmentCategoryMapper.selectTzslbjJriInfo(String.valueOf(map.get("id")));
                 List<Map<String, Object>> aqfjJriInfo = equipmentCategoryMapper.selectTzsaqfjJriInfo(String.valueOf(map.get("id")));
                 result.put("subForm_bqirdyvztt", lbjJriInfo);
@@ -722,6 +734,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             case "5000":
                 // 厂车
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 List<Map<String, Object>> celbjJriInfo = equipmentCategoryMapper.selectTzslbjJriInfo(String.valueOf(map.get("id")));
                 result.put("subForm_sey164b51a", celbjJriInfo);
                 result.put("subForm_tef7yf5fbr", celbjJriInfo);
@@ -729,12 +744,18 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             case "1000":
                 // 锅炉
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 List<Map<String, Object>> glaqfjJriInfo = equipmentCategoryMapper.selectTzsaqfjJriInfo(String.valueOf(map.get("id")));
                 result.put("subForm_1hh88r4m69", glaqfjJriInfo);
                 break;
             case "2000":
                 // 压力容器
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 List<Map<String, Object>> ylrqaqfjJriInfo = equipmentCategoryMapper.selectTzsaqfjJriInfo(String.valueOf(map.get("id")));
                 List<Map<String, Object>> ylrqjJriInfo = equipmentCategoryMapper.selectTzslbjJriInfo(String.valueOf(map.get("id")));
                 result.put("subForm_fie04854f2", ylrqjJriInfo);
@@ -743,16 +764,25 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             case "8000":
                 // 压力容器
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 List<Map<String, Object>> ylgdjJriInfo = equipmentCategoryMapper.selectTzslbjJriInfo(String.valueOf(map.get("id")));
                 result.put("subForm_9n7nu55z8r", ylgdjJriInfo);
                 break;
             case "6000":
                 // 游乐设施
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 break;
             case "9000":
                 // 游乐设施
                 result = equipmentCategoryMapper.selectTzsqzjJriInfo(String.valueOf(map.get("id")), equipmentMessage.getTableName());
+                if (ObjectUtils.isEmpty(result)){
+                    return new HashMap<>();
+                }
                 List<Map<String, Object>> sdJriLbjInfo = equipmentCategoryMapper.selectTzslbjJriInfo(String.valueOf(map.get("id")));
                 result.put("subForm_5fi0jewuyh", sdJriLbjInfo);
                 break;
@@ -773,6 +803,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      */
     private Map<String, Object> getInsInfo(Map<String, Object> map) {
         List<Map<String, Object>> InsInfo = equipmentCategoryMapper.selectTzsInsInfo(String.valueOf(map.get("id")));
+        if (ObjectUtils.isEmpty(InsInfo)){
+            return new HashMap<>();
+        }
         HashMap<String, Object> insInfoMap = new HashMap<>();
         InsInfo.forEach(item -> {
             item.put("INSPECT_REPORT", JSON.parseArray(String.valueOf(item.get("INSPECT_REPORT"))));
@@ -796,6 +829,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      */
     private Map<String, Object> getMainInfo(Map<String, Object> map) {
         List<Map<String, Object>> mainInfo = equipmentCategoryMapper.selectTzsMainInfo(String.valueOf(map.get("id")));
+        if (ObjectUtils.isEmpty(mainInfo)){
+            return new HashMap<>();
+        }
         HashMap<String, Object> mainInfoMap = new HashMap<>();
         mainInfo.forEach(item -> {
             item.put("REPAIR_INFORM", JSON.parseArray(String.valueOf(item.get("REPAIR_INFORM"))));
@@ -819,6 +855,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      */
     private Map<String, Object> getComInfo(Map<String, Object> map) {
         List<Map<String, Object>> comList = equipmentCategoryMapper.selectTzsConInfo(String.valueOf(map.get("id")));
+        if (ObjectUtils.isEmpty(comList)) {
+            return new HashMap<>();
+        }
         HashMap<String, Object> comMap = new HashMap<>();
         comList.forEach(item -> {
             if (!comMap.containsKey("id")) {
@@ -841,6 +880,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      */
     private Map<String, Object> getDesInfo(Map<String, Object> map) {
         Map<String, Object> desInfo = equipmentCategoryMapper.selectTzsDesInfo(String.valueOf(map.get("id")));
+        if (ObjectUtils.isEmpty(desInfo)){
+            return new HashMap<>();
+        }
         desInfo.put("DESIGN_DOC", JSON.parseArray(String.valueOf(desInfo.get("DESIGN_DOC"))));
         desInfo.put("SUPERVISION_AGENCY_CREDENTIAL", JSON.parseArray(String.valueOf(desInfo.get("SUPERVISION_AGENCY_CREDENTIAL"))));
         desInfo.put("INS_USE_MAINTAIN_EXPLAIN", JSON.parseArray(String.valueOf(desInfo.get("INS_USE_MAINTAIN_EXPLAIN"))));