修改站端3.7.1.1版本bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/vo/AppAlarmExtVo.java

 package com.yeejoin.equipmanage.common.datasync.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -65,6 +66,8 @@ public class AppAlarmExtVo {
     @ApiModelProperty(value = "是否拥有简报")
     private Boolean isreport = false;
 
+    @JsonProperty("client_id")
     @ApiModelProperty(value = "客户端id")
-    private String client_id;
+    private String clientId;
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/vo/AppAlarmRportVo.java

 package com.yeejoin.equipmanage.common.datasync.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,6 +45,7 @@ public class AppAlarmRportVo {
     @ApiModelProperty(value = "相关报告")
     private String analysisreport = "";
 
+    @JsonProperty("client_id")
     @ApiModelProperty(value = "客户端id")
     private String client_id;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/vo/AppAlarmVo.java

 package com.yeejoin.equipmanage.common.datasync.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -58,4 +59,9 @@ public class AppAlarmVo {
 
     @ApiModelProperty(value = "是否拥有简报")
     private Boolean isreport = false;
+
+    @JsonProperty("client_id")
+    @ApiModelProperty(value = "客户端id")
+    private String client_id;
+
 }
\ No newline at end of file

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

@@ -103,7 +103,11 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
         if ("0".equals(String.valueOf(alarmEquipDayLink.get("sumNum")))
                 || "0".equals(String.valueOf(alarmEquipDayLink.get("hbSumNum")))
                 || 0 > (Integer.valueOf(String.valueOf(alarmEquipDayLink.get("sumNum"))) - Integer.valueOf(String.valueOf(alarmEquipDayLink.get("hbSumNum"))))) {
-            alarmEquipDayLink.put("hbRate", bigDecimal + "%");
+            if ("0".equals(String.valueOf(alarmEquipDayLink.get("hbSumNum"))) && !"0".equals(String.valueOf(alarmEquipDayLink.get("sumNum")))) {
+                alarmEquipDayLink.put("hbRate", "100%");
+            } else {
+                alarmEquipDayLink.put("hbRate", bigDecimal + "%");
+            }
         } else {
             BigDecimal rate = nowDaySum.subtract(lastDaySum).divide(lastDaySum, 2, BigDecimal.ROUND_HALF_UP);
             alarmEquipDayLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
@@ -116,7 +120,11 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
         if ("0".equals(String.valueOf(alarmEquipMonthLink.get("sumNum")))
                 || "0".equals(String.valueOf(alarmEquipMonthLink.get("hbSumNum")))
                 || 0 > (Integer.valueOf(String.valueOf(alarmEquipMonthLink.get("sumNum"))) - Integer.valueOf(String.valueOf(alarmEquipMonthLink.get("hbSumNum"))))) {
-            alarmEquipMonthLink.put("hbRate", bigDecimal + "%");
+            if ("0".equals(String.valueOf(alarmEquipMonthLink.get("hbSumNum"))) && !"0".equals(String.valueOf(alarmEquipMonthLink.get("sumNum")))) {
+                alarmEquipMonthLink.put("hbRate", "100%");
+            } else {
+                alarmEquipMonthLink.put("hbRate", bigDecimal + "%");
+            }
         } else {
             BigDecimal rate = nowMonthSum.subtract(lastMonthSum).divide(lastMonthSum, 2, BigDecimal.ROUND_HALF_UP);
             alarmEquipMonthLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
@@ -128,7 +136,11 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
         if ("0".equals(String.valueOf(unCleanAlarmEquipDayLink.get("sumNum")))
                 || "0".equals(String.valueOf(unCleanAlarmEquipDayLink.get("hbSumNum")))
                 || 0 > (Integer.valueOf(String.valueOf(unCleanAlarmEquipDayLink.get("sumNum"))) - Integer.valueOf(String.valueOf(unCleanAlarmEquipDayLink.get("hbSumNum"))))) {
-            unCleanAlarmEquipDayLink.put("hbRate", bigDecimal + "%");
+            if ("0".equals(String.valueOf(unCleanAlarmEquipDayLink.get("hbSumNum"))) && !"0".equals(String.valueOf(unCleanAlarmEquipDayLink.get("sumNum")))) {
+                unCleanAlarmEquipDayLink.put("hbRate", "100%");
+            } else {
+                unCleanAlarmEquipDayLink.put("hbRate", bigDecimal + "%");
+            }
         } else {
             BigDecimal rate = nowUncleanDaySum.subtract(lastUncleanDaySum).divide(lastUncleanDaySum, 2, BigDecimal.ROUND_HALF_UP);
             unCleanAlarmEquipDayLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");
@@ -141,7 +153,11 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
         if ("0".equals(String.valueOf(unCleanAlarmEquipMonthLink.get("sumNum")))
                 || "0".equals(String.valueOf(unCleanAlarmEquipMonthLink.get("hbSumNum")))
                 || 0 > (Integer.valueOf(String.valueOf(unCleanAlarmEquipMonthLink.get("sumNum"))) - Integer.valueOf(String.valueOf(unCleanAlarmEquipMonthLink.get("hbSumNum"))))) {
-            unCleanAlarmEquipMonthLink.put("hbRate", bigDecimal + "%");
+            if ("0".equals(String.valueOf(unCleanAlarmEquipMonthLink.get("hbSumNum"))) && !"0".equals(String.valueOf(unCleanAlarmEquipMonthLink.get("sumNum")))) {
+                unCleanAlarmEquipMonthLink.put("hbRate", "100%");
+            } else {
+                unCleanAlarmEquipMonthLink.put("hbRate", bigDecimal + "%");
+            }
         } else {
             BigDecimal rate = nowUncleanMonthSum.subtract(lastUncleanMonthSum).divide(lastUncleanMonthSum, 2, BigDecimal.ROUND_HALF_UP);
             unCleanAlarmEquipMonthLink.put("hbRate", "0.00".equals(String.valueOf(rate)) ? "0%" : rate + "%");

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

@@ -1619,8 +1619,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 List<Map> collect = indicatorConfiguration.stream().
                         filter(item -> item.get("code").equals(String.valueOf(sys.get("typeCode")))).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(collect)) {
+                    String startTime = StringUtil.isNotEmpty(startDate) ? org.apache.commons.lang3.StringUtils.trimToNull(startDate).substring(0, 10) + " 00:00:00" : null;
+                    String endTime = StringUtil.isNotEmpty(endDate) ? org.apache.commons.lang3.StringUtils.trimToNull(endDate).substring(0, 10) + " 23:59:59" : null;
                     // 附件告警数据
-                    List<Map<String, Object>> sysAlarmList = equipmentSpecificAlarmMapper.getAlarmDetailByDate(bizOrgCode, startDate, endDate, Long.valueOf(String.valueOf(sys.get("id"))));
+                    List<Map<String, Object>> sysAlarmList = equipmentSpecificAlarmMapper.getAlarmDetailByDate(bizOrgCode, startTime, endTime, Long.valueOf(String.valueOf(sys.get("id"))));
                     attachAlarmList.addAll(sysAlarmList);
 
                     // 系统名称
@@ -1819,8 +1821,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                         filter(item -> item.get("code").equals(String.valueOf(system.get("typeCode")))).collect(Collectors.toList());
 
                 if (!CollectionUtils.isEmpty(collect)) {
+                    String startTime = StringUtil.isNotEmpty(startDate) ? org.apache.commons.lang3.StringUtils.trimToNull(startDate).substring(0, 10) + " 00:00:00" : null;
+                    String endTime = StringUtil.isNotEmpty(endDate) ? org.apache.commons.lang3.StringUtils.trimToNull(endDate).substring(0, 10) + " 23:59:59" : null;
                     // 附件告警数据
-                    List<Map<String, Object>> sysAlarmList = equipmentSpecificAlarmMapper.getAlarmDetailByDate(bizOrgCode, startDate, endDate, Long.valueOf(String.valueOf(system.get("id"))));
+                    List<Map<String, Object>> sysAlarmList = equipmentSpecificAlarmMapper.getAlarmDetailByDate(bizOrgCode, startTime, endTime, Long.valueOf(String.valueOf(system.get("id"))));
                     attachAlarmList.addAll(sysAlarmList);
 
                     // 系统名称
@@ -2021,8 +2025,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                         filter(item -> item.get("code").equals(String.valueOf(system.get("typeCode")))).collect(Collectors.toList());
 
                 if (!CollectionUtils.isEmpty(collect)) {
+                    String startTime = StringUtil.isNotEmpty(startDate) ? org.apache.commons.lang3.StringUtils.trimToNull(startDate).substring(0, 10) + " 00:00:00" : null;
+                    String endTime = StringUtil.isNotEmpty(endDate) ? org.apache.commons.lang3.StringUtils.trimToNull(endDate).substring(0, 10) + " 23:59:59" : null;
                     // 附件告警数据
-                    List<Map<String, Object>> sysAlarmList = equipmentSpecificAlarmMapper.getAlarmDetailByDate(bizOrgCode, startDate, endDate, Long.valueOf(String.valueOf(system.get("id"))));
+                    List<Map<String, Object>> sysAlarmList = equipmentSpecificAlarmMapper.getAlarmDetailByDate(bizOrgCode, startTime, endTime, Long.valueOf(String.valueOf(system.get("id"))));
                     attachAlarmList.addAll(sysAlarmList);
 
                     // 系统名称

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

@@ -17,6 +17,7 @@ import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.vo.CarPropertyVo;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
+import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
@@ -38,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -65,7 +67,7 @@ public class SyncDataServiceImpl implements ISyncDataService {
     @Value("${dcs.x.hw.appKey}")
     private String xHwAppKey;
 
-    @Value("dcs.NRKJ.use")
+    @Value("${dcs.NRKJ.use}")
     private Boolean NRKJUse;
 
     @Autowired
@@ -492,11 +494,15 @@ public class SyncDataServiceImpl implements ISyncDataService {
                                     Map<String, Object> map = new LinkedHashMap<>();
                                     AppAlarmVo appAlarmVo = new AppAlarmVo();
                                     BeanUtils.copyProperties(alarmVo, appAlarmVo);
+                                    appAlarmVo.setClient_id(clientId);
                                     map.put("alarm", appAlarmVo);
                                     if (isreport) {
                                         map.put("report", getAppAlarmRportVo(alarmVo));
                                     } else {
-                                        map.put("report", new AppAlarmRportVo());
+                                        AppAlarmRportVo vo = new AppAlarmRportVo();
+                                        vo.setTime(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date()));
+                                        vo.setClient_id(clientId);
+                                        map.put("report", vo);
                                     }
                                     alarmList.add(map);
                                 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -57,7 +57,7 @@
     </select>
     <select id="findByIdListForNRKJ" resultType="com.yeejoin.equipmanage.common.datasync.vo.AppAlarmExtVo">
         SELECT
-            'fire_system' AS client_id,
+            'fire_system' AS clientId,
             CONCAT(sal.create_date) AS time,
             IFNULL(a.`code`,' ') AS areaid,
             IFNULL(a.`name`,' ') AS areaname,
@@ -129,6 +129,7 @@
     </select>
     <select id="findByIdListNoBuildIdForNRKJ" resultType="com.yeejoin.equipmanage.common.datasync.vo.AppAlarmExtVo">
         SELECT
+            'fire_system' AS clientId,
             CONCAT(sal.create_date) AS time,
             ' ' AS areaid,
             ' ' AS areaname,

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -1618,5 +1618,6 @@
                 AND find_in_set(#{sysId}, wlesa.system_ids)
             </if>
         </where>
+            ORDER BY wlesa.create_date DESC
     </select>
 </mapper>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5045,7 +5045,7 @@
                 (
                         CONCAT(IFNULL( max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ), '--' ), '')  = '--',
                         '--',
-                        TRUNCATE (max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ), 2)) AS nowInfluentFlow,
+                        ROUND (max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ), 2)) AS nowInfluentFlow,
             IF
                 ((
                      max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ) IS NOT NULL