item：【装备】添加指标告警iot数据唯一标识traceId

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarm.java

@@ -108,6 +108,9 @@ public class EquipmentSpecificAlarm extends BaseEntity {
     @TableField("confirm_date")
     private Date confirmDate;
 
+    @ApiModelProperty(value = "iot数据上报唯一id")
+    private String traceId;
+
     @ApiModelProperty(value = "画布id")
     @TableField(exist = false)
     private Long sceneId;

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -132,6 +132,9 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "iot数据上报唯一id")
+    private String traceId;
+
     @ApiModelProperty(value = "画布id")
     @TableField(exist = false)
     private Long sceneId;

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -75,6 +75,9 @@ public class EquipmentSpecificIndex extends BaseEntity {
      */
     @TableField(value = "emergency_level_describe")
     private String emergencyLevelDescribe;
+
+    @ApiModelProperty(value = "iot数据上报唯一id")
+    private String traceId;
     
     @TableField(exist = false)
     private String nameKey;
@@ -143,5 +146,4 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField(exist = false)
     private String buildId;
 
-    
 }

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

@@ -16,4 +16,9 @@ public class IotDataVO {
     private String key;
 
     private Object value;
+
+    /**
+     * iot数据上报唯一id
+     */
+    private String traceId;
 }

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

@@ -4,12 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mchange.lang.DoubleUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.*;
@@ -26,7 +23,6 @@ import com.yeejoin.equipmanage.remote.WebMqttHandler;
 import com.yeejoin.equipmanage.service.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -37,10 +33,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import ucar.ma2.ArrayDouble;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, EquipmentSpecificAlarm> implements IConfirmAlarmService {
@@ -184,7 +178,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                             set(EquipmentSpecific::getRealtimeIotIndexUpdateDate,new Date()).
                             eq(EquipmentSpecific::getId,alarm.getEquipmentSpecificId());
                             equipmentSpecificSerivce.update(wrapper);
-                    MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
+                    MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), null, equipmentSpecificAlarmLogService);
                 }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 isBatch = ent.getIsBatch();

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

@@ -21,6 +21,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import com.alibaba.fastjson.JSON;
@@ -288,7 +289,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 					EquipmentSpecificIndex equipmentSpeIndex = new EquipmentSpecificIndex();
 					BeanUtils.copyProperties(equipmentSpecificIndex, equipmentSpeIndex);
 					String value = iotDataVO.getValue().toString();
+					String traceId = iotDataVO.getTraceId().toString();
 					equipmentSpeIndex.setValue(value);
+					equipmentSpeIndex.setTraceId(traceId);
 					equipmentSpeIndex.setValueLabel(valueTranslate(value, equipmentSpecificIndex.getValueEnum()));
 					equipmentSpeIndex.setUpdateDate(new Date());
 					equipmentSpecificIndexService.updateById(equipmentSpeIndex);
@@ -384,7 +387,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 	}
 
 	public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
-			IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
+																   String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
 		LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
 		queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
 		queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
@@ -394,6 +397,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 		logs.forEach(x -> {
 			x.setCleanTime(new Date());
 			x.setStatus(AlarmStatusEnum.HF.getCode());
+			if (!StringUtils.isEmpty(traceId)) {
+				x.setTraceId(traceId);
+			}
 		});
 		if (!logs.isEmpty()) {
 			equipmentSpecificAlarmLogService.updateBatchById(logs);
@@ -590,6 +596,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 					action.setFrequency((action.getFrequency() + 1));
 				}
 				// 更新所在系统,设备可能编辑过
+				action.setTraceId(equipmentSpecificIndex.getTraceId());
 				action.setSystemIds(equipmentSpecificIndex.getSystemId());
 				action.setSystemCodes(this.getSystemCodeBySpeId(equipmentSpecificIndex.getSystemId()));
 				action.setUpdateDate(new Date());
@@ -738,7 +745,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 				}
 				mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
 			} else {
-				equipmentAlarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(),
+				equipmentAlarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
 						equipmentSpecificAlarmLogService));
 				mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString());
 				bool = Boolean.TRUE;
@@ -890,6 +897,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 				}
 				action.setUpdateDate(new Date());
 				// 更新所在系统,设备可能编辑过,更新所在系统、装备名称、装备定义code
+				action.setTraceId(equipmentSpcIndex.getTraceId());
 				action.setSystemIds(equipmentSpcIndex.getSystemId());
 				action.setSystemCodes(this.getSystemCodeBySpeId(equipmentSpcIndex.getSystemId()));
 				action.setEquipmentSpecificName(equipmentSpcIndex.getEquipmentSpecificName());

amos-boot-system-equip/src/main/resources/changelog/changelog-master.xml

@@ -6,6 +6,7 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog 
         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
     <include file="wl-3.0.1.xml" relativeToChangelogFile="true"/>
+    <include file="wl-3.6.0.xml" relativeToChangelogFile="true"/>
     <!--全量包含视图和函数-->
     <include file="sql-task-all.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+
+    <changeSet author="gaojianqiang" id="20220624-1732-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_index" columnName="trace_id"/>
+            </not>
+        </preConditions>
+        <comment>新增属性字段 trace_id</comment>
+        <sql>
+            alter table `wl_equipment_specific_index` add column `trace_id` varchar(64) DEFAULT NULL COMMENT 'iot数据上报唯一id';
+        </sql>
+    </changeSet>
+    <changeSet author="gaojianqiang" id="20220624-1732-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm" columnName="trace_id"/>
+            </not>
+        </preConditions>
+        <comment>新增属性字段 trace_id</comment>
+        <sql>
+            alter table `wl_equipment_specific_alarm` add column `trace_id` varchar(64) DEFAULT NULL COMMENT 'iot数据上报唯一id';
+        </sql>
+    </changeSet>
+    <changeSet author="gaojianqiang" id="20220624-1732-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="trace_id"/>
+            </not>
+        </preConditions>
+        <comment>新增属性字段 trace_id</comment>
+        <sql>
+            alter table `wl_equipment_specific_alarm_log` add column `trace_id` varchar(64) DEFAULT NULL COMMENT 'iot数据上报唯一id';
+        </sql>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file