diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 6198415..d3aaa6c 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -38,11 +38,11 @@
spring-boot-configuration-processor
true
-
org.projectlombok
lombok
- true
+ 1.18.30
+ provided
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index 5ce40d3..884e78f 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -49,9 +49,11 @@
org.projectlombok
lombok
- true
+ 1.18.30
+ provided
+
com.zhehekeji
core
diff --git a/modules/pom.xml b/modules/pom.xml
index f3ee85d..cc7e251 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -37,8 +37,10 @@
org.projectlombok
lombok
- true
+ 1.18.30
+ provided
+
diff --git a/pom.xml b/pom.xml
index d9bc382..9400c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,12 +30,13 @@
org.springframework.boot
spring-boot-starter-web
-
org.projectlombok
lombok
- true
+ 1.18.30
+ provided
+
org.springframework.boot
spring-boot-starter-test
diff --git a/web/pom.xml b/web/pom.xml
index 469fc1f..1980650 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -44,8 +44,10 @@
org.projectlombok
lombok
- true
+ 1.18.30
+ provided
+
com.zhehekeji
common
diff --git a/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java b/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java
index f37e459..467b0b9 100644
--- a/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java
+++ b/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java
@@ -1,12 +1,14 @@
package com.zhehekeji.web.lib;
import com.zhehekeji.common.util.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+@Slf4j
public class TaskDelayExecutor {
private static ExecutorService exec = Executors.newFixedThreadPool(1);
@@ -44,6 +46,7 @@ public class TaskDelayExecutor {
if(cameraDelayTask != null){
if(cameraDelayTask.getType() == 0){
+ log.info("开始下载视频:{}",cameraDelayTask.getPath());
cameraControlModule.downloadMp4(cameraDelayTask.getCameraId(), cameraDelayTask.getPath(), cameraDelayTask.getStartTime(), cameraDelayTask.getEndTime());
}else if(cameraDelayTask.getType() == 1){
diff --git a/web/src/main/java/com/zhehekeji/web/service/InitService.java b/web/src/main/java/com/zhehekeji/web/service/InitService.java
index 5d88ad3..b9bd6e1 100644
--- a/web/src/main/java/com/zhehekeji/web/service/InitService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/InitService.java
@@ -82,6 +82,8 @@ public class InitService implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
+
+ TaskDelayExecutor.runMp4DownloadExecutor();
//球机登录
List cameras = cameraMapper.selectByMap(new HashMap<>(0));
cameras.forEach(camera -> {
@@ -121,7 +123,6 @@ public class InitService implements ApplicationRunner {
}
NettyServer nettyServer = new NettyServer();
nettyServer.CreateNettyServer(9040);
- TaskDelayExecutor.runMp4DownloadExecutor();
GetPhotoDelayExecutor.runExecutor(streetMapper.selectList(new QueryWrapper<>()),plcService);
}
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 9f14844..328f013 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -287,6 +287,7 @@ public class PlcService {
update.setVideoPath2(path);
}
orderMapper.updateById(update);
+ log.info("订单结束信息:{}", plcCmdInfo);
}
@@ -306,14 +307,8 @@ public class PlcService {
public String cameraVideo(Integer cameraId, LocalDateTime startTime, LocalDateTime endTime) {
String path = PathUtil.createFileName("mp4",cameraId);
- Thread thread = new Thread(new Runnable() {
- @Override
- public void run() {
- String realPath = configProperties.getSavePath().getMp4Path() + path;
- TaskDelayExecutor.addMp4DelayTask(cameraId,realPath,startTime,endTime,configProperties.getCameraConfig().getDelayDownloadMp4());
- }
- });
- thread.start();
+ String realPath = configProperties.getSavePath().getMp4Path() + path;
+ TaskDelayExecutor.addMp4DelayTask(cameraId,realPath,startTime,endTime,configProperties.getCameraConfig().getDelayDownloadMp4());
//cameraControlModule.downloadMp4(cameraId,realPath,startTime,endTime);
return path;
}