省测卡片问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/EquipmentIotMqttReceiveConfig.java

@@ -160,8 +160,6 @@ public class EquipmentIotMqttReceiveConfig {
                     mqttEventReceiveService.handlerMqttIncrementMessage(topic, msg);
                 } else if (dataType.equals("transmit") && StringUtil.isNotEmpty(msg)) {
                     mqttReceiveService.handlerMqttRomaMessage(topic, msg);
-                } else if (dataType.equals("trigger") && StringUtil.isNotEmpty(msg)) {
-                    mqttReceiveService.handleDataToRiskModel(topic, msg);
                 }
             }
         };

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

@@ -830,74 +830,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     }
                 });
 
-                equipmentSpecificAlarms.forEach(action -> {
-                    EquipmentSpecific specific = equipmentSpecificMapper.selectById(action.getEquipmentSpecificId());
-                    if (AlarmStatusEnum.BJ.getCode() == action.getStatus()) {
-                        EquipmentSpecificAlarmLog equipmentSpecificAlarmLog = addEquipAlarmLogRecord(action);
-                        alarmLogs.add(equipmentSpecificAlarmLog);
-                        if (ValidationUtil.isEmpty(action.getAlamContent())) {
-                            action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
-                        }
-                        specific.setEquipStatus(EquipQrcodeColorEnum.RED.getCode());
-
-                        LambdaQueryWrapper<EquipQrcodeRecord> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(EquipQrcodeRecord::getEquipid, action.getEquipmentSpecificId());
-                        wrapper.eq(EquipQrcodeRecord::getEquipIndex,equipmentSpecificAlarmLog.getEquipmentSpecificIndexKey());
-                        wrapper.isNull(EquipQrcodeRecord::getCleanTime);
-                        EquipQrcodeRecord equipQrcodeRecord = equipQrcodeRecordMapper.selectOne(wrapper);
-                        if (ObjectUtils.isEmpty(equipQrcodeRecord)){
-                            //保存 wl_equip_qrcode_record 二维码记录
-                            EquipQrcodeRecord qrcodeRecord = new EquipQrcodeRecord();
-                            qrcodeRecord.setEquipid(action.getEquipmentSpecificId());
-                            qrcodeRecord.setSource("equip");
-                            qrcodeRecord.setAlarmTime(new Date());
-                            qrcodeRecord.setStatus(EquipQrcodeColorEnum.RED.getCode());
-                            qrcodeRecord.setSourceId(equipmentSpecificAlarmLog.getId().toString());
-                            qrcodeRecord.setBizOrgCode(action.getBizOrgCode());
-                            qrcodeRecord.setBizOrgName(action.getBizOrgName());
-                            qrcodeRecord.setSystemCode(action.getSystemIds());
-                            qrcodeRecord.setEquipIndex(equipmentSpecificAlarmLog.getEquipmentSpecificIndexKey());
-                            equipQrcodeRecordMapper.insert(qrcodeRecord);
-                        }
-                        isAlarm = Boolean.TRUE;
-                        mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
-                        iEquipmentSpecificSerivce.updateEquipSpecificStatus(specific.getEquipStatus(), String.valueOf(specific.getId()));
-                    } else {
-                        //恢复后修改 wl_equip_qrcode_record中对应记录
-                        LambdaQueryWrapper<EquipQrcodeRecord> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(EquipQrcodeRecord::getEquipid, action.getEquipmentSpecificId());
-                        wrapper.eq(EquipQrcodeRecord::getEquipIndex,iotDatalist.get(0).getKey());
-                        wrapper.isNull(EquipQrcodeRecord::getCleanTime);
-                        EquipQrcodeRecord equipQrcodeRecord = equipQrcodeRecordMapper.selectOne(wrapper);
-                        equipQrcodeRecord.setCleanTime(new Date());
-                        equipQrcodeRecord.setCleanReason("设备上报复归信息");
-                        equipQrcodeRecordMapper.updateById(equipQrcodeRecord);
-
-                        specific.setEquipStatus(EquipQrcodeColorEnum.GREEN.getCode());
-                        isAlarm = Boolean.FALSE;
-                        alarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), action.getTraceId(),
-                                equipmentSpecificAlarmLogService, false));
-                        mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString());
-                        bool = Boolean.TRUE;
-
-                        //查询二维码事件记录表中该设备的历史数据
-                        LambdaQueryWrapper<EquipQrcodeRecord> query = new LambdaQueryWrapper<>();
-                        query.eq(EquipQrcodeRecord::getEquipid, action.getEquipmentSpecificId());
-                        query.isNull(EquipQrcodeRecord::getCleanTime);
-                        query.orderByDesc(EquipQrcodeRecord::getStatus);
-                        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()));
-                        } else {
-                            iEquipmentSpecificSerivce.updateEquipSpecificStatus(specific.getEquipStatus(), String.valueOf(specific.getId()));
-
-                        }
-
-                    }
-                });
-
                 // 直流中心消息推送刷新
                 publishDataToDCCenterPage(equipmentSpecificIndexList);