Merge remote-tracking branch 'origin/develop_dl_bugfix_0723' into develop_dl_bugfix_0723

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

@@ -1519,8 +1519,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
     private void doPressurePumInfo(TopicEntityVo topicEntity, EquipmentSpecificIndex equipmentSpecificIndex) {
         // 查询iot该稳压泵的启停次数 一个小时内
-        String startDate = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
-        String endDate = DateUtil.format(DateUtil.offsetHour(new Date(), -1), DatePattern.NORM_DATETIME_PATTERN);
+        String endDate = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
+        String startDate = DateUtil.format(DateUtil.offsetHour(new Date(), -1), DatePattern.NORM_DATETIME_PATTERN);
         String prefix = topicEntity.getIotCode().substring(0, 8);
         String suffix = topicEntity.getIotCode().substring(8);
         ResponseModel<Map<String, Integer>> mapResponseModel = iotFeign.queryIotDataNumByIndex(startDate, endDate, prefix, suffix, FHS_PressurePump_Start + "," + FHS_PressurePump_Stop, "true");
@@ -1562,7 +1562,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         BizMessage bizMessage = new BizMessage();
         bizMessage.setIndexKey(indexKey);
         bizMessage.setIndexValue(indexValue);
-        RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source);
+        RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source, "稳压泵启停频次过高");
         riskBizInfoVo.setWarningObjectCode(businessId);
         riskBizInfoVo.getDynamicDetails().get(0).setTabContent(tableContentVos);
         bizMessage.setBizInfo(riskBizInfoVo);
@@ -1698,7 +1698,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(indexKey);
             bizMessage.setIndexValue(String.valueOf(divide));
-            RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source);
+            RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source, "当前值低于或高于报警阈值≥10%");
             riskBizInfoVo.setWarningObjectCode(businessId);
             riskBizInfoVo.getDynamicDetails().get(0).setTabContent(tableContentVos);
             bizMessage.setBizInfo(riskBizInfoVo);
@@ -1712,7 +1712,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
     }
 
-    public RiskBizInfoVo fetchData(EquipmentSpecificIndex equipmentSpecificIndex, Object extra, String source) {
+    public RiskBizInfoVo fetchData(EquipmentSpecificIndex equipmentSpecificIndex, Object extra, String source, String warningContent) {
         RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
         riskBizInfoVo.setWarningObjectName(equipmentSpecificIndex.getEquipmentSpecificName());
         riskBizInfoVo.setWarningObjectCode(equipmentSpecificIndex.getEquipmentSpecificCode());
@@ -1724,7 +1724,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         detailsVos.add(dynamicDetailsVo);
         riskBizInfoVo.setDynamicDetails(detailsVos);
         CustomizeItems customizeItems = new CustomizeItems();
-        customizeItems.setWarningContent("当前值低于或高于报警阈值≥10%");
+        customizeItems.setWarningContent(warningContent);
         riskBizInfoVo.setCustomizeItems(customizeItems);
         riskBizInfoVo.setExtra(extra);
         riskBizInfoVo.setType(source);