1.格式化加发送消息时增加uuid 否则消息一样前端不刷新

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

 package com.yeejoin.equipmanage.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.equipmanage.common.entity.*;
-import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
-import liquibase.pro.packaged.W;
-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;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-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;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -39,54 +10,35 @@ import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentDefectAlarm;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFaultAlarm;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.dto.TemperatureAlarmDto;
-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.entity.vo.EquipmentStateVo;
-import com.yeejoin.equipmanage.common.entity.vo.IndexStateVo;
-import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
-import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
-import com.yeejoin.equipmanage.common.enums.CarForGisEnum;
-import com.yeejoin.equipmanage.common.enums.EquipAndCarEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentIndexLabelsEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.equipmanage.common.enums.NBalarmEnum;
-import com.yeejoin.equipmanage.common.enums.RiskLeverForAutoSys;
-import com.yeejoin.equipmanage.common.enums.TemperatureAlarm;
-import com.yeejoin.equipmanage.common.enums.TopicEnum;
-import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
+import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.CarIndexGisVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentIndexLabelsVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentVo;
-import com.yeejoin.equipmanage.common.vo.IotDataVO;
-import com.yeejoin.equipmanage.common.vo.Token;
-import com.yeejoin.equipmanage.common.vo.TopicEntityVo;
+import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
-import com.yeejoin.equipmanage.mapper.CarMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
-import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
+import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.ICarPropertyService;
-import com.yeejoin.equipmanage.service.IEquipmentAlarmReportDayService;
-import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmLogService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.IMainIotMonitorSerivce;
-import com.yeejoin.equipmanage.service.ISyncDataService;
-import com.yeejoin.equipmanage.service.MqttReceiveService;
-import com.yeejoin.equipmanage.service.MqttSendGateway;
+import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.BeanUtil;
-
 import lombok.extern.slf4j.Slf4j;
+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;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+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 java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 //import net.sf.json.JSONObject;
 
@@ -97,7 +49,6 @@ import lombok.extern.slf4j.Slf4j;
  * <pre>
  * &#64;description: 增量数据处理
  *         </pre>
- * 
  * @date 2020/11/3 13:39
  */
 @Slf4j
@@ -226,7 +177,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
         JSONObject json = JSONObject.parseObject(message);
         Iterator it = json.entrySet().iterator();
-		List<IotDataVO> iotDatalist = new ArrayList<IotDataVO>();
+        List<IotDataVO> iotDatalist = new ArrayList<>();
         String traceId = "";
         while (it.hasNext()) {
             IotDataVO iotDataVO = new IotDataVO();
@@ -391,7 +342,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 }
             });
             boolean updateBatchById = false;
-			if(!carIndexsList.isEmpty()){
+            if (!carIndexsList.isEmpty()) {
                 carPropertyService.updateBatchById(carIndexsList);
                 updateBatchById = true;
             }
@@ -443,7 +394,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             // 添加性能指标项
             //flag 无意义 getSpeIndex 方法其他地方共用 做了额外封装 为0时走原逻辑
             int flag = 0;
-            equipmentStateVo.setSpeindexList(fireFightingSystemService.getSpeIndex(index.getEquipmentSpecificId(),flag));
+            equipmentStateVo.setSpeindexList(fireFightingSystemService.getSpeIndex(index.getEquipmentSpecificId(), flag));
             Map<String, Object> topicObject = new HashMap<>();
             topicObject.put("equipCode", equipmentStateVo.getEquipCode());
             if (TrueOrFalseEnum.real.value.toUpperCase().equals(index.getValue().toUpperCase())) {
@@ -452,6 +403,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 topicObject.put("color", "");
             }
             Map<String, Object> map = JSON.parseObject(JSON.toJSONString(equipmentStateVo));
+            topicObject.put("uuid", UUID.randomUUID().toString());
             map.put(canvasTopic, topicObject);
 
             // 发送数据至画布
@@ -493,11 +445,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
             //告警弹窗需要根据人员单位判断是否展示 后端返回单位Code 前端判断
             LambdaQueryWrapper<EquipmentSpecific> wrapper = new LambdaQueryWrapper<>();
-			wrapper.eq(BaseEntity::getId,equipmentSpecificAlarmLog.getEquipmentSpecificId());
+            wrapper.eq(BaseEntity::getId, equipmentSpecificAlarmLog.getEquipmentSpecificId());
             EquipmentSpecific equipmentSpecific = equipmentSpecificMapper.selectOne(wrapper);
-			if (!ValidationUtil.isEmpty(equipmentSpecific) && !ValidationUtil.isEmpty(equipmentSpecific.getBizOrgCode())){
+            if (!ValidationUtil.isEmpty(equipmentSpecific) && !ValidationUtil.isEmpty(equipmentSpecific.getBizOrgCode())) {
                 Map<String, String> equipMap = new HashMap<>();
-				equipMap.put("bizOrgCode",equipmentSpecific.getBizOrgCode());
+                equipMap.put("bizOrgCode", equipmentSpecific.getBizOrgCode());
                 model.setExtras(equipMap);
             }
             model.setRelationId(String.valueOf(equipmentSpecificAlarmLog.getId()));