更新

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

@@ -74,6 +74,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
         SendToMsgRiskAlarmInfoVo equipAlarm = new SendToMsgRiskAlarmInfoVo();
         Map<String, Object> m = new HashMap<>();
+        RiskBizInfoVo infoVo = new RiskBizInfoVo();
         if (source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
             List<Map<String, Object>> checkInputItems = equipmentSpecificMapper.queryCheckInputItemsByCheckId(id);
             Map<String, Object> map = checkInputItems.get(0);
@@ -102,6 +103,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 m.put("checkUser", String.valueOf(patrolMap.get("username")));
                 m.put("checkResult", String.valueOf(patrolMap.get("inputStatus")));
                 m.put("checkTime", String.valueOf(patrolMap.get("checkTime")));
+                infoVo.setSourceSupplyField(String.valueOf(patrolMap.get("checkInputId")));
             }
         } else if (source.equalsIgnoreCase(RiskSourceTypeEnum.EQUIP.getName())) {
             equipmentSpecId = id;
@@ -148,7 +150,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         detailVo.setEquipInfo(equipInfoVo);
         detailVo.setAlarmInfo(equipAlarm);
-        RiskBizInfoVo infoVo = new RiskBizInfoVo();
+
         infoVo.setWarningObjectName(detailVo.getEquipInfo().getName());
         infoVo.setWarningObjectCode(detailVo.getEquipInfo().getCode());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -198,15 +200,23 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     contentVo.setType("qrcode");
                     break;
                 case "alarmContent":
-                    contentVo.setLabel(u.getDescribe());
-                    contentVo.setValue(equipAlarm.getAlarmContent());
-                    contentVo.setType("text");
-                    break;
+                    if(!source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
+                        contentVo.setLabel(u.getDescribe());
+                        contentVo.setValue(equipAlarm.getAlarmContent());
+                        contentVo.setType("text");
+                        break;
+                    } else {
+                        break;
+                    }
                 case "alarmDate":
-                    contentVo.setLabel(u.getDescribe());
-                    contentVo.setValue(equipAlarm.getAlarmDate());
-                    contentVo.setType("text");
-                    break;
+                    if(!source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
+                        contentVo.setLabel(u.getDescribe());
+                        contentVo.setValue(equipAlarm.getAlarmDate());
+                        contentVo.setType("text");
+                        break;
+                    } else {
+                        break;
+                    }
                 default:
                     log.info("方法参数错误 !!!");
                     break;