风险表单字段更新

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/EquipQrcodeColorEnum.java

@@ -16,12 +16,25 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum EquipQrcodeColorEnum {
 
-    GREEN("0","绿色"),
-    YELLOW("1","黄色"),
-    RED("2","红色");
+    GREEN("0","绿色", "#00E12E"),
+    YELLOW("1","黄色", "#FFA500"),
+    RED("2","红色", "#EF2805");
 
     private String code;
 
     private String describe;
 
+    private String color;
+
+    public static EquipQrcodeColorEnum getEnumByKey(String key) {
+        EquipQrcodeColorEnum colorEnum = null;
+        for (EquipQrcodeColorEnum u : EquipQrcodeColorEnum.values()) {
+            if (u.getCode().equals(key)) {
+                colorEnum = u;
+                break;
+            }
+        }
+        return colorEnum;
+    }
+
 }

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

@@ -2,6 +2,8 @@ package com.yeejoin.equipmanage.common.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author keyong
  * @title: SendToMsgRiskAlarmInfoVo
@@ -16,4 +18,8 @@ public class SendToMsgRiskAlarmInfoVo {
     private String key;
 
     private String value;
+
+    private String alarmContent;
+
+    private Date alarmDate;
 }

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

@@ -15,13 +15,30 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String id;
 
+    // 装备名称
     private String name;
 
+    // 装备编码
     private String code;
 
     private String bizOrgName;
 
     private String bizOrgCode;
 
+    // 指标告警状态
     private Boolean reportIsAlarm;
+
+    // 存放位置
+    private String position;
+
+    private String systemName;
+
+    private String systemIds;
+
+    private String manufacturerName;
+
+    private String qrCode;
+
+    private String codeColor;
+
 }

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

@@ -17,7 +17,7 @@ public class TableContentVo {
 
     private String label;
 
-    private String value;
+    private Object value;
 
     private String type;
 }

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

@@ -30,6 +30,7 @@ import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.BeanUtil;
 import javafx.scene.control.Tab;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -201,6 +202,12 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     private IPressurePumpService pressurePumpService;
 
+    @Autowired
+    EquipmentDetailMapper equipmentDetailMapper;
+
+    @Autowired
+    private ManufacturerInfoMapper manufacturerInfoMapper;
+
     @Value("${equipManage.name}")
     private String serverName;
 
@@ -1471,9 +1478,18 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             equipInfoVo.setBizOrgCode(equipmentSpeIndex.getBizOrgCode());
             equipInfoVo.setBizOrgName(equipmentSpeIndex.getBizOrgName());
             equipInfoVo.setReportIsAlarm(isAlarm);
+            EquipmentSpecific specific = equipmentSpecificMapper.selectById(equipmentSpeIndex.getEquipmentSpecificId());
+            equipInfoVo.setPosition(specific.getPosition());
+            equipInfoVo.setManufacturerName(getManufacturerName(specific.getEquipmentDetailId()));
+            equipInfoVo.setSystemIds(specific.getSystemId());
+            equipInfoVo.setSystemName(getSystemNameBySpeId(specific));
+            equipInfoVo.setQrCode(specific.getQrCode());
+            equipInfoVo.setCodeColor(EquipQrcodeColorEnum.getEnumByKey(specific.getEquipStatus()).getColor());
 
             alarmInfoVo.setKey(equipmentSpeIndex.getEquipmentIndexKey());
             alarmInfoVo.setValue(equipmentSpeIndex.getValue());
+            alarmInfoVo.setAlarmContent(equipmentSpeIndex.getEquipmentName() + equipmentSpeIndex.getEquipmentIndexName());
+            alarmInfoVo.setAlarmDate(equipmentSpeIndex.getUpdateDate());
 
             TopicEntityVo topicEntityVo = new TopicEntityVo();
             topicEntityVo.setIotCode(equipmentSpeIndex.getIotCode());
@@ -1518,6 +1534,36 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         mqttSendGateway.sendToMqtt(riskTopic, JSON.toJSONString(dataVo));
     }
 
+    public String getSystemNameBySpeId(EquipmentSpecific equipmentSpecific) {
+        List<FireFightingSystemEntity> sys = new ArrayList<>();
+        String[] ids;
+        String sysIds = equipmentSpecific.getSystemId();
+        if (StringUtil.isNotEmpty(sysIds)) {
+            if (-1 != sysIds.indexOf(",")) {
+                ids = sysIds.split(",");
+                sys = fireFightingSystemMapper.getFightingSysByIds(ids);
+            } else {
+                FireFightingSystemEntity entity = fireFightingSystemMapper.selectById(Long.valueOf(sysIds));
+                sys.add(entity);
+            }
+        }
+        StringBuilder sb = new StringBuilder();
+        sys.forEach(x -> {
+            if (0 < sb.length()) {
+                sb.append(",");
+            }
+            sb.append(x.getName());
+        });
+        return sb.toString();
+    }
+
+    public String getManufacturerName(long id) {
+        EquipmentDetail detail = equipmentDetailMapper.selectById(id);
+        ManufacturerInfo info = manufacturerInfoMapper.selectById(detail.getManufacturerId());
+        return Optional.ofNullable(info.getName()).orElse("");
+
+    }
+
     /**
      * 更新数据报表表
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/SendToMsgRiskAlarmInfoVo.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.patrol.business.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author keyong
  * @title: SendToMsgRiskAlarmInfoVo
@@ -16,4 +18,8 @@ public class SendToMsgRiskAlarmInfoVo {
     private String key;
 
     private String value;
+
+    private String alarmContent;
+
+    private Date alarmDate;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/SendToMsgRiskEquipInfoVo.java

@@ -25,4 +25,16 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String equipId;
 
+    // 指标告警状态
+    private Boolean reportIsAlarm;
+
+    // 存放位置
+    private String position;
+
+    private String systemName;
+
+    private String systemIds;
+
+    private String manufacturerName;
+
 }