feat(3D模块): 修改0和1是否在机柜

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -931,8 +931,6 @@ public class AllotBillController {
         }
         //父任务未被完成 可以被撤回
         Integer billId = taskBto.getBillId();
-        String title = taskBto.getTitle();
-
         AllotBill allotBill = allotBillService.getOne(billId);
         Integer currentUserId = userUtils.getCurrentUserId();
         List<Integer> idList = userPublicService.findOtherUser(currentUserId);
@@ -946,18 +944,6 @@ public class AllotBillController {
                     .map(User::getUserId)
                     .collect(Collectors.toList()));
         }
-        //给同单位专管员和收件单位专管员推阅知
-//        messageBto1.setContent(title.substring(0,4)+"撤回"+title.substring(4));
-        
-//        messageBto1.setContent("撤回对" + allotBill.getReceiveUnit()+"的型号为"+"的任务");
-//        MessageBto messageBto = new MessageBto(-1, parentTask.getBusinessType(), messageBto1.getContent(), idList, 1);
-//        BeanUtils.copyProperties(messageBto1,messageBto);
-//        messageBto.setTaskId(-1);
-//        messageService.add(messageBto);
-//        myWebSocket.sendMessage1();
-//        //将任务都完结
-//        taskService.moveToRevoke(taskBto);
-//        taskService.moveToRevoke(parentTask);
         List<DeviceLibrary> deviceLibraryList = null;
         if (allotBill.getAllotCheckDetail() != null) {
             List<Integer> ids = StringSplitUtil.split(allotBill.getAllotCheckDetail());
@@ -972,14 +958,11 @@ public class AllotBillController {
                 DeviceLogDto deviceLogDto = new DeviceLogDto(id, "对" + deviceLibrary.getName() + "配发撤回", null, null, null);
                 deviceLogDtos.add(deviceLogDto);
             });
-
             //设置装备为在库
             deviceLibraryService.updateLifeStatus2(2,ids);
             deviceLibraryList = deviceLibraryService.findByIds(ids);
-
             //添加日志
             deviceLogService.addAllLog(deviceLogDtos);
-
             allotBill.setDeviceLibraries(deviceLibraryList);
             allotBillService.delete(allotBill.getId());
 
@@ -996,7 +979,6 @@ public class AllotBillController {
         myWebSocket.sendMessage1();
         //将任务都完结
         taskService.moveToRevoke(taskBto);
-
         return ResponseEntity.ok(messageBto);
 
     }

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibraryPosition.java

@@ -137,14 +137,14 @@ public class DeviceLibraryPosition implements Serializable {
     @Column(name = "Rotation",columnDefinition = "TEXT")
     private String rotation;
 
-    @ApiModelProperty(value = "是否在机柜中 ",notes = "0 是 1 否")
-    private Integer ifCabinet = 1;
+    @ApiModelProperty(value = "是否在机柜中 ",notes = "0 不在 1 在")
+    private Integer ifCabinet = 0;
 
     @ApiModelProperty(value = "在几号机柜里",notes = "1")
     private Integer cabinetPosition;
 
-    @ApiModelProperty(value = "u位",notes = "1")
-    private Integer uNum;
+    @ApiModelProperty(value = "u位",notes = "1-1")
+    private String uNum;
 
     @ApiModelProperty("旋转信息vo")
     @Transient