更新

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -183,6 +183,7 @@ public class MatchingDeviceController {
             if (m.getDeviceId() > 0) {
                 m.setRelateDevice(deviceLibraryService.getOne(m.getDeviceId()).getRfidSurfaceId());
             }
+            m.setConfigName();
         }
         return ResponseEntity.ok(page);
     }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -75,7 +75,12 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
     @Override
     public MatchingDeviceLibrary getOne(Integer id) {
         Optional<MatchingDeviceLibrary> matchingDeviceLibraryEntity = matchingDeviceLibraryDao.findById(id);
-        return matchingDeviceLibraryEntity.orElse(null);
+        if (matchingDeviceLibraryEntity.isPresent()){
+            return matchingDeviceLibraryEntity.get().setConfigName();
+        }
+        else {
+            throw new ApiException("id不存在");
+        }
     }
 
     @Override

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingDeviceLibrary.java

 package com.tykj.dev.device.matching.subject.domin;
 
+import com.tykj.dev.config.cache.ConfigCache;
+import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -118,4 +120,16 @@ public class MatchingDeviceLibrary {
 
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
+
+    @ApiModelProperty(value = "生命状态")
+    @Transient
+    private String lifeStatusName;
+
+    public MatchingDeviceLibrary setConfigName(){
+        ConfigCache configCache = SpringUtils.getBean("initConfigCache");
+        if (configCache != null) {
+            setLifeStatusName(configCache.getLifeStatusMap().get(this.lifeStatus)==null?"-":configCache.getLifeStatusMap().get(this.lifeStatus));
+        }
+        return this;
+    }
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -1477,6 +1477,7 @@ public class RepairController {
                 repairDetailList.forEach(repairDetail -> {
                     DeviceLibrary deviceLibrary = deviceLibraryService.getOne(repairDetail.getDeviceId());
                     repairDetail.setLocationUnit(deviceLibrary.getLocationUnit());
+                    repairDetail.setConfigName();
                 });
                 repairBillDetailVo.setRepairDetails(repairDetailList);
                 //设置装备备注
@@ -1525,6 +1526,7 @@ public class RepairController {
             List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(1);
             repairDetails.forEach(repairDetail -> {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
+                repairDetail.setConfigName();
             });
             return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }
@@ -1536,6 +1538,7 @@ public class RepairController {
             repairDetails1.removeAll(repairDetails);
             repairDetails1.forEach(repairDetail -> {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
+                repairDetail.setConfigName();
             });
             return ResponseEntity.ok(repairDetails1.stream().filter(repairDetail -> userPublicService.findUnitsNameByUserId(repairDetail.getCreateUserId()).equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }
@@ -1544,6 +1547,7 @@ public class RepairController {
             List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(2);
             repairDetails.forEach(repairDetail -> {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
+                repairDetail.setConfigName();
             });
             return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java

@@ -64,7 +64,9 @@ public class RepairDetailServiceImpl implements RepairDetailService {
 
     @Override
     public List<RepairDetail> findByBillId(Integer billId) {
-        return deviceRepairDetailDao.findByDeviceRepairBillId(billId);
+        List<RepairDetail> repairDetails = deviceRepairDetailDao.findByDeviceRepairBillId(billId);
+        repairDetails.forEach(RepairDetail::setConfigName);
+        return repairDetails;
     }
 
     @Override
@@ -88,7 +90,7 @@ public class RepairDetailServiceImpl implements RepairDetailService {
     public RepairDetail getOne(Integer id) {
         Optional<RepairDetail> repairDetail = deviceRepairDetailDao.findById(id);
         if (repairDetail.isPresent()) {
-            return repairDetail.get();
+            return repairDetail.get().setConfigName();
         } else {
             throw new ApiException(ResultUtil.failed("所查询ID不存在"));
         }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairDetail.java

 package com.tykj.dev.device.repair.subject.domin;
 
+import com.tykj.dev.config.cache.ConfigCache;
+import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -144,4 +146,16 @@ public class RepairDetail {
     private String record3;
 
     private Integer repairBackBillId;
+
+    @ApiModelProperty(value = "形态")
+    @Transient
+    private String typeName;
+
+    public RepairDetail setConfigName(){
+        ConfigCache configCache = SpringUtils.getBean("initConfigCache");
+        if (configCache != null) {
+            setTypeName(configCache.getStyleMap().get(this.type)==null?"-":configCache.getStyleMap().get(this.type));
+        }
+        return this;
+    }
 }