修改BaseEntity ID为 @TableId(value = "id", type = IdType.ID_WORKER_STR) 改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/BaseEntity.java

@@ -19,7 +19,7 @@ public class BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.ID_WORKER)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
     protected String id;
 
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/vo/AlarmEventLogVO.java

@@ -17,12 +17,12 @@ public class AlarmEventLogVO implements Serializable {
     private String bizOrgCode;
     private String orgCode;
     private String severityLevel;
-    private String objcectType;
-    private String objcectId;
-    private String objcectCode;
-    private String objcectName;
-    private String objcectIndexName;
-    private String objcectIndexKey;
+    private String objectType;
+    private String objectId;
+    private String objectCode;
+    private String objectName;
+    private String objectIndexName;
+    private String objectIndexKey;
     private String alarmTime;
     private String signalId;
     private String controlModelId;
@@ -42,7 +42,7 @@ public class AlarmEventLogVO implements Serializable {
     private String buildingCode;
     private String systemCode;
     private String systemName;
-    private String objcectIndexValue;
-    private String objcectIndexType;
+    private String objectIndexValue;
+    private String objectIndexType;
     private String recoveryStatus;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/config/CcsMqttReceiveConfig.java

 package com.yeejoin.amos.boot.module.ccs.biz.config;
 
 
-import com.github.pagehelper.util.StringUtil;
 import com.yeejoin.amos.boot.module.ccs.api.service.MqttReceiveService;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,17 +19,7 @@ import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author keyong
- * @title: CcsMqttReceiveConfig
- * <pre>
- * @description: MQTT订阅模式消费类
- * </pre>
- * @date 2020/10/29 19:23
- */
+@Slf4j
 @Configuration
 @IntegrationComponentScan
 public class CcsMqttReceiveConfig {
@@ -107,6 +97,7 @@ public class CcsMqttReceiveConfig {
         return message -> {
             String topic = message.getHeaders().get("mqtt_receivedTopic").toString();
             String msg = message.getPayload().toString();
+            log.info("message内容：{}", msg);
             if (alarmTopic.equals(topic)) {
                 mqttReceiveService.handlerMqttAlarmMessage(topic, msg);
             } else if (questionTopic.equals(topic)) {

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

@@ -8,6 +8,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentSignalLog;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalLogMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireStationInfoService;
 import com.yeejoin.amos.boot.module.ccs.api.service.MqttReceiveService;
 import com.yeejoin.amos.boot.module.ccs.api.vo.AlarmEventLogVO;
@@ -39,6 +40,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     private IFireStationInfoService fireStationInfoService;
 
+    @Autowired
+    private FireEquipmentSignalLogMapper fireEquipmentSignalLogMapper;
+
 
     //TODO 逻辑待补充
     @Override
@@ -56,18 +60,19 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 "insert".equals(receiveData.getActive()) && ObjectUtil.isNotEmpty(receiveData.getAlarmEventLog())) {
             AlarmEventLogVO alarmEventLog = receiveData.getAlarmEventLog();
 
-            if (StrUtil.isNotEmpty(alarmEventLog.getObjcectType()) && "equipment".equals(alarmEventLog.getObjcectType()) &&
-                    StrUtil.isNotEmpty(alarmEventLog.getObjcectIndexType()) && "FIREALARM".equals(alarmEventLog.getObjcectIndexType())) {
+            if (StrUtil.isNotEmpty(alarmEventLog.getObjectType()) && "equipment".equals(alarmEventLog.getObjectType()) &&
+                    StrUtil.isNotEmpty(alarmEventLog.getObjectIndexType()) && "FIREALARM".equals(alarmEventLog.getObjectIndexType()) &&
+            StrUtil.isNotEmpty(alarmEventLog.getOrgCode())) {
                 FireEquipmentSignalLog fireEquipmentSignalLog = new FireEquipmentSignalLog();
-                fireEquipmentSignalLog.setStationName(alarmEventLog.getBizOrgName());
                 fireEquipmentSignalLog.setStationCode(alarmEventLog.getOrgCode());
-                fireEquipmentSignalLog.setFireEquipmentMrid(alarmEventLog.getObjcectCode());
-                fireEquipmentSignalLog.setFireEquipmentName(alarmEventLog.getObjcectName());
-                fireEquipmentSignalLog.setFireEquipmentIndexName(alarmEventLog.getObjcectIndexName());
-                fireEquipmentSignalLog.setFireEquipmentIndexKey(alarmEventLog.getObjcectIndexKey());
+                fireEquipmentSignalLog.setFireEquipmentIndexValue(alarmEventLog.getObjectIndexValue());
+                fireEquipmentSignalLog.setFireEquipmentMrid(alarmEventLog.getObjectCode());
+                fireEquipmentSignalLog.setFireEquipmentName(alarmEventLog.getObjectName());
+                fireEquipmentSignalLog.setFireEquipmentIndexName(alarmEventLog.getObjectIndexName());
+                fireEquipmentSignalLog.setFireEquipmentIndexKey(alarmEventLog.getObjectIndexKey());
                 fireEquipmentSignalLog.setFireBuildingMrid(alarmEventLog.getBuildingCode());
-                fireEquipmentSignalLog.setSignalType(alarmEventLog.getObjcectIndexType());
-                fireEquipmentSignalLog.setSignalTypeName("火灾告警");
+                fireEquipmentSignalLog.setSignalType(alarmEventLog.getObjectIndexType());
+                fireEquipmentSignalLog.setSignalTypeName(alarmEventLog.getObjectIndexName());
                 fireEquipmentSignalLog.setAlarmReason(alarmEventLog.getQuestionReason());
                 fireEquipmentSignalLog.setConfirmState("0");
                 fireEquipmentSignalLog.setConfirmDate(DateUtil.parse(alarmEventLog.getAlarmTime()));
@@ -80,10 +85,12 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 fireEquipmentSignalLog.setSignalReportDate(DateUtil.today());
                 fireEquipmentSignalLog.setLocation(alarmEventLog.getBuildingName());
                 fireEquipmentSignalLog.setSynDate(now);
-                FireStationInfoDto oneByCode = fireStationInfoService.getOneByCode(fireEquipmentSignalLog.getStationCode());
+                fireEquipmentSignalLog.setSignalId(alarmEventLog.getSignalId());
+                FireStationInfoDto oneByCode = fireStationInfoService.getOneByCode(alarmEventLog.getOrgCode());
+                fireEquipmentSignalLog.setStationName(oneByCode.getName());
                 fireEquipmentSignalLog.setLng(oneByCode.getLng());
                 fireEquipmentSignalLog.setLat(oneByCode.getLat());
-                fireEquipmentSignalLogServiceImpl.save(fireEquipmentSignalLog);
+                fireEquipmentSignalLogMapper.insert(fireEquipmentSignalLog);
             }
         } else if (ObjectUtil.isNotEmpty(receiveData) && StrUtil.isNotEmpty(receiveData.getActive()) &&
                 "update".equals(receiveData.getActive()) && ObjectUtil.isNotEmpty(receiveData.getRawData()) && StrUtil.isNotEmpty(receiveData.getRawData().getEquipmentSpecificIotCode())) {
@@ -111,11 +118,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
         if (ObjectUtil.isNotEmpty(questionVO) && CollUtil.isNotEmpty(questionVO.getAlarmEventLog())) {
             questionVO.getAlarmEventLog().forEach(item -> {
+                if (StrUtil.isNotEmpty(item.getSignalId())) {
                     FireEquipmentSignalLog fireEquipmentSignalLog = new FireEquipmentSignalLog();
                     fireEquipmentSignalLog.setConfirmState(item.getStatus());
                     UpdateWrapper<FireEquipmentSignalLog> updateWrapper = new UpdateWrapper<>();
                     updateWrapper.lambda().eq(FireEquipmentSignalLog::getSignalId, item.getSignalId());
                     fireEquipmentSignalLogServiceImpl.update(fireEquipmentSignalLog, updateWrapper);
+                }
             });
         }
         log.info(String.format("收到mqtt（问题下发消息推送）消息并处理完成：%s", message));