将枚举移到misc模块

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

@@ -16,11 +16,11 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.ResultObj;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.TimestampUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;

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

@@ -3,15 +3,9 @@ package com.tykj.dev.device.allot.controller;
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.allot.service.AllotBillService;
 import com.tykj.dev.device.allot.subject.domin.AllotBill;
-import com.tykj.dev.device.allot.subject.vo.AllotBillDetailVo;
 import com.tykj.dev.device.allot.subject.vo.AllotBillSelectVo;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
-import com.tykj.dev.device.task.service.TaskLogService;
-import com.tykj.dev.device.task.service.TaskService;
-import com.tykj.dev.device.task.subject.bto.TaskBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import io.swagger.annotations.Api;

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -22,12 +22,12 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -16,15 +16,15 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.GlobalMap;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 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.Units;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.device.user.util.AuthenticationUtils;
+import com.tykj.dev.misc.base.GlobalMap;
 import com.tykj.dev.misc.base.ResultObj;
+import com.tykj.dev.misc.base.StatusEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -40,9 +40,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import static com.tykj.dev.device.task.subject.common.BusinessEnum.CONFIRM_CHECK_DETAIL;
-import static com.tykj.dev.device.task.subject.common.BusinessEnum.CONFIRM_CHECK_STAT;
-import static com.tykj.dev.device.task.subject.common.StatusEnum.*;
+import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_DETAIL;
+import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_STAT;
+import static com.tykj.dev.misc.base.StatusEnum.*;
 import static com.tykj.dev.misc.utils.TimestampUtil.localDateToDate;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;

dev-destroy/src/main/java/com/tykj/dev/device/destroy/controller/DeviceDestroyController.java

@@ -15,12 +15,12 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.AuthenticationUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ListUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;

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

@@ -16,10 +16,10 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;

dev-misc/src/main/java/com/tykj/dev/misc/base/DeviceInvisibleRange.java

+package com.tykj.dev.misc.base;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * @author dengdiyi
+ * 装备可见范围枚举
+ */
+
+@AllArgsConstructor
+public enum DeviceInvisibleRange {
+    /**
+     * 省一级
+     */
+    PACKING(1,"省一级"),
+    /**
+     * 县一级
+     */
+    STORAGE(2,"县一级"),
+    /**
+     * 市一级
+     */
+    ALLOT(3,"市一级");
+
+    public Integer id;
+
+    public String name;
+}

dev-misc/src/main/java/com/tykj/dev/misc/base/DeviceLifeStatus.java

+package com.tykj.dev.misc.base;
+
+public enum DeviceLifeStatus {
+}

dev-misc/src/main/java/com/tykj/dev/misc/base/DeviceManageStatus.java

+package com.tykj.dev.misc.base;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * @author dengdiyi
+ * 装备管理状态
+ */
+
+@AllArgsConstructor
+public enum DeviceManageStatus {
+}

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -11,12 +11,12 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;

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

@@ -10,7 +10,7 @@ import com.tykj.dev.device.repair.subject.domin.RepairBill;
 import com.tykj.dev.device.repair.subject.domin.RepairDetail;
 import com.tykj.dev.device.repair.subject.domin.RepairSendBill;
 import com.tykj.dev.device.repair.subject.vo.RepairBillSelectVo;
-import com.tykj.dev.device.task.subject.common.RepairStatusEnum;
+import com.tykj.dev.misc.base.RepairStatusEnum;
 import com.tykj.dev.misc.utils.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -24,14 +24,10 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.GlobalMap;
-import com.tykj.dev.device.task.subject.common.RepairStatusEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
-import com.tykj.dev.misc.base.ResultObj;
+import com.tykj.dev.misc.base.*;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import com.tykj.dev.socket.MyWebSocket;

dev-retired/src/main/java/com/tykj/dev/device/retired/controller/DeviceRetiredController.java

@@ -17,11 +17,11 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.device.user.util.AuthenticationUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ListUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.socket.MyWebSocket;

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -12,12 +12,12 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.AuthenticationUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ListUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.rfid.entity.domin.LibraryWarningLog;

dev-scrap/src/main/java/com/tykj/dev/device/scrap/controller/DeviceScrapController.java

@@ -2,10 +2,12 @@ package com.tykj.dev.device.scrap.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.scrap.service.ScrapBillService;
 import com.tykj.dev.device.scrap.subject.domin.ScrapBill;
 import com.tykj.dev.device.scrap.subject.vo.ScrapSelectVo;
 import com.tykj.dev.device.scrap.subject.vo.ScrapSaveVo;
+import com.tykj.dev.misc.utils.StringSplitUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,14 @@ public class DeviceScrapController {
     @ApiOperation(value = "查询列表详情", notes = "可以通过这个接口查询销毁单")
     @PostMapping(value = "/summary/{scrapId}")
     public ResponseEntity selectRepairBill1(@PathVariable Integer scrapId) {
-       return ResponseEntity.ok(scrapBillService.getOne(scrapId));
+        List<Object> list = new ArrayList<>();
+        ScrapBill scrapBill = scrapBillService.getOne(scrapId);
+        list.add(scrapBill);
+        List<DeviceLibrary> deviceLibraries = StringSplitUtil.userIdSplit(scrapBill.getScrapDetail()).stream()
+                .map(integer -> deviceLibraryService.getOne(integer))
+                .collect(Collectors.toList());
+        list.add(deviceLibraries);
+       return ResponseEntity.ok(list);
     }
 
     @ApiOperation(value = "提交报废单", notes = "提交报废单")

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -13,11 +13,11 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -19,11 +19,11 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import com.tykj.dev.socket.MyWebSocket;

dev-task/src/main/java/com/tykj/dev/device/task/service/TaskService.java

 package com.tykj.dev.device.task.service;
 
 import com.tykj.dev.device.task.subject.bto.TaskBto;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.task.subject.vo.TaskSelectVo;
 import com.tykj.dev.device.task.subject.vo.TaskUserVo;
+import com.tykj.dev.misc.base.StatusEnum;
 
 import java.util.List;
 

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -6,8 +6,6 @@ import com.tykj.dev.device.task.repository.TaskDao;
 import com.tykj.dev.device.task.repository.TaskLogDao;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
-import com.tykj.dev.device.task.subject.common.GlobalMap;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.task.subject.domin.TaskLog;
 import com.tykj.dev.device.task.subject.vo.TaskSelectVo;
@@ -15,6 +13,8 @@ import com.tykj.dev.device.task.subject.vo.TaskUserVo;
 import com.tykj.dev.device.task.utils.TaskUtils;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.GlobalMap;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;

dev-task/src/main/java/com/tykj/dev/device/task/subject/bto/TaskBto.java

 package com.tykj.dev.device.task.subject.bto;
 
-import com.tykj.dev.device.task.subject.common.GlobalMap;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.task.subject.vo.TaskUserVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.misc.base.BeanHelper;
+import com.tykj.dev.misc.base.GlobalMap;
 import com.tykj.dev.misc.utils.SpringUtils;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import io.swagger.annotations.ApiModelProperty;

dev-task/src/main/java/com/tykj/dev/device/task/subject/common/BusinessEnum.java

-package com.tykj.dev.device.task.subject.common;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author dengdiyi
- * 业务枚举
- */
-
-@AllArgsConstructor
-public enum BusinessEnum {
-    /**
-     * 列装业务
-     */
-    PACKING(1,"列装业务"),
-    /**
-     * 入库业务
-     */
-    STORAGE(2,"入库业务"),
-    /**
-     * 配发业务
-     */
-    ALLOT(3,"配发业务"),
-    /**
-     * 自查业务
-     */
-    SELF_CHECK(4,"自查业务"),
-    /**
-     * 维修业务
-     */
-    REPAIR(5,"维修业务"),
-    /**
-     * 核查业务
-     */
-    CONFIRM_CHECK(6,"核查业务"),
-    /**
-     * 核查统计业务
-     */
-    CONFIRM_CHECK_STAT(7,"核查统计"),
-    /**
-     * 核查详情业务
-     */
-    CONFIRM_CHECK_DETAIL(8,"核查详情"),
-    /**
-     * 申请业务
-     */
-    APPLY(9,"申请业务"),
-    /**
-     * 维修退回
-     */
-    REPAIR_BACK(10,"维修退回"),
-    /**
-     * 维修继续送修
-     */
-    REPAIR_SEND(11,"维修业务"),
-    /**
-     * 培训
-     */
-    TRAIN(13,"培训业务"),
-    /**
-     * 销毁业务
-     */
-    DESTROY(14,"销毁业务"),
-    /**
-     * 退装业务
-     */
-    RETIRED(15,"退装业务"),
-    /**
-     * 清退业务
-     */
-    SEND_BACK(16,"清退业务"),
-    /**
-     * 清退异常处理
-     */
-    SEND_BACK_EXCEPTION(17,"清退异常处理"),
-    /**
-     * 清退出库
-     */
-    SEND_BACK_OUT(18,"清退出库"),
-    /**
-     * 新增配套设备
-     */
-    ADD_MATCHING_DEVICE(19,"新增配套设备"),
-    /**
-     * 标签修改
-     */
-    TAG(20,"标签修改"),
-    /**
-     * 工作交接
-     */
-    WORK_HANDOVER(21,"工作交接")
-    ;
-
-    public Integer id;
-
-    public String name;
-}

dev-task/src/main/java/com/tykj/dev/device/task/subject/common/GlobalMap.java

-package com.tykj.dev.device.task.subject.common;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * @author dengdiyi
- */
-public class GlobalMap {
-
-    private static final Map<Integer, StatusEnum> statusEnumMap;
-
-    private static final Map<Integer,RepairStatusEnum> repairStatusMap;
-
-    static {
-        statusEnumMap = Arrays.stream(StatusEnum.values())
-                .collect(Collectors.toMap(statusEnum -> statusEnum.id, Function.identity()));
-        repairStatusMap = Arrays.stream(RepairStatusEnum.values())
-                .collect(Collectors.toMap(repairStatusEnum -> repairStatusEnum.id,Function.identity()));
-    }
-
-    public static Map<Integer, StatusEnum> getStatusEnumMap() {
-        return statusEnumMap;
-    }
-
-    public static Map<Integer, RepairStatusEnum> getRepairStatusMap() {
-        return repairStatusMap;
-    }
-}

dev-task/src/main/java/com/tykj/dev/device/task/subject/common/RepairStatusEnum.java

-package com.tykj.dev.device.task.subject.common;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author dengdiyi
- * 维修状态枚举
- */
-
-@AllArgsConstructor
-public enum RepairStatusEnum {
-    /**
-     * 等待维修
-     */
-    WAIT_REPAIR(0,"等待维修"),
-    /**
-     * 维修中
-     */
-    REPAIRING(1,"维修中"),
-    /**
-     * 待领取
-     */
-    WAIT_RECEIVE(2,"待领取"),
-    /**
-     * 库存换新
-     */
-    CHANGE_NEW(3,"库存换新"),
-    /**
-     * 已报废
-     */
-    SCRAPPED(4,"已报废"),
-    /**
-     * 已领取
-     */
-    RECEIVED(5,"已领取"),
-    /**
-     * 新装备换新
-     */
-    CHANGE_NEW_DEVICE(6,"新装备换新")
-    ;
-
-    public Integer id;
-
-    public String name;
-}

dev-task/src/main/java/com/tykj/dev/device/task/subject/common/StatusEnum.java

-package com.tykj.dev.device.task.subject.common;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author dengdiyi
- * 业务状态枚举
- */
-
-@AllArgsConstructor
-public enum StatusEnum {
-
-
-
-    /**
-     * RFID标签制作
-     */
-    CREATE_RFID_BUSINESS(8100,"标签制作业务开始"),
-    RFID_BUSINESS_NEED_CONFIRM(8101,"等待审核"),
-    RFID_BUSINESS_CONFIRM_FINISH_SUCCESS(8102,"审核成功"),
-    RFID_BUSINESS_CONFIRM_FINISH_FAILED(8103,"审核失败"),
-
-    /**
-     * 销毁业务
-     */
-    CREATE_DESTROY_BUSINESS(8110,"标签制作业务开始"),
-    DESTROY_BUSINESS_NEED_CONFIRM(8111,"等待审核"),
-    DESTROY_BUSINESS_CONFIRM_FINISH_SUCCESS(8112,"审核成功"),
-    DESTROY_BUSINESS_CONFIRM_FINISH_FAILED(8113, "审核失败"),
-
-    /**
-     * 退装业务
-     */
-    CREATE_RETIRED_BUSINESS(8120, "标签制作业务开始"),
-    RETIRED_BUSINESS_NEED_CONFIRM(8121, "等待审核"),
-    RETIRED_BUSINESS_CONFIRM_FINISH_SUCCESS(8122, "审核成功"),
-    RETIRED_BUSINESS_CONFIRM_FINISH_FAILED(8123, "审核失败"),
-
-    /**
-     * 核查任务
-     */
-    //以下为stat状态
-    CHECK_STAT_0(110, "统计数据收集中"),
-    CHECK_STAT_1(111, "统计数据等待确认"),
-
-    //以下为detail状态
-    CHECK_DETAIL_0(120, "等待专管员A处理"),
-    CHECK_DETAIL_1(121, "等待专管员B处理"),
-    CHECK_DETAIL_2(122, "等待核查员A处理"),
-    CHECK_DETAIL_3(123, "等待核查员B处理"),
-
-
-    /**
-     * 业务完结
-     */
-    END(9999, "业务完结"),
-
-    TRAIN1000(1000, "报名中"),
-
-    TRAIN1001(1001, "报名确认"),
-
-    TRAIN1002(1002,"待报名"),
-
-    TRAIN1003(1003,"等待培训"),
-
-    TRAIN1004(1004,"培训中"),
-
-    TRAIN1005(1005,"申请发证"),
-
-    TRAIN1006(1006,"市培训申请发证审核"),
-
-    TRAIN1007(1007,"省培训发证审核"),
-
-    TRAIN1008(1008,"成绩录入"),
-
-    TRAIN1009(1009,"成绩确认"),
-//
-    TRAIN1010(1010,"待培训"),
-//
-//    TRAIN1011(1011,""),
-//
-//    TRAIN1012(1012,""),
-//
-//    TRAIN1013(1013,""),
-
-    /**
-     * 业务封存
-     */
-    ARCHIVE(8888,"业务封存"),
-
-    /**
-     * 列装待审核
-     */
-    PACKING_CONFIRM(100,"列装待审核"),
-
-    /**
-     * 入库待审核
-     */
-    STORAGE_CONFIRM(200,"入库待审核"),
-
-    /**
-     * 待配发
-     */
-    WAIT_ALLOT(300,"待配发"),
-
-    /**
-     * 配发出库待审核
-     */
-    ALLOT_SEND_CONFIRM(301,"配发出库待审核"),
-
-    /**
-     * 配发中
-     */
-    ALLOTING(302,"配发中"),
-
-    /**
-     * 配发入库待审核
-     */
-    ALLOT_RECEIVE_CONFIRM(303,"配发入库待审核"),
-
-    /**
-     * 待自查
-     */
-    WAIT_SELF_CHECK(400,"待自查"),
-
-    /**
-     * 自查待审核
-     */
-    SELF_CHECK_CONFIRM(401,"自查待审核"),
-
-    /**
-     * 装备申请待批复
-     */
-    DEVICE_APPLY_CONFIRM(500,"装备申请待批复"),
-    /**
-     * 新增配套设备待审核
-     */
-    ADD_MATCHING_DEVICE_CONFIRM(600,"新增配套设备待审核"),
-
-    /**
-     * 维修送修状态
-     */
-    REPAIR_SEND_CONFIRM(700,"维修送修出库待审核"),
-    WAIT_RECEIVE(701,"等待接收维修装备"),
-    REPAIR_RECEIVE_CONFIRM(702,"接收维修装备待审核"),
-    REPAIRING(703,"维修中"),
-    COUNTRY_REPAIRING(777,"等待接收维修退回装备"),
-    /**
-     * 维修完成退回状态
-     */
-    REPAIR_BACK_CONFIRM(800,"维修退回装备出库待审核"),
-    WAIT_BACK_RECEIVE(801,"等待接收维修退回装备"),
-    REPAIR_BACK_RECEIVE_CONFIRM(802,"接收维修退回装备待审核")
-    ;
-
-    public Integer id;
-
-    public String name;
-}

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -5,8 +5,6 @@ import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.common.BusinessEnum;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.train.entity.TrainTheme;
 import com.tykj.dev.device.train.entity.vo.*;
@@ -16,6 +14,8 @@ import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.service.MgrcertService;
 import com.tykj.dev.device.user.subject.service.UserService;
+import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;

dev-train/src/main/java/com/tykj/dev/device/train/task/TrainTask.java

 package com.tykj.dev.device.train.task;
 
 import com.tykj.dev.device.task.service.TaskService;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.train.service.TrainTaskService;
 import com.tykj.dev.device.train.service.TrainThemeService;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.service.MgrcertService;
 import com.tykj.dev.device.user.subject.service.UserService;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.socket.MyWebSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;

dev-union/src/test/java/com/tykj/dev/confirmcheck/DeviceCheckControllerTest.java

@@ -9,8 +9,8 @@ import com.tykj.dev.device.confirmcheck.repository.DeviceCheckDetailDao;
 import com.tykj.dev.device.confirmcheck.repository.DeviceCheckStatRepo;
 import com.tykj.dev.device.confirmcheck.utils.ObjTransUtil;
 import com.tykj.dev.device.task.repository.TaskDao;
-import com.tykj.dev.device.task.subject.common.StatusEnum;
 import com.tykj.dev.device.task.subject.domin.Task;
+import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.union.BaseTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;