feat: 修改字典数据查询参数

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -170,6 +170,21 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryForPage(jsonObject));
     }
 
+
+    /**
+     * 大屏综合统计查询接口
+     *
+     * @param map
+     * @return  inspectStatus
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/dp/page")
+    @ApiOperation(httpMethod = "POST", value = "大屏综合统计查询接口", notes = "大屏综合统计查询接口")
+    public ResponseModel<JSONObject> queryDpStatistics(@RequestBody Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryForPage(jsonObject));
+    }
+
     /**
      * 综合统计分析接口-导出
      *
@@ -239,8 +254,8 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryDicData")
     @ApiOperation(httpMethod = "GET", value = "高级搜索字典类型", notes = "高级搜索字典类型")
-    public ResponseModel<JSONArray> queryDicData(@RequestParam String dataKey) {
-        return ResponseHelper.buildResponse(statisticalAnalysisService.getData(dataKey));
+    public ResponseModel<JSONArray> queryDicData(@RequestParam String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.getData(type));
     }
 
     /**
@@ -250,8 +265,8 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryDicDataNew")
     @ApiOperation(httpMethod = "GET", value = "高级搜索字典类型", notes = "高级搜索字典类型")
-    public ResponseModel<JSONArray> queryDicDataNew(@RequestParam String dataKey) {
-        return ResponseHelper.buildResponse(statisticalAnalysisService.queryDicDataNew(dataKey));
+    public ResponseModel<JSONArray> queryDicDataNew(@RequestParam String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryDicDataNew(type));
     }
 
     /**

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

@@ -934,6 +934,21 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                 dto.put("WHETHER_SKID_MOUNTED_PRESSURE_VESSEL", ObjectUtils.isEmpty(dto.get("WHETHER_SKID_MOUNTED_PRESSURE_VESSEL")) ? "" : "1".equals(dto.get("WHETHER_SKID_MOUNTED_PRESSURE_VESSEL")) ? "是" : "否");
                 dto.put("whetherSphericalTank", ObjectUtils.isEmpty(dto.get("whetherSphericalTank")) ? "" : "1".equals(dto.get("whetherSphericalTank")) ? "是" : "否");
                 dto.put("EQU_STATE", ObjectUtils.isEmpty(dto.get("EQU_STATE")) ? "无状态" : EquipStateEnum.getNameByCode(dto.get("EQU_STATE").toString()));
+                String inspectStatus = "无下次检验日期";
+                if (dto.containsKey("NEXT_INSPECT_DATE")) {
+                    String nextInspectDate = dto.getString("NEXT_INSPECT_DATE");
+                    long daysBetween = ChronoUnit.DAYS.between(LocalDate.now(), LocalDate.parse(nextInspectDate, formatter));
+                    if (daysBetween <= 0) {
+                        inspectStatus = "超期";
+                    } else if (daysBetween <= 30) {
+                        inspectStatus = "临期";
+                    } else {
+                        inspectStatus = "正常";
+                    }
+                    dto.put("inspectStatus", inspectStatus);
+                } else {
+                    dto.put("inspectStatus", inspectStatus);
+                }
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;
@@ -2260,7 +2275,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         if ("".equals(equList) || null == equList) {
             throw new BaseException("需要先选择设备种类，才能选择技术参数", "200", "需要先选择设备种类，才能选择技术参数");
         }
-        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList,equCategory,equDefine);
+        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine);
         JSONArray list = new JSONArray();
         for (int i = 0; i < paramMetaList.size(); i++) {
             JSONObject object = new JSONObject();