流程优化

杰生

hx-common/service-file/src/main/java/com/fjhx/service/impl/FileInfoServiceImpl.java

@@ -86,6 +86,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
 
         String contentType = file.getContentType();
         fileInfo.setContentType(contentType);
+        // 如果是视频，赋值视频时长
         setDuration(contentType, fileInfo, rootPath + filePath);
 
         fileInfo.setFileSize(file.getSize() / 1024);

hx-common/service-flow/src/main/java/com/fjhx/service/example/impl/ExampleInfoServiceImpl.java

@@ -149,8 +149,8 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
         // 下一个节点进行中
         ProcessNode nextNode = processNodeMap.get(exampleInfo.getProcessNodeId());
 
-        // 没有未完成的节点
-        if (nextNode == null) {
+        // 没有未完成的节点或者下一节点为结束
+        if (nextNode == null || ProcessNodeTypeEnum.END.getType().equals(nextNode.getType())) {
             return result;
         }
 

hx-common/service-video/src/main/java/com/fjhx/service/video/impl/VideoInfoServiceImpl.java

@@ -163,7 +163,7 @@ public class VideoInfoServiceImpl extends ServiceImpl<VideoInfoMapper, VideoInfo
         Map<String, Object> map = getMap(Wrappers.<VideoInfo>lambdaQuery().eq(BaseEntity::getId, id));
         List<FileInfo> fileInfoList = FileClientUtil.getFileInfoList(id);
 
-        map.put("fileInfo", fileInfoList);
+        map.put("fileInfoList", fileInfoList);
 
         return map;
     }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackPlanServiceImpl.java

@@ -195,14 +195,14 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
         // 查询回仓
         List<Map<String, Object>> backList = baseMapper.getWater(Wrappers.query()
-                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 9:30:00"))
+                .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
                 .eq("swd.StockChangeType", 16)
                 .likeRight("m.Code", "01.")
                 .isNotNull("uu.JobNo"));
 
         // 转仓
         List<Map<String, Object>> transferBackList = baseMapper.getTransferBackList(Wrappers.query()
-                .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 9:30:00"))
+                .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
                 .eq("st.status", StatusConstant.YES)
         );
         backList.addAll(transferBackList);
@@ -213,9 +213,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             Date createTime = (Date) map.get("createTime");
 
             int h = Integer.parseInt(DateUtil.format(createTime, "H"));
-            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
-            // 小于9点30算前一日
-            if (h < 9 || (h == 9 && m < 30)) {
+//            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
+            // 小于10点算前一日
+            if (h < 10) {
                 DateUtil.offsetDay(createTime, -1);
             }
 

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -55,7 +55,7 @@ public class ScheduleTaskController {
     /**
      * 统计排班数据
      */
-    @Scheduled(cron = "0 30 9,21 * * ?")
+    @Scheduled(cron = "0 0 10,22 * * ?")
 //    @Scheduled(cron = "0 * * * * ?")
     private void statisticsScheduleDateTask() {
         if (BladeApplication.isLocalDev()) {