修改代码

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

@@ -52,4 +52,9 @@ public class EquipQrcodeRecord extends BaseEntity {
     @ApiModelProperty(value = "状态(0:绿码,1:黄码,2:红码)")
     @TableField("clean_reason")
     private  String cleanReason;
+
+    @ApiModelProperty(value = "装备指标")
+    @TableField("equip_index")
+    private  String equipIndex;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -423,17 +423,28 @@ public class EquipmentSpecificController extends AbstractBaseController {
         int oldStatus = Integer.valueOf(spec.getEquipStatus());
         int newStatus = Integer.valueOf(status);
 
+        LambdaQueryWrapper<EquipQrcodeRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(EquipQrcodeRecord::getEquipid, id);
+        wrapper.eq(EquipQrcodeRecord::getSourceId, sourceId);
+        EquipQrcodeRecord equipQrcodeRecord = equipQrcodeRecordMapper.selectOne(wrapper);
+
+        if (ObjectUtils.isEmpty(equipQrcodeRecord)){
             //保存 wl_equip_qrcode_record 二维码记录
-        EquipQrcodeRecord equipQrcodeRecord = new EquipQrcodeRecord();
-        equipQrcodeRecord.setEquipid(Long.valueOf(id));
-        equipQrcodeRecord.setSource(source);
-        equipQrcodeRecord.setAlarmTime(new Date());
+            EquipQrcodeRecord newEquipQrcodeRecord = new EquipQrcodeRecord();
+            newEquipQrcodeRecord.setEquipid(Long.valueOf(id));
+            newEquipQrcodeRecord.setSource(source);
+            newEquipQrcodeRecord.setAlarmTime(new Date());
+            newEquipQrcodeRecord.setStatus(status);
+            newEquipQrcodeRecord.setSourceId(sourceId);
+            newEquipQrcodeRecord.setBizOrgCode(spec.getBizOrgCode());
+            newEquipQrcodeRecord.setBizOrgName(spec.getBizOrgName());
+            newEquipQrcodeRecord.setSystemCode(spec.getSystemId());
+            equipQrcodeRecordMapper.insert(newEquipQrcodeRecord);
+        } else {
             equipQrcodeRecord.setStatus(status);
-        equipQrcodeRecord.setSourceId(sourceId);
-        equipQrcodeRecord.setBizOrgCode(spec.getBizOrgCode());
-        equipQrcodeRecord.setBizOrgName(spec.getBizOrgName());
-        equipQrcodeRecord.setSystemCode(spec.getSystemId());
-        equipQrcodeRecordMapper.insert(equipQrcodeRecord);
+            equipQrcodeRecordMapper.updateById(equipQrcodeRecord);
+        }
+
         if (oldStatus < newStatus){ //当前状态小于事件状态时 取更高级别状态赋码
             equipmentSpecificSerivce.updateEquipSpecificStatus(status, id);
         }

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

@@ -954,6 +954,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         equipQrcodeRecord.setBizOrgCode(action.getBizOrgCode());
                         equipQrcodeRecord.setBizOrgName(action.getBizOrgName());
                         equipQrcodeRecord.setSystemCode(action.getSystemIds());
+                        equipQrcodeRecord.setEquipIndex(equipmentSpecificAlarmLog.getEquipmentSpecificIndexKey());
                         equipQrcodeRecordMapper.insert(equipQrcodeRecord);
 
                         isAlarm = Boolean.TRUE;
@@ -963,7 +964,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         //恢复后修改 wl_equip_qrcode_record中对应记录
                         LambdaQueryWrapper<EquipQrcodeRecord> wrapper = new LambdaQueryWrapper<>();
                         wrapper.eq(EquipQrcodeRecord::getEquipid, action.getEquipmentSpecificId());
-                        wrapper.eq(EquipQrcodeRecord::getSourceId, action.getId());
+                        wrapper.eq(EquipQrcodeRecord::getEquipIndex,iotDatalist.get(0).getKey());
                         EquipQrcodeRecord equipQrcodeRecord = equipQrcodeRecordMapper.selectOne(wrapper);
                         equipQrcodeRecord.setCleanTime(new Date());
                         equipQrcodeRecord.setCleanReason("设备上报复归信息");
@@ -983,7 +984,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         List<EquipQrcodeRecord> equipQrcodeRecords = equipQrcodeRecordMapper.selectList(query);
                         String status = equipQrcodeRecords.stream().sorted(Comparator.comparing(EquipQrcodeRecord::getStatus)).findFirst().get().getStatus();
                         if (equipQrcodeRecords.size() > 0) {  //如果记录表中还存在未消除的巡检故障 则先修改为黄码
-                            iEquipmentSpecificSerivce.updateEquipSpecificStatus(equipQrcodeRecords.get(0).getStatus(), String.valueOf(specific.getId()));
+                            iEquipmentSpecificSerivce.updateEquipSpecificStatus(status, String.valueOf(specific.getId()));
                         } else {
                             iEquipmentSpecificSerivce.updateEquipSpecificStatus(specific.getEquipStatus(), String.valueOf(specific.getId()));