更新日志

dev-device/device-library/src/main/java/com/tykj/dev/device/library/subject/Dto/DeviceLogDto.java

@@ -49,13 +49,15 @@ public class DeviceLogDto {
         deviceLog.setRemark(this.remark);
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append("Ǵ");
-        for (FileVo f:this.fileVoList) {
-            stringBuffer.append(f.getFileName());
-            stringBuffer.append("Ǒ");
-            stringBuffer.append(f.getFileUrl());
-            stringBuffer.append("Ǒ");
-            stringBuffer.append(f.getTitle());
-            stringBuffer.append("Ǵ");
+        if (this.fileVoList!=null&&this.fileVoList.size()>0) {
+            for (FileVo f : this.fileVoList) {
+                stringBuffer.append(f.getFileName());
+                stringBuffer.append("Ǒ");
+                stringBuffer.append(f.getFileUrl());
+                stringBuffer.append("Ǒ");
+                stringBuffer.append(f.getTitle());
+                stringBuffer.append("Ǵ");
+            }
         }
         deviceLog.setFileDetail(stringBuffer.toString());
         return deviceLog;

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

@@ -6,8 +6,10 @@ import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import com.tykj.dev.device.packing.subject.vo.PackingLibraryConfirmVo;
 import com.tykj.dev.device.packing.subject.vo.PackingLibrarySaveVo;
 import com.tykj.dev.device.packing.subject.vo.PartSaveVo;
+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;
@@ -44,8 +46,8 @@ public class PackingController {
     @Autowired
     UserPublicService userPublicService;
 
-//    @Autowired
-//    DeviceLogService deviceLogService;
+    @Autowired
+    TaskLogService taskLogService;
 
     @ApiOperation(value = "新增列装",notes = "可以通过这个接口发起列装")
     @PostMapping("/addPackingLibrary")
@@ -68,12 +70,8 @@ public class PackingController {
         userIds.add(packingLibrarySaveVo.getUserbId());
         TaskBto taskBto = new TaskBto(StatusEnum.PACKING_CONFIRM.id,"列装业务",null,".",packingLibraryEntity.getId(),1,userUtils.getCurrentUnitId(),1,null,userIds);
         Task saveEntity = taskService.start(taskBto);
-//        LogVo bussinessLogVo = new LogVo();
-//        bussinessLogVo.setDeviceId(0);
-//        bussinessLogVo.setFileDetail("Ǵ");
-//        bussinessLogVo.setRemark("发起列装");
-//        bussinessLogVo.setTaskId(saveEntity.getId());
-//        deviceLogService.addLog(bussinessLogVo);
+        TaskLogBto taskLogBto = new TaskLogBto(saveEntity.getId(),"发起列装",null);
+        taskLogService.addLog(taskLogBto);
         return ResultUtil.success(packingLibraryEntity);
     }
 
@@ -90,12 +88,8 @@ public class PackingController {
             }
             packingLibraryService.selectAllPart(taskBto.getBillId());
             packingLibraryService.update(packingLibraryEntity);
-//            LogVo bussinessLogVo = new LogVo();
-//            bussinessLogVo.setDeviceId(0);
-//            bussinessLogVo.setFileDetail("Ǵ");
-//            bussinessLogVo.setRemark("列装审核成功");
-//            bussinessLogVo.setTaskId(taskEntity.getId());
-//            deviceLogService.addLog(bussinessLogVo);
+            TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"列装审核成功",null);
+            taskLogService.addLog(taskLogBto);
             return ResultUtil.success("审核通过列装成功");
         }
         if (packingLibraryConfirmVo.getStatus()==1){
@@ -107,12 +101,8 @@ public class PackingController {
             }
             packingLibraryService.update(packingLibraryEntity);
             taskService.update(taskBto);
-//            LogVo bussinessLogVo = new LogVo();
-//            bussinessLogVo.setDeviceId(0);
-//            bussinessLogVo.setFileDetail("Ǵ");
-//            bussinessLogVo.setRemark("列装审核失败");
-//            bussinessLogVo.setTaskId(taskEntity.getId());
-//            deviceLogService.addLog(bussinessLogVo);
+            TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"列装审核失败",null);
+            taskLogService.addLog(taskLogBto);
             return ResultUtil.success("列装审核失败");
         }
         else {

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

@@ -2,6 +2,8 @@ package com.tykj.dev.device.storage.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
+import com.tykj.dev.device.library.service.DeviceLogService;
+import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.DeviceLibrarySaveVo;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
@@ -11,10 +13,13 @@ import com.tykj.dev.device.storage.subject.domin.StorageBill;
 import com.tykj.dev.device.storage.subject.vo.StorageBillConfirmVo;
 import com.tykj.dev.device.storage.subject.vo.StorageBillDetailVo;
 import com.tykj.dev.device.storage.subject.vo.StorageBillSaveVo;
+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.task.subject.vo.FileVo;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.utils.ResultUtil;
 import io.swagger.annotations.Api;
@@ -55,8 +60,11 @@ public class StorageBillController {
     @Autowired
     private PackingLibraryService packingLibraryService;
 
-//    @Autowired
-//    private DeviceLogService deviceLogService;
+    @Autowired
+    private DeviceLogService deviceLogService;
+
+    @Autowired
+    private TaskLogService taskLogService;
 
     @ApiOperation(value = "选择入库型号数量",notes = "可以通过这个接口选择入库型号数量")
     @PostMapping(value = "/addStorageDetail")
@@ -112,6 +120,12 @@ public class StorageBillController {
         userIds.add(storageBillSaveVo.getReceiveUserBId());
         TaskBto taskBto = new TaskBto(StatusEnum.STORAGE_CONFIRM.id,"入库业务",null,".",storageBillEntity.getId(),2,userUtils.getCurrentUnitId(),1,null,userIds);
         Task taskEntity1 = taskService.start(taskBto);
+        //存业务日志
+        List<FileVo> fileVoList = new ArrayList<>();
+        fileVoList.add(new FileVo("配发单",storageBillEntity.getFileName(),storageBillEntity.getFileUrl()));
+        fileVoList.add(new FileVo("入库确认单",storageBillEntity.getReceiveFileName(),storageBillEntity.getReceiveFileUrl()));
+        TaskLogBto taskLogBto = new TaskLogBto(taskEntity1.getId(),"发起入库",fileVoList);
+        taskLogService.addLog(taskLogBto);
         //3.存装备
         Integer parentId = null;
         for (DeviceLibrarySaveVo d:storageBillSaveVo.getDeviceLibrarySaveVoList()) {
@@ -134,12 +148,9 @@ public class StorageBillController {
                 saveEntity = deviceLibraryService.addEntity(deviceLibraryEntity);
             }
             stringBuffer.append(saveEntity.getId());
-//            LogVo bussinessLogVo = new LogVo();
-//            bussinessLogVo.setDeviceId(saveEntity.getId());
-//            bussinessLogVo.setFileDetail("Ǵ"+storageBillEntity.getFileName()+"Ǒ"+storageBillEntity.getFileUrl()+"Ǒ"+"配发单"+"Ǵ"+storageBillEntity.getReceiveFileName()+"Ǒ"+storageBillEntity.getReceiveFileUrl()+"Ǒ"+"入库确认单"+"Ǵ");
-//            bussinessLogVo.setRemark("发起入库");
-//            bussinessLogVo.setTaskId(taskEntity1.getId());
-//            deviceLogService.addLog(bussinessLogVo);
+            //存装备日志
+            DeviceLogDto deviceLogDto = new DeviceLogDto(saveEntity.getId(),"发起入库",fileVoList);
+            deviceLogService.addLog(deviceLogDto);
             stringBuffer.append("x");
         }
         //4.更新入库单入库详情
@@ -154,36 +165,32 @@ public class StorageBillController {
         //1.审核成功,入库任务结束，发起新的确认任务,改变装备状态
         if(storageBillConfirmVo.getStatus()==0){
             taskService.update(taskService.moveToEnd(taskBto));
+            TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"入库审核成功",null);
+            taskLogService.addLog(taskLogBto);
             StorageBill storageBillEntity = storageBillService.getOne(taskBto.getBillId());
             storageBillEntity.setStorageStatus(2);
             storageBillService.update(storageBillEntity);
             List<DeviceLibrary> libraryEntities = deviceLibraryService.getListByBillId(taskBto.getBillId());
             for (DeviceLibrary d:libraryEntities) {
                 d.setLifeStatus(2);
-//                LogVo bussinessLogVo = new LogVo();
-//                bussinessLogVo.setDeviceId(d.getId());
-//                bussinessLogVo.setFileDetail("Ǵ");
-//                bussinessLogVo.setRemark("入库审核成功");
-//                bussinessLogVo.setTaskId(taskEntity.getId());
-//                deviceLogService.addLog(bussinessLogVo);
+                DeviceLogDto deviceLogDto = new DeviceLogDto(d.getId(),"入库审核成功",null);
+                deviceLogService.addLog(deviceLogDto);
             }
             return ResultUtil.success("审核通过列装成功");
         }
         //3.审核失败
         if (storageBillConfirmVo.getStatus()==1){
             taskService.update(taskService.moveToArchive(taskBto));
+            TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"入库审核失败",null);
+            taskLogService.addLog(taskLogBto);
             StorageBill storageBillEntity = storageBillService.getOne(taskBto.getBillId());
             storageBillEntity.setStorageStatus(1);
             storageBillService.update(storageBillEntity);
             List<DeviceLibrary> libraryEntities = deviceLibraryService.getListByBillId(taskBto.getBillId());
             for (DeviceLibrary d:libraryEntities) {
                 d.setLifeStatus(1);
-//                LogVo bussinessLogVo = new LogVo();
-//                bussinessLogVo.setDeviceId(d.getId());
-//                bussinessLogVo.setFileDetail("Ǵ");
-//                bussinessLogVo.setRemark("入库审核失败");
-//                bussinessLogVo.setTaskId(taskBto.getId());
-//                deviceLogService.addLog(bussinessLogVo);
+                DeviceLogDto deviceLogDto = new DeviceLogDto(d.getId(),"入库审核失败",null);
+                deviceLogService.addLog(deviceLogDto);
             }
             return ResultUtil.success("入库审核失败");
         }

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

@@ -45,13 +45,15 @@ public class TaskLogBto {
         taskLog.setRemark(this.remark);
         StringBuffer stringBuffer = new StringBuffer();
         stringBuffer.append("Ǵ");
-        for (FileVo f:this.fileVoList) {
-            stringBuffer.append(f.getFileName());
-            stringBuffer.append("Ǒ");
-            stringBuffer.append(f.getFileUrl());
-            stringBuffer.append("Ǒ");
-            stringBuffer.append(f.getTitle());
-            stringBuffer.append("Ǵ");
+        if (this.fileVoList!=null&&this.fileVoList.size()>0) {
+            for (FileVo f : this.fileVoList) {
+                stringBuffer.append(f.getFileName());
+                stringBuffer.append("Ǒ");
+                stringBuffer.append(f.getFileUrl());
+                stringBuffer.append("Ǒ");
+                stringBuffer.append(f.getTitle());
+                stringBuffer.append("Ǵ");
+            }
         }
         taskLog.setFileDetail(stringBuffer.toString());
         return taskLog;

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

@@ -29,20 +29,25 @@ public enum StatusEnum {
      */
     STORAGE_CONFIRM(200,"入库待审核"),
 
+    /**
+     * 待配发
+     */
+    WAIT_ALLOT(300,"待配发"),
+
     /**
      * 配发出库待审核
      */
-    ALLOT_SEND_CONFIRM(300,"配发出库待审核"),
+    ALLOT_SEND_CONFIRM(301,"配发出库待审核"),
 
     /**
      * 配发中
      */
-    ALLOTING(301,"配发中"),
+    ALLOTING(302,"配发中"),
 
     /**
      * 配发入库待审核
      */
-    ALLOT_RECEIVE_CONFIRM(302,"配发入库待审核"),
+    ALLOT_RECEIVE_CONFIRM(303,"配发入库待审核"),
 
     /**
      * 待自查

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

@@ -2,12 +2,16 @@ 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 {
 

dev-device/device-user/src/main/java/com/tykj/dev/device/user/base/beabs/UserIDAuditorBean.java

+package com.tykj.dev.device.user.base.beabs;
+
+import com.tykj.dev.device.user.util.UserUtils;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.AuditorAware;
+
+import java.util.Optional;
+
+/**
+ * @author dengdiyi
+ */
+@Configuration
+public class UserIDAuditorBean implements AuditorAware<Integer> {
+    /*
+     *实现jpa自动插入当前用户id
+     */
+    @Override
+    public Optional<Integer> getCurrentAuditor() {
+        //获取当前用户Id并返回
+        UserUtils userUtils = com.tykj.dev.misc.utils.SpringUtils.getBean("userUtils");
+        Integer userId = null;
+        if (userUtils != null) {
+            userId = userUtils.getCurrentUserId();
+        }
+        if (userId != null){
+            return Optional.of(userId);
+        }
+        else {
+            return Optional.empty();
+        }
+    }
+}