更新业务查询

dev-device/device-allot/pom.xml

@@ -21,5 +21,9 @@
         <groupId>com.tykj.dev</groupId>
         <artifactId>device-library</artifactId>
     </dependency>
+    <dependency>
+        <groupId>com.tykj.dev</groupId>
+        <artifactId>device-task</artifactId>
+    </dependency>
 </dependencies>
 </project>
\ No newline at end of file

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

@@ -17,7 +17,7 @@ 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.task.subject.vo.FileVo;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.utils.ResultUtil;

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

@@ -16,7 +16,7 @@ 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.task.subject.vo.FileVo;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.utils.ResultUtil;

dev-device/device-destroy/pom.xml

@@ -17,7 +17,7 @@
         </dependency>
         <dependency>
             <groupId>com.tykj.dev</groupId>
-            <artifactId>device-library</artifactId>
+            <artifactId>device-task</artifactId>
         </dependency>
     </dependencies>
 

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

@@ -14,7 +14,7 @@ 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.FileVo;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 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;

dev-device/device-selfcheck/pom.xml

@@ -15,6 +15,10 @@
             <groupId>com.tykj.dev</groupId>
             <artifactId>device-library</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.tykj.dev</groupId>
+            <artifactId>device-task</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

dev-device/device-storage/pom.xml

@@ -20,5 +20,9 @@
             <groupId>com.tykj.dev</groupId>
             <artifactId>device-packing</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.tykj.dev</groupId>
+            <artifactId>device-task</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

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

@@ -19,7 +19,7 @@ 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.task.subject.vo.FileVo;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.utils.ResultUtil;
 import io.swagger.annotations.Api;

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

 package com.tykj.dev.device.task.subject.bto;
 
 import com.tykj.dev.device.task.subject.domin.TaskLog;
-import com.tykj.dev.device.task.subject.vo.FileVo;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

dev-device/device-task/src/main/java/com/tykj/dev/device/task/subject/domin/TaskLog.java

 package com.tykj.dev.device.task.subject.domin;
 
 import com.tykj.dev.device.task.subject.bto.TaskLogBto;
-import com.tykj.dev.device.task.subject.vo.FileVo;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 import com.tykj.dev.misc.base.BeanHelper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

dev-device/device-task/src/main/java/com/tykj/dev/device/task/subject/vo/BussinessLogVo.java → dev-device/device-task/src/main/java/com/tykj/dev/device/task/subject/vo/BusinessLogVo.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.task.subject.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 
 import java.util.Date;
 import java.util.List;
@@ -12,7 +13,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("业务详情/装备详情日志返回类")
-public class BussinessLogVo {
+public class BusinessLogVo {
 
     @ApiModelProperty(value = "时间")
     private Date time;

dev-device/device-task/src/main/java/com/tykj/dev/device/task/subject/vo/FileVo.java

-package com.tykj.dev.device.task.subject.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author dengdiyi
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("附件信息返回类")
-public class FileVo {
-
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "附件名")
-    private String fileName;
-
-    @ApiModelProperty(value = "附件url")
-    private String fileUrl;
-}

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

@@ -14,7 +14,7 @@ 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.FileVo;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 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;

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/RfidChangeBillServiceImpl.java

 package com.tykj.dev.rfid.service.impl;
 
-import com.tykj.dev.device.library.service.DeviceLibraryService;
-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.vo.FileVo;
-import com.tykj.dev.device.user.subject.entity.User;
-import com.tykj.dev.device.user.util.AuthenticationUtils;
-import com.tykj.dev.misc.utils.ListUtil;
 import com.tykj.dev.rfid.entity.domin.RfidChangeBill;
-import com.tykj.dev.rfid.entity.domin.RfidChangeLog;
-import com.tykj.dev.rfid.entity.enums.RfidChangeStatus;
-import com.tykj.dev.rfid.entity.vo.RfidFormVo;
 import com.tykj.dev.rfid.repository.RfidChangeBillDao;
 import com.tykj.dev.rfid.repository.RfidChangeLogDao;
 import com.tykj.dev.rfid.service.RfidChangeBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @author HuangXiahao