更新

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

+package com.yeejoin.equipmanage.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author
+ * @title: EquipQrcodeColorEnum
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2020/12/12 14:23
+ */
+@Getter
+@AllArgsConstructor
+public enum DynamicLabelEnum {
+
+    NAME("name","名称"),
+    CODE("code","编码"),
+    POSITION("position","存放位置"),
+    MANUFACTURER("manufacturer","供应商"),
+    SYSTEM("systemName","所属系统"),
+    QRCODE("qrCode", "二维码"),
+    ALARMCONTENT("alarmContent","告警内容"),
+    ALARMDATE("alarmDate","告警时间");
+
+    private String code;
+
+    private String describe;
+
+    public static DynamicLabelEnum getEnumByKey(String key) {
+        DynamicLabelEnum colorEnum = null;
+        for (DynamicLabelEnum u : DynamicLabelEnum.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

@@ -17,6 +17,8 @@ public class SendToMsgRiskAlarmInfoVo {
 
     private String key;
 
+    private String name;
+
     private String value;
 
     private String alarmContent;

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

@@ -27,8 +27,10 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String traceId;
 
+    private String equipSpeId;
+
     // 指标告警状态
-    private Boolean reportIsAlarm;
+    private Boolean reportIsAlarm = false;
 
     // 存放位置
     private String position;
@@ -43,4 +45,6 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String codeColor;
 
+    private String batchNo;
+
 }

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

@@ -1514,13 +1514,7 @@ 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());
+            equipInfoVo.setEquipSpeId(String.valueOf(equipmentSpeIndex.getEquipmentSpecificId()));
 
             alarmInfoVo.setKey(equipmentSpeIndex.getEquipmentIndexKey());
             alarmInfoVo.setValue(equipmentSpeIndex.getValue());
@@ -1542,6 +1536,19 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     public void handleDataToRiskModel(String topic, String message) {
         JSONObject jsonObject = JSONObject.parseObject(message);
         SendToMsgRiskDetailVo detailVo = JSONObject.toJavaObject(jsonObject, SendToMsgRiskDetailVo.class);
+        SendToMsgRiskEquipInfoVo equipInfoVo = detailVo.getEquipInfo();
+        SendToMsgRiskAlarmInfoVo equipAlarm = detailVo.getAlarmInfo();
+        if (StringUtil.isNotEmpty(detailVo.getEquipInfo().getEquipSpeId())) {
+            EquipmentSpecific specific = equipmentSpecificMapper.selectById(detailVo.getEquipInfo().getEquipSpeId());
+            equipInfoVo.setPosition(specific.getPosition());
+            equipInfoVo.setManufacturerName(getEquipmentDetailInfo(specific.getEquipmentDetailId()).getManufacturerName());
+            equipInfoVo.setSystemIds(specific.getSystemId());
+            equipInfoVo.setSystemName(getSystemNameBySpeId(specific));
+            equipInfoVo.setQrCode(specific.getQrCode());
+            equipInfoVo.setCodeColor(EquipQrcodeColorEnum.getEnumByKey(specific.getEquipStatus()).getColor());
+            equipInfoVo.setBatchNo(getEquipmentDetailInfo(specific.getEquipmentDetailId()).getStandard());
+        }
+
         RiskDataVo dataVo = new RiskDataVo();
         dataVo.setIndexKey(detailVo.getAlarmInfo().getKey());
         dataVo.setIndexValue(detailVo.getAlarmInfo().getValue());
@@ -1557,12 +1564,60 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
         dynamicDetailsVo.setTabName("装备指标联动数据");
         List<TableContentVo> contentVos = new ArrayList<>();
-        TableContentVo contentVo = new TableContentVo();
-        contentVo.setKey("1");
-        contentVo.setLabel("文本名称");
-        contentVo.setValue("文本值");
-        contentVo.setType("text");
-        contentVos.add(contentVo);
+        for (DynamicLabelEnum u : DynamicLabelEnum.values()) {
+            TableContentVo contentVo = new TableContentVo();
+            contentVo.setKey(u.getCode());
+            switch (u.getCode()) {
+                case "name":
+                    contentVo.setLabel(u.getDescribe());
+                    contentVo.setValue(equipInfoVo.getName());
+                    contentVo.setType("text");
+                    break;
+                case "code":
+                    contentVo.setLabel(u.getDescribe());
+                    contentVo.setValue(equipInfoVo.getCode());
+                    contentVo.setType("text");
+                    break;
+                case "position":
+                    contentVo.setLabel(u.getDescribe());
+                    contentVo.setValue(equipInfoVo.getPosition());
+                    contentVo.setType("text");
+                    break;
+                case "manufacturer":
+                    contentVo.setLabel(u.getDescribe());
+                    contentVo.setValue(equipInfoVo.getManufacturerName());
+                    contentVo.setType("text");
+                    break;
+                case "systemName":
+                    contentVo.setLabel(u.getDescribe());
+                    contentVo.setValue(equipInfoVo.getSystemName());
+                    contentVo.setType("text");
+                    break;
+                case "qrCode":
+                    contentVo.setLabel(u.getDescribe());
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("qrCode", equipInfoVo.getQrCode());
+                    map.put("color", equipInfoVo.getCodeColor());
+                    contentVo.setValue(map);
+                    contentVo.setType("text");
+                    break;
+                case "alarmContent":
+                    contentVo.setLabel(u.getDescribe());
+                    contentVo.setValue(equipAlarm.getAlarmContent());
+                    contentVo.setType("text");
+                    break;
+                case "alarmDate":
+                    contentVo.setLabel(u.getDescribe());
+                    contentVo.setValue(equipAlarm.getAlarmDate());
+                    contentVo.setType("text");
+                    break;
+                default:
+                    log.info("方法参数错误 !!!");
+                    break;
+            }
+            contentVos.add(contentVo);
+        }
+
         dynamicDetailsVo.setTabContent(contentVos);
         detailsVos.add(dynamicDetailsVo);
         infoVo.setDynamicDetails(detailsVos);
@@ -1594,10 +1649,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         return sb.toString();
     }
 
-    public String getManufacturerName(long id) {
+    public EquipmentDetail getEquipmentDetailInfo(long id) {
         EquipmentDetail detail = equipmentDetailMapper.selectById(id);
         ManufacturerInfo info = manufacturerInfoMapper.selectById(detail.getManufacturerId());
-        return Optional.ofNullable(info.getName()).orElse("");
+        detail.setManufacturerName(info.getName());
+        return Optional.ofNullable(detail).orElse(new EquipmentDetail());
 
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
+import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
 import com.yeejoin.amos.patrol.business.dto.*;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
 import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
@@ -115,6 +116,9 @@ public class CheckController extends AbstractBaseController {
     @Autowired
     private CheckMapper checkMapper;
 
+    @Autowired
+    PointMapper pointMapper;
+
     /**
      *
      * 巡查记录列表
@@ -284,22 +288,28 @@ public class CheckController extends AbstractBaseController {
      */
     public void publishDataToMessage(List<Map<String, Object>> checkInputItems) {
         for (Map<String, Object> map : checkInputItems) {
-            if (map.containsKey("equipId") && !map.get("input_value").equals("合格") ){
-                equipFeign.updateEquipSpecificStatus("1",map.get("equipId").toString(),map.get("traceId").toString(),"patrol");
-            }
             SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo();
             SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
             SendToMsgRiskAlarmInfoVo alarmInfoVo = new SendToMsgRiskAlarmInfoVo();
+            if (map.containsKey("equipId") && !map.get("input_value").equals("合格") ){
+                equipFeign.updateEquipSpecificStatus("1",map.get("equipId").toString(),map.get("traceId").toString(),"patrol");
+                equipInfoVo.setEquipSpeId(String.valueOf(map.get("equipId")));
+                equipInfoVo.setReportIsAlarm(Boolean.TRUE);
+            }
             equipInfoVo.setId(String.valueOf(map.get("id")));
             equipInfoVo.setName(String.valueOf(map.get("inputItem")));
+            equipInfoVo.setValue(String.valueOf(map.get("input_value")));
             equipInfoVo.setCode(String.valueOf(map.get("item_no")));
             equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code")));
             equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name")));
             if (map.containsKey("traceId")){
             equipInfoVo.setTraceId(map.get("traceId").toString());
             }
-            alarmInfoVo.setKey(String.valueOf(map.get("inputItem")));
-            alarmInfoVo.setValue(String.valueOf(map.get("input_value")));
+
+            Map<String, Object> pointMap = pointMapper.getPointById(Long.valueOf(String.valueOf(map.get("pointId"))));
+            alarmInfoVo.setKey(String.valueOf(pointMap.get("id")));
+            alarmInfoVo.setName(String.valueOf(pointMap.get("pointName")));
+            alarmInfoVo.setValue(String.valueOf(pointMap.get("pointNo")));
 
             TopicEntityVo topicEntityVo = new TopicEntityVo();
             topicEntityVo.setTopic(riskTopic);

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

@@ -19,6 +19,8 @@ public class SendToMsgRiskAlarmInfoVo {
 
     private String value;
 
+    private String name;
+
     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

@@ -17,6 +17,8 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String name;
 
+    private String value;
+
     private String code;
 
     private String bizOrgName;
@@ -25,10 +27,10 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String traceId;
 
-
+    private String equipSpeId;
 
     // 指标告警状态
-    private Boolean reportIsAlarm;
+    private Boolean reportIsAlarm = false;
 
     // 存放位置
     private String position;
@@ -39,4 +41,10 @@ public class SendToMsgRiskEquipInfoVo {
 
     private String manufacturerName;
 
+    private String qrCode;
+
+    private String codeColor;
+
+    private String batchNo;
+
 }

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2181,6 +2181,7 @@
     <select id="queryCheckInputItemsByCheckId" resultType="Map">
         SELECT
             c.id,
+            c.point_id pointId,
             ii.item_no,
             ii.NAME inputItem,
             ci.input_value,