fix(核查模块): 修改了缓存对象 unitareabean

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/common/UnitAreaBean.java

 package com.tykj.dev.device.confirmcheck.common;
 
+import com.tykj.dev.device.user.cache.AreaCache;
+import com.tykj.dev.device.user.cache.UnitsCache;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.entity.Area;
@@ -21,21 +23,23 @@ import java.util.stream.Collectors;
 @Configuration
 public class UnitAreaBean {
 
-    @Autowired
-    private AreaDao areaDao;
 
     @Autowired
-    private UnitsDao unitsDao;
+    private UnitsCache unitsCache;
 
+    @Autowired
+    private AreaCache areaCache;
 
-    @Bean(name = "unMap")
     public Map<String, AreaUnit> unitNameMap() {
-        return unitsDao.findAll().stream()
+      return  unitsCache.findAll().stream()
 //                .filter(units -> units.getType() == 1)
                 .map(unit -> {
-                    int areaId = unitsDao.findAreaIdByName(unit.getName());
-                    Area area = areaDao.findById(areaId)
-                            .orElse(new Area(0, "省直属", 9999, "9999", 0, ""));
+//                    int areaId = unitsDao.findAreaIdByName(unit.getName());
+                    int areaId= unit.getAreaId();
+                    Area area = areaCache.findById(areaId);
+                    if (area==null){
+                      area=  new Area(0, "省直属", 9999, "9999", 0, "");
+                    }
                     return new AreaUnit(area, unit);
                 }).collect(Collectors.toMap(AreaUnit::getUnitName, Function.identity()));
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -4,6 +4,7 @@ package com.tykj.dev.device.confirmcheck.utils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.tykj.dev.device.confirmcheck.common.CheckType;
+import com.tykj.dev.device.confirmcheck.common.UnitAreaBean;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckBill;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckDetail;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckStat;
@@ -79,8 +80,8 @@ public class ObjTransUtil {
     @Autowired
     private DeviceLibraryCacheService dlcService;
 
-    @Resource(name = "unMap")
-    private Map<String, AreaUnit> unMap;
+    @Autowired
+    UnitAreaBean unitAreaBean;
 
     @Autowired
     private PackingLibraryService packingLibraryService;
@@ -95,7 +96,7 @@ public class ObjTransUtil {
     public CheckDeviceStatVo device2InitStatVo(DeviceLibrary device) {
         String ownUnit = device.getOwnUnit();
         // 这里选择从初始化集合中获取
-        String areaName = unMap.get(ownUnit).getName();
+        String areaName = unitAreaBean.unitNameMap().get(ownUnit).getName();
         List<CheckAreaStatVo> areaStatList = Lists.newArrayList(new CheckAreaStatVo(areaName, 0, 1, 0, 0, 0, 0));
         return new CheckDeviceStatVo(device.getModel(), device.getName(), 1, areaStatList);
     }