From 444c6f9820a29b374a6a0a8948614a45786a2ca5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 02 六月 2023 09:11:57 +0800
Subject: [PATCH] 优化巡检
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java | 2 +
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 20 +++++----
ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java | 8 +---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java | 1
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 21 +++++++++-
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java | 37 +++---------------
6 files changed, 41 insertions(+), 48 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
index b8cf663..aa69473 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
@@ -40,4 +40,6 @@
String recordBucketName;
/*褰曞儚鏂囦欢鍚嶇О*/
String recordObjectName;
+ /*鏄惁涓婁紶minio*/
+ boolean isUploadMinio;
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index fe82c91..aaf30b3 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -1360,15 +1360,17 @@
}
hCNetSDK.NET_DVR_StopRealPlay(info.getLRealHandle());
log.info("褰曞儚鍋滄");
- //瀛樺叆minio
- String BucketName = cmd.getRecordBucketName();
- String ObjectName = cmd.getRecordObjectName();
- String ContentType = "video/MP4";
- FileInputStream stream = new FileInputStream(info.getRecordPath());
- boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
- if (b) {
- log.info("涓婁紶鏂囦欢鎴愬姛!" + MinioClientSingleton.domainUrl + "/"+ BucketName + "/" + ObjectName);
- GlobalVariable.user_real_Map.remove(userId);
+ if(cmd.isUploadMinio()) {
+ //瀛樺叆minio
+ String BucketName = cmd.getRecordBucketName();
+ String ObjectName = cmd.getRecordObjectName();
+ String ContentType = "video/MP4";
+ FileInputStream stream = new FileInputStream(info.getRecordPath());
+ boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
+ if (b) {
+ log.info("涓婁紶鏂囦欢鎴愬姛!" + MinioClientSingleton.domainUrl + "/" + BucketName + "/" + ObjectName);
+ GlobalVariable.user_real_Map.remove(userId);
+ }
}
}
} catch (Exception ex) {
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
index 27cf26f..5fb815a 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
@@ -1,9 +1,7 @@
package com.ruoyi.inspect.controller;
-import com.ruoyi.common.annotation.Anonymous;
+
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.inspect.domain.ArdVideoInspectTask;
-import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import com.ruoyi.inspect.service.impl.InspectionTaskManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,12 +11,10 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
import java.util.Set;
/**
- * @Description: 宸℃浠诲姟
+ * @Description: 宸℃浠诲姟controller
* @ClassName: TaskController
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�06鏈�01鏃�9:19
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index 853a2c7..2092c9a 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -21,6 +21,8 @@
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
+
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
/**
@@ -43,6 +45,20 @@
@Resource
private IHikClientService hikClientService;
+ @PostConstruct
+ public void initTask()
+ {
+ List<ArdVideoInspectTask> ardVideoInspectTasks = ardVideoInspectTaskMapper.selectArdVideoInspectTaskList(new ArdVideoInspectTask());
+ /*鍚姩鍚庡皢鎵�鏈夋墜鍔ㄤ换鍔＄疆涓哄叧闂�*/
+ for(ArdVideoInspectTask ardVideoInspectTask:ardVideoInspectTasks)
+ {
+ if(ardVideoInspectTask.getInspectMode().equals("鎵嬪姩"))
+ {
+ ardVideoInspectTask.setMenualSwitch("鍏�");
+ ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
+ }
+ }
+ }
/**
* 鏌ヨ瑙嗛宸℃浠诲姟
*
@@ -93,8 +109,7 @@
public int updateArdVideoInspectTask(ArdVideoInspectTask ardVideoInspectTask) {
ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername());
ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate());
- ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId())
- ;
+ ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId());
insertArdVideoInspectTaskStep(ardVideoInspectTask);
return ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
}
@@ -334,6 +349,7 @@
ardVideoInspectTaskMapper.updateArdVideoInspectTask(avit);
} else {
cmd.setEnable(false);//鍋滄褰曞儚
+ cmd.setUploadMinio(true);
hikClientService.recordToMinio(cmd);
/*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/
ArdVideoInspectTask avit = new ArdVideoInspectTask();
@@ -377,6 +393,7 @@
String recordName = cameraId + "/" + time + "/" + uuid + ".mp4";
cmd.setRecordBucketName("record");
cmd.setRecordObjectName(recordName);
+ cmd.setUploadMinio(true);
hikClientService.recordToMinio(cmd);
/*鎻掑叆宸℃璁板綍*/
ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java
index 3bcf69a..ebec5a6 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java
@@ -1,37 +1,12 @@
package com.ruoyi.inspect.service.impl;
-import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
-import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.device.camera.domain.ArdCameras;
-import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
-import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
-import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
-import com.ruoyi.inspect.domain.ArdVideoInspectTask;
-import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
-import com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper;
-import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;
-import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.thymeleaf.spring5.context.SpringContextUtils;
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import lombok.extern.slf4j.Slf4j;
+
/**
- * @Description:
+ * @Description: 宸℃浠诲姟绫�
* @ClassName: InspectionTaskImpl
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�06鏈�01鏃�8:57
@@ -63,13 +38,13 @@
while (isRunning) {
// 宸℃浠诲姟鐨勫叿浣撻�昏緫
log.debug("宸℃浠诲姟鎵ц涓細" + taskId);
+ ArdVideoInspectTaskServiceImpl ardVideoInspectTaskService = SpringUtils.getBean(ArdVideoInspectTaskServiceImpl.class);
+ ardVideoInspectTaskService.manualTaskRun(taskId);
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
- ArdVideoInspectTaskServiceImpl ardVideoInspectTaskService = SpringUtils.getBean(ArdVideoInspectTaskServiceImpl.class);
- ardVideoInspectTaskService.manualTaskRun(taskId);
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
index 530f3fb..9ee0e03 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
@@ -74,6 +74,7 @@
cmd.setCameraId(ardVideoInspectTask.getCameraId());
cmd.setChannelNum(ardVideoInspectTask.getChannel());
cmd.setEnable(false);//鍋滄褰曞儚
+ cmd.setUploadMinio(false);
hikClientService.recordToMinio(cmd);
}
InspectionTask task = taskMap.get(taskId);
--
Gitblit v1.9.3