From 0ee44e75029923734744628a8b059fa41ff3ef55 Mon Sep 17 00:00:00 2001 From: Administrator <1144154118@qq.com> Date: 星期六, 05 八月 2023 10:48:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java | 39 +++++++-------------------------------- 1 files changed, 7 insertions(+), 32 deletions(-) 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..65b4e5e 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 @@ -62,14 +37,14 @@ public void run() { while (isRunning) { // 宸℃浠诲姟鐨勫叿浣撻�昏緫 - log.debug("宸℃浠诲姟鎵ц涓細" + taskId); + 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); } } -- Gitblit v1.9.3