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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/interceptor/PluginInterceptor.java

@@ -161,6 +161,19 @@ public class PluginInterceptor implements Interceptor {
             field.set(boundSql, sql);
             return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
         }
+        else if (
+                "com.yeejoin.amos.boot.module.jcs.api.mapper.SignMapper.selectStationAttendanceStatsPage".equals(id)
+        ) {
+            String sortField = "";
+            if (parameter instanceof HashMap) {
+                sortField = ((HashMap<?, ?>) parameter).get("sortField").toString();
+            }
+            sql = sql.replace("@SORT_FIELD", sortField);
+            Field field = boundSql.getClass().getDeclaredField("sql");
+            ReflectionUtils.makeAccessible(field);
+            field.set(boundSql, sql);
+            return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
+        }
         else {
             return invocation.proceed();
         }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml

@@ -191,7 +191,7 @@
             t2.NAME AS bizOrgName,
             CONCAT(t2.STATION_TYPE, '换流站') AS stationType,
             #{date} AS date,
-            IFNULL(t1.num, 0) AS signNum,
+            CONVERT(IFNULL(t1.num, '0'), SIGNED) AS signNum,
             (SELECT COUNT(1) FROM cb_firefighters t WHERE t.BIZ_ORG_CODE LIKE CONCAT(t2.BIZ_ORG_CODE, '%') AND t.PEOPLE_TYPE = 1601 AND t.IS_DELETE = false) AS firefighterNum,
             ROUND(ROUND(IFNULL(t1.num, 0) / (SELECT COUNT(1) FROM cb_firefighters t WHERE t.BIZ_ORG_CODE LIKE CONCAT(t2.BIZ_ORG_CODE, '%') AND t.PEOPLE_TYPE = 1601 AND t.IS_DELETE = false), 4) * 100, 2) AS attendanceRate,
             IF(IFNULL(t1.num, 0) >= #{targetPassNum}, '合格', '不合格') AS attendanceStatus

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);