refactor: 使用JsonUtils简化设备类型数据处理

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

@@ -1663,16 +1663,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         result.put("permitStatus", permitStatusData);
 
         //监管设备类型
-        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
-        JSONArray equipCategoryData = new JSONArray();
-        for (int i = 0; i < equipmentCategoryDtos.size(); i++) {
-            JSONObject object = new JSONObject();
-            object.put("key", equipmentCategoryDtos.get(i).getCode());
-            object.put("value", equipmentCategoryDtos.get(i).getCode());
-            object.put("label", equipmentCategoryDtos.get(i).getName());
-            equipCategoryData.add(object);
-        }
-        result.put("equipCategory", equipCategoryData);
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
+        List<Map<String, Object>> equipCategory = resourceJson.get(EquipmentClassifityEnum.ZHTJFX.getCode());
+        result.put("equipCategory", equipCategory);
 
         return result;
     }
@@ -1774,16 +1767,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         //学历
         result.put("education", deployDictionary(dataDictionaryService.getByType("QYRYXL")));
         //监管设备类型
-        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
-        JSONArray equipCategoryData = new JSONArray();
-        for (int i = 0; i < equipmentCategoryDtos.size(); i++) {
-            JSONObject object = new JSONObject();
-            object.put("key", equipmentCategoryDtos.get(i).getCode());
-            object.put("value", equipmentCategoryDtos.get(i).getCode());
-            object.put("label", equipmentCategoryDtos.get(i).getName());
-            equipCategoryData.add(object);
-        }
-        result.put("equipType", equipCategoryData);
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
+        List<Map<String, Object>> equipCategory = resourceJson.get(EquipmentClassifityEnum.ZHTJFX.getCode());
+        result.put("equipType", equipCategory);
         //获取企业分类
         result.put("unitCategory", getUnitCategory());
         //获取企业类型