故障查询反显 故障说明与建议

device-api-service/src/main/java/com/xy/service/DeviceFaultInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xy.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +12,7 @@ import com.xy.collections.map.JMap;
 import com.xy.consts.CommConsts;
 import com.xy.dto.DeviceFaultInfoDto;
 import com.xy.dto.DeviceFaultInfoFlowDto;
+import com.xy.dto.SysCodeConfigureDto;
 import com.xy.dto.SysWorkUser.ListDto;
 import com.xy.dto.SysWorkUser.SysWorkVo;
 import com.xy.dto.be.MercDto;
@@ -31,7 +33,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.xy.utils.Beans.copy;
@@ -57,6 +61,7 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
     private final DeviceInfoServiceImpl deviceInfoService;
     private final DeviceFaultInfoFlowServiceImpl deviceFaultInfoFlowService;
     private final SysWorkUserService sysWorkUserService;
+    private final SysCodeConfigureService sysCodeConfigureService;
 
     @PostMapping("obj")
     @ApiOperation("对象查询")
@@ -100,14 +105,29 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
         List<DeviceFaultInfoDto.Vo> records = data.getRecords();
         if (CollUtil.isNotEmpty(records)) {
             List<Long> mercIds = records.stream().map(DeviceFaultInfoDto.Vo::getMercId).distinct().collect(Collectors.toList());
+            List<String> codes = records.stream().map(DeviceFaultInfoDto.Vo::getEventCode).distinct().collect(Collectors.toList());
+            SysCodeConfigureDto.SelectList selectList = new SysCodeConfigureDto.SelectList();
+            selectList.setCodes(codes);
+            List<SysCodeConfigureDto.Vo> vos = R.feignCheckData(sysCodeConfigureService.list(selectList));
+            Map<String, SysCodeConfigureDto.Vo> sysCodeMap = MapUtil.newHashMap();
+            if(CollUtil.isNotEmpty(vos)){
+               sysCodeMap = vos.stream().collect(Collectors.toMap(SysCodeConfigureDto.Vo::getCode, i -> i));
+             }
             List<MercDto.Vo> mercs = mercService.list(new MercDto.SelectList().setMercIds(mercIds)).getData();
             JMap<Long, MercDto.Vo> longVoJMap = new JArrayList<>(mercs).toMap(MercDto.Vo::getId).cover();
-            records.forEach(r -> {
+            for (DeviceFaultInfoDto.Vo r : records) {
                 Long mercId = r.getMercId();
                 if (longVoJMap.get(mercId) != null) {
                     r.setMercName(longVoJMap.get(mercId).getName());
                 }
-            });
+                SysCodeConfigureDto.Vo sysCodeInfo = sysCodeMap.get(r.getEventCode());
+                    //故障说明与建议
+                if (sysCodeInfo != null) {
+                    r.setMsg(sysCodeInfo.getMsg());
+                    r.setPropose(sysCodeInfo.getPropose());
+                }
+            }
+
             data.setRecords(records);
         }
 

device-api/src/main/java/com/xy/dto/DeviceFaultInfoDto.java

@@ -72,6 +72,12 @@ public class DeviceFaultInfoDto {
         @ApiModelProperty(value = "故障描述")
         private String describes;
 
+        @ApiModelProperty(value = "故障说明")
+        private String msg;
+
+        @ApiModelProperty(value = "建议")
+        private String propose;
+
         @ApiModelProperty(value = "事件编码")
         private String eventCode;