Merge branch 'master' into prod

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

@@ -81,7 +81,14 @@ public class DeviceErrorsRecordServiceImpl extends ServiceImpl<DeviceErrorsRecor
         if (Emptys.check(voPageBean.getRecords())) {
             List<Long> deviceIdList = voPageBean.getRecords().stream().map(DeviceErrorsRecordDto.Vo::getDeviceId).collect(Collectors.toList());
             Map<Long, String> deviceMap = deviceInfoService.getDeviceNameList(new DeviceInfoDto.DeviceIdDto().setDeviceId(deviceIdList)).getData();
-            voPageBean.getRecords().forEach(i -> i.setDeviceName(deviceMap.get(i.getDeviceId())));
+            Map<String, SysCodeConfigureRedis> stringSysCodeConfigureRedisMap = SysCodeConfigureUtils.get(SysCodeConfigureEnum.D01.getCode());
+            voPageBean.getRecords().forEach(i -> {
+                i.setDeviceName(deviceMap.get(i.getDeviceId()));
+                SysCodeConfigureRedis sysCodeConfigureRedis = stringSysCodeConfigureRedisMap.get(i.getCode());
+                if (sysCodeConfigureRedis != null) {
+                    i.setSysCodeConfigureRedis(sysCodeConfigureRedis);
+                }
+            });
         }
         return R.ok(voPageBean);
     }
@@ -94,7 +101,15 @@ public class DeviceErrorsRecordServiceImpl extends ServiceImpl<DeviceErrorsRecor
                 .in(DeviceErrorsRecord::getDeviceId, selectList.getDeviceIds())
                 .build();
         List<DeviceErrorsRecord> list = list(lambdaQueryWrapper);
-        return R.ok(copy(DeviceErrorsRecordDto.Vo.class, list));
+        Map<String, SysCodeConfigureRedis> stringSysCodeConfigureRedisMap = SysCodeConfigureUtils.get(SysCodeConfigureEnum.D01.getCode());
+        List<DeviceErrorsRecordDto.Vo> vos = copy(DeviceErrorsRecordDto.Vo.class, list);
+        vos.forEach(vo -> {
+            SysCodeConfigureRedis sysCodeConfigureRedis = stringSysCodeConfigureRedisMap.get(vo.getCode());
+            if (sysCodeConfigureRedis != null) {
+                vo.setSysCodeConfigureRedis(sysCodeConfigureRedis);
+            }
+        });
+        return R.ok(vos);
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.xy.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.entity.SysCodeConfigureRedis;
 import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -89,7 +90,8 @@ public class DeviceErrorsRecordDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
 
-
+        @ApiModelProperty(value = "故障详情")
+        private SysCodeConfigureRedis sysCodeConfigureRedis;
     }
 
 }