item：稳压泵统计与分析参数优化

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpAnalysisEnum.java

@@ -13,17 +13,17 @@ import java.util.Map;
 public enum PressurePumpAnalysisEnum {
 
     PRESSURE_PUMP_FAULT("1", "1", "稳压泵是否故障", "无", ""),
-    PRESSURE_PUMP_INTERVAL("2", "2", "最近一次启停间隔", "0", "分钟"),
-    PRESSURE_PUMP_DURATION("3", "3", "最近一次启动时长", "0", "分钟"),
-    PRESSURE_PUMP_HALF("4", "4", "半小时启动", "0", "次"),
-    PRESSURE_PUMP_TWO("5", "5", "2小时启动", "0", "次"),
+    PRESSURE_PUMP_INTERVAL("2", "2", "最近一次启停间隔", 0, "分钟"),
+    PRESSURE_PUMP_DURATION("3", "3", "最近一次启动时长", 0, "分钟"),
+    PRESSURE_PUMP_HALF("4", "4", "半小时启动", 0, "次"),
+    PRESSURE_PUMP_TWO("5", "5", "2小时启动", 0, "次"),
     PRESSURE_PUMP_PIPE("6", "6", "管网压力", "正常", "");
 
-    private final String key;
-    private final String code;
-    private final String name;
-    private final Object value;
-    private final String unit;
+    private String key;
+    private String code;
+    private String name;
+    private Object value;
+    private String unit;
 
     PressurePumpAnalysisEnum(String key, String code, String name, Object value, String unit) {
         this.key = key;
@@ -37,22 +37,42 @@ public enum PressurePumpAnalysisEnum {
         return key;
     }
 
+    public void setKey(String key) {
+        this.key = key;
+    }
+
     public String getCode() {
         return code;
     }
 
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public Object getValue() {
         return value;
     }
 
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
     public String getUnit() {
         return unit;
     }
 
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
     public static List<Map<String, Object>>  getList(){
         PressurePumpAnalysisEnum[] values = PressurePumpAnalysisEnum.values();
         List<Map<String, Object>> list = new ArrayList<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java

@@ -578,7 +578,7 @@ public class EmergencyController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getPressurePumpStatusChart")
 	@ApiOperation(httpMethod = "GET", value = "四横八纵-稳压泵启停状态图", notes = "四横八纵-稳压泵启停状态图")
-	public ResponseModel getPressurePumpStatusChart(@RequestParam String equipmentCode, @RequestParam String startTime, @RequestParam String endTime,
+	public ResponseModel getPressurePumpStatusChart(@RequestParam String startTime, @RequestParam String endTime,
 													@RequestParam(required = false) String bizOrgCode) {
 		if(StringUtils.isEmpty(bizOrgCode)) {
 			ReginParams reginParams = getSelectedOrgInfo();
@@ -590,15 +590,14 @@ public class EmergencyController extends AbstractBaseController {
 				}
 			}
 		}
-		return CommonResponseUtil.success(iEmergencyService.getPressurePumpStatusChart(startTime, endTime, bizOrgCode, getAppKey(), getProduct(), getToken()));
+		return CommonResponseUtil.success(iEmergencyService.getPressurePumpStatusChart(startTime, endTime, bizOrgCode));
 	}
 
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getPressurePumpDiagnosticAnalysis")
 	@ApiOperation(httpMethod = "GET", value = "四横八纵-稳压泵诊断分析", notes = "四横八纵-稳压泵诊断分析")
-	public ResponseModel getPressurePumpDiagnosticAnalysis(@RequestParam String equipmentCode, @RequestParam(required = false) String nameKeys,
-														   @RequestParam(required = false) String fieldKey, @RequestParam(required = false) String bizOrgCode) {
+	public ResponseModel getPressurePumpDiagnosticAnalysis(@RequestParam(required = false) String bizOrgCode) {
 		if(StringUtils.isEmpty(bizOrgCode)) {
 			ReginParams reginParams = getSelectedOrgInfo();
 			ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
@@ -609,7 +608,7 @@ public class EmergencyController extends AbstractBaseController {
 				}
 			}
 		}
-		return CommonResponseUtil.success(iEmergencyService.getPressurePumpDiagnosticAnalysis(nameKeys, fieldKey, bizOrgCode, getAppKey(), getProduct(), getToken()));
+		return CommonResponseUtil.success(iEmergencyService.getPressurePumpDiagnosticAnalysis(bizOrgCode));
 	}
 
 	@PersonIdentify

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -54,9 +54,9 @@ public interface IEmergencyService {
 
     Map<String, Integer> getStockEquipStatistics();
 
-    Map<String, Object> getPressurePumpStatusChart(String startTime, String endTime, String bizOrgCode, String appKey, String product, String token);
+    Map<String, Object> getPressurePumpStatusChart(String startTime, String endTime, String bizOrgCode);
 
-    List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String nameKeys, String fieldKey, String bizOrgCode, String appKey, String product, String token);
+    List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String bizOrgCode);
 
     Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
@@ -23,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -228,21 +225,21 @@ public class EmergencyServiceImpl implements IEmergencyService {
     }
 
     @Override
-    public List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String nameKeys, String fieldKey, String bizOrgCode, String appKey, String product, String token) {
-        List<Map<String , Object>> list = PressurePumpAnalysisEnum.getList();
+    public List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String bizOrgCode) {
         //  从 json 配置文件获取配置信息
         List<Map> infoList = pressurePumpService.getNameKeyInfoList(PressurePumpRelateEnum.PRESSURE_PUMP.getValue());
         if (!CollectionUtils.isEmpty(infoList)) {
             Map map = infoList.get(0);
             String equipmentCode = map.get("equipmentCode").toString();
+            String faultNameKey = map.get("faultNameKey").toString();
             //  获取redis稳压泵缓存数据，默认JSON配置最近4小时
             List<IotDataVO> redisDataList = pressurePumpService.getDataToRedis(PressurePumpRelateEnum.PRESSURE_PUMP.getValue(), pressurePumpStart, null);
             List<IotDataVO> redisDataPipeList = pressurePumpService.getDataToRedis(PressurePumpRelateEnum.PRESSURE_PUMP.getValue(), pressurePumpPipePressure, null);
             String nowStrLong = DateUtils.getDateNowString();
             Date dateNow = DateUtils.getDateNow();
             //  1. 判断稳压泵整体是否故障
-            List<EquipmentSpecificAlarmLog> alarmLogList = equipmentSpecificAlarmLogService.getAlarmLogInfoList(equipmentCode, nameKeys, PressurePumpRelateEnum.IOT_INDEX_VALUE_TRUE.getValue(), PressurePumpRelateEnum.UN_CLEAN_TIME.getValue(), bizOrgCode);
-            list.get(0).put("value", CollectionUtils.isEmpty(alarmLogList) ? PressurePumpRelateEnum.NOT_FAULT.getValue() : PressurePumpRelateEnum.FAULT.getValue());
+            List<EquipmentSpecificAlarmLog> alarmLogList = equipmentSpecificAlarmLogService.getAlarmLogInfoList(equipmentCode, faultNameKey, PressurePumpRelateEnum.IOT_INDEX_VALUE_TRUE.getValue(), PressurePumpRelateEnum.UN_CLEAN_TIME.getValue(), bizOrgCode);
+            PressurePumpAnalysisEnum.PRESSURE_PUMP_FAULT.setValue(CollectionUtils.isEmpty(alarmLogList) ? PressurePumpRelateEnum.NOT_FAULT.getValue() : PressurePumpRelateEnum.FAULT.getValue());
             long interval = 0;
             long duration = 0;
             double pressureDiff = 0.0;
@@ -275,23 +272,23 @@ public class EmergencyServiceImpl implements IEmergencyService {
                 }
             }
             //  2. 最近一次启停间隔
-            list.get(1).put("value", interval);
+            PressurePumpAnalysisEnum.PRESSURE_PUMP_INTERVAL.setValue(interval);
             //  3. 最近一次启动时长
-            list.get(2).put("value", duration);
+            PressurePumpAnalysisEnum.PRESSURE_PUMP_DURATION.setValue(duration);
             //  4. 半小时启动
             int halfFrequency = pressurePumpService.getAllPressurePumpStartFrequency(Double.parseDouble(PressurePumpRelateEnum.HALF_HOUR.getValue()), dateNow);
-            list.get(3).put("value", halfFrequency);
+            PressurePumpAnalysisEnum.PRESSURE_PUMP_HALF.setValue(halfFrequency);
             //  5. 2小时启动
             int twoFrequency = pressurePumpService.getAllPressurePumpStartFrequency(Double.parseDouble(PressurePumpRelateEnum.TWO_HOUR.getValue()), dateNow);
-            list.get(4).put("value", twoFrequency);
+            PressurePumpAnalysisEnum.PRESSURE_PUMP_TWO.setValue(twoFrequency);
             //  6. 管网压力状态
-            list.get(5).put("value", pressureDiff > Double.parseDouble(PressurePumpRelateEnum.PIPE_PRESSURE_DIFF.getValue()) ? PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue() : PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue());
+            PressurePumpAnalysisEnum.PRESSURE_PUMP_PIPE.setValue(pressureDiff > Double.parseDouble(PressurePumpRelateEnum.PIPE_PRESSURE_DIFF.getValue()) ? PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue() : PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue());
         }
-        return list;
+        return PressurePumpAnalysisEnum.getList();
     }
 
     @Override
-    public Map<String, Object> getPressurePumpStatusChart(String startTime, String endTime, String bizOrgCode, String appKey, String product, String token) {
+    public Map<String, Object> getPressurePumpStatusChart(String startTime, String endTime, String bizOrgCode) {
         Map<String, Object> map = new LinkedHashMap<>();
         try {
             //  从 json 配置文件获取配置信息

amos-boot-system-equip/src/main/resources/json/nameKeyInfo.json

@@ -3,6 +3,7 @@
     "name": "稳压泵",
     "code": "PressurePump",
     "nameKey": "FHS_PressurePump_Start,FHS_PipePressureDetector_PipePressure",
+    "faultNameKey": "FHS_PressurePump_Fault,FHS_PressurePump_RunFault,FHS_PressurePump_OverLoadFault",
     "expire": 14400,
     "equipmentCode": "92010800KAL44",
     "top": "100"