feat: 增加气瓶分类枚举并处理信息情况和气瓶类别转换逻辑

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/CylinderCategoryEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.*;
+
+@AllArgsConstructor
+@Getter
+public enum CylinderCategoryEnum {
+    /**
+     * 气瓶分类枚举
+     */
+    yhsyqp("0", "液化石油气瓶"),
+    gyqp("1", "工业气瓶"),
+    qt("2", "其他");
+
+    private String code;
+
+    private String name;
+
+    public static String getName(String code) {
+        Optional<String> op = Arrays.stream(CylinderCategoryEnum.values()).filter(e -> e.getCode().equals(code)).map(CylinderCategoryEnum::getName).findFirst();
+        return op.orElse("");
+    }
+
+    public static List<Map<String, Object>> getEnumList() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (CylinderCategoryEnum testEnum : EnumSet.allOf(CylinderCategoryEnum.class)) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("name", testEnum.name);
+            map.put("code", testEnum.code);
+            list.add(map);
+        }
+        return list;
+    }
+
+
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -1013,6 +1013,22 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         }
                     }
                 }
+                if (!ValidationUtil.isEmpty(dto.getString("INFORMATION_SITUATION"))) {
+                    String informationSituation = dto.getString("INFORMATION_SITUATION");
+                    boolean integer = isInteger(informationSituation);
+                    if (integer) {
+                        informationSituation = InformationManageTypeEnum.getName(informationSituation);
+                    }
+                    dto.put("INFORMATION_SITUATION", informationSituation);
+                }
+                if (!ValidationUtil.isEmpty(dto.getString("CYLINDER_CATEGORY"))) {
+                    String cylinderCategory = dto.getString("CYLINDER_CATEGORY");
+                    boolean integer = isInteger(cylinderCategory);
+                    if(integer){
+                        cylinderCategory = CylinderCategoryEnum.getName(cylinderCategory);
+                    }
+                    dto.put("CYLINDER_CATEGORY", cylinderCategory);
+                }
                 dto.put("inspectStatus", inspectStatus);
                 list.add(dto);
             }
@@ -1075,6 +1091,17 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return result;
     }
 
+
+    private static boolean isInteger(String s) {
+        try {
+            Integer.parseInt(s);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+
     private void handleOrgCode(BoolQueryBuilder boolMust, String orgCode) {
         if (orgCode.equals("50")) {
             DynamicQueryBuilder dynamicQueryBuilder = new DynamicQueryBuilder();
@@ -1626,8 +1653,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     private void addTechParam(JSONObject techParam, JSONObject paramRange, EnhancedDynamicQueryBuilder builder) {
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(techParam));
-        String field = jsonObject.getString("value");
-        String fieldType = jsonObject.getString("fieldType");
+        JSONObject js = (JSONObject) jsonObject.get("value");
+        String field = js.getString("value");
+        String fieldType = js.getString("fieldType");
         String itemCondition = paramRange.getString("itemCondition");
         Object value = paramRange.get("value");
         String andOr = paramRange.getString("andOr");
@@ -2384,7 +2412,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     public JSONArray queryXK(String type) {
         JSONArray result = new JSONArray();
-        if (null == type) {
+        if (null == type || "".equals(type)) {
             List<DataDictionary> xkxm = dataDictionaryService.lambdaQuery()
                     .and(wrapper -> wrapper.like(DataDictionary::getType, "XKXM")
                             .or()
@@ -2394,13 +2422,24 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             result = deployDictionary(xkxm);
         } else {
             List<DataDictionary> childrenxkxm = new ArrayList<>();
-            if ("".equals(type)) {
-                childrenxkxm = dataDictionaryService.lambdaQuery().eq(BaseEntity::getIsDelete, false).list();
-            } else {
+//            if ("".equals(type)) {
+//                childrenxkxm = dataDictionaryService.lambdaQuery()
+//                        .likeRight(DataDictionary::getCode, "XK")
+//                        .isNotNull(DataDictionary::getTypeDesc)
+//                        .eq(BaseEntity::getIsDelete, false).list();
+//            } else {
+//
+//            }
             childrenxkxm = dataDictionaryService.lambdaQuery().eq(DataDictionary::getTypeDesc, type).eq(BaseEntity::getIsDelete, false).list();
-            }
             result = deployDictionary(childrenxkxm);
         }
+//        if (ValidationUtil.isEmpty(type)) {
+//            List<DataDictionary> xkxm = dataDictionaryService.lambdaQuery().like(DataDictionary::getType, "XKXM").eq(BaseEntity::getIsDelete, false).list();
+//            result = deployDictionary(xkxm);
+//        } else {
+//            List<DataDictionary> childrenxkxm = dataDictionaryService.lambdaQuery().eq(DataDictionary::getTypeDesc, type).eq(BaseEntity::getIsDelete, false).list();
+//            result = deployDictionary(childrenxkxm);
+//        }
         return result;
     }
 
@@ -2796,7 +2835,22 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             object.put("key", paramMetaList.get(i).getParamKey());
             object.put("value", paramMetaList.get(i).getParamKey());
             object.put("label", paramMetaList.get(i).getParamLabel());
-            object.put("fieldType", paramMetaList.get(i).getParamType());
+            object.put("unit", paramMetaList.get(i).getUnit());
+            JSONObject skillConfig = new JSONObject();
+            skillConfig.put("conditions", getConditionList(paramMetaList.get(i).getParamType(), paramMetaList.get(i).getDictCode()));
+            if (!ValidationUtil.isEmpty(paramMetaList.get(i).getDictCode())) {
+                skillConfig.put("type", "select");
+                skillConfig.put("data", getData(paramMetaList.get(i).getDictCode()));
+            } else if (TechnicalParameter.ParamType.BIG_DECIMAL.equals(paramMetaList.get(i).getParamType())) {
+                skillConfig.put("type", "inputNumber");
+            } else if (TechnicalParameter.ParamType.STRING.equals(paramMetaList.get(i).getParamType())) {
+                skillConfig.put("type", "input");
+            } else if (TechnicalParameter.ParamType.DATE.equals(paramMetaList.get(i).getParamType())) {
+                skillConfig.put("type", "date");
+            }
+            skillConfig.put("fieldType", paramMetaList.get(i).getParamType());
+            skillConfig.put("isMulti", false);
+            object.put("skillConfig", skillConfig);
             list.add(object);
         }
         return list;