|
@@ -1,7 +1,6 @@
|
|
package com.ozs.web.controller.shotschedule;
|
|
package com.ozs.web.controller.shotschedule;
|
|
|
|
|
|
-import com.ozs.common.utils.uuid.IdUtils;
|
|
|
|
-import com.ozs.service.entity.vo.BaseCameraVO;
|
|
|
|
|
|
+import cn.hutool.core.thread.ThreadUtil;
|
|
import com.ozs.service.service.impl.CameraCaptureService;
|
|
import com.ozs.service.service.impl.CameraCaptureService;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -10,7 +9,6 @@ import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.net.URL;
|
|
import java.net.URL;
|
|
-import java.util.concurrent.CountDownLatch;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @author lyao
|
|
* @author lyao
|
|
@@ -30,7 +28,7 @@ public class GenPictureTaskService {
|
|
@Value("${shot.urlAddress}")
|
|
@Value("${shot.urlAddress}")
|
|
private String urlAddress;
|
|
private String urlAddress;
|
|
|
|
|
|
- public boolean makePicture(String cameraCode, String channel, String filePath) {
|
|
|
|
|
|
+ public boolean makePicture(String cameraCode, String channel, String filePath, boolean isAlarm) {
|
|
long start = System.currentTimeMillis();
|
|
long start = System.currentTimeMillis();
|
|
if (!ObjectUtils.isEmpty(cameraCode)) {
|
|
if (!ObjectUtils.isEmpty(cameraCode)) {
|
|
try {
|
|
try {
|
|
@@ -43,6 +41,10 @@ public class GenPictureTaskService {
|
|
// log.debug("正常摄像头截图开始, url: " + url + ", fileName: " + fileName);
|
|
// log.debug("正常摄像头截图开始, url: " + url + ", fileName: " + fileName);
|
|
// }
|
|
// }
|
|
boolean capture = cameraCaptureService.getCapture(url, cameraCode, filePath);
|
|
boolean capture = cameraCaptureService.getCapture(url, cameraCode, filePath);
|
|
|
|
+ if (capture && isAlarm) {
|
|
|
|
+ ThreadUtil.sleep(500);
|
|
|
|
+ cameraCaptureService.getCapture(url, cameraCode, filePath);
|
|
|
|
+ }
|
|
// if (log.isDebugEnabled()) {
|
|
// if (log.isDebugEnabled()) {
|
|
// log.debug("正常摄像头截图结束, url: " + url + (capture ? "" : ", 出现错误") + ", 共计耗时: " + ((System.currentTimeMillis() - start) / 1000) + "s");
|
|
// log.debug("正常摄像头截图结束, url: " + url + (capture ? "" : ", 出现错误") + ", 共计耗时: " + ((System.currentTimeMillis() - start) / 1000) + "s");
|
|
// }
|
|
// }
|