更新

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/DeviceInLibVo.java

@@ -36,7 +36,7 @@ public class DeviceInLibVo {
 
     private int invisibleRange;
 
-    private int style;
+    private int type;
 
     private int secretLevel;
 }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/DeviceNotInLibVo.java

@@ -37,7 +37,7 @@ public class DeviceNotInLibVo {
 
     private int invisibleRange;;
 
-    private int style;
+    private int type;
 
     private int secretLevel;
 

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

@@ -10,7 +10,6 @@ import com.tykj.dev.device.confirmcheck.entity.vo.*;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
-import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import com.tykj.dev.device.task.repository.TaskDao;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.domin.Task;
@@ -308,7 +307,6 @@ public class ObjTransUtil {
     }
 
     public DeviceInLibVo toCheckInLibVo(DeviceLibrary device, int proofResult) {
-        PackingLibrary packingLibrary = packingLibraryService.getOne(device.getPackingId());
         return new DeviceInLibVo(
                 device.getId(),
                 device.getModel(),
@@ -319,13 +317,12 @@ public class ObjTransUtil {
                 device.getRfidCardId(),
                 proofResult,
                 device.getInvisibleRange(),
-                packingLibrary.getStyle(),
+                device.getType(),
                 device.getSecretLevel()
         );
     }
 
     public DeviceNotInLibVo toCheckNotInLibVo(DeviceLibrary device) {
-        PackingLibrary packingLibrary = packingLibraryService.getOne(device.getPackingId());
         return new DeviceNotInLibVo(
                 device.getId(),
                 device.getModel(),
@@ -338,7 +335,7 @@ public class ObjTransUtil {
                 device.getOwnUnit(),
                 device.getLifeStatus(),
                 device.getInvisibleRange(),
-                packingLibrary.getStyle(),
+                device.getType(),
                 device.getSecretLevel()
         );
     }

dev-statistical/src/main/java/com/tykj/dev/statistical/controller/StatisticalController.java

@@ -194,7 +194,12 @@ public class StatisticalController {
                 DeviceStatistics deviceStatistics = new DeviceStatistics();
                 deviceStatistics.setModel(strings[0]);
 //                deviceStatistics.setName(strings[1]);
-                deviceStatistics.setType(Integer.valueOf(strings[1]));
+                if ("null".equals(strings[1])){
+                    deviceStatistics.setType(null);
+                }
+                else {
+                    deviceStatistics.setType(Integer.valueOf(strings[1]));
+                }
                 deviceStatistics.setNum(map.get(s).size());
                 deviceStatistics.setDeviceIds(map.get(s).stream().map(DeviceLibrary::getId).collect(Collectors.toList()));
                 deviceStatisticsList.add(deviceStatistics);