From c4c6484a6e6d18e56ec6791db3585aae39c8584d Mon Sep 17 00:00:00 2001 From: zhangjian <zhangjianrock@163.com> Date: 星期五, 02 六月 2023 09:13:46 +0800 Subject: [PATCH] 视频巡检任务 单独更新 --- ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) 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..3f1c570 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,9 +109,22 @@ 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); + } + + /** + * 淇敼瑙嗛宸℃浠诲姟,bu鏇存柊姝ラ + * + * @param ardVideoInspectTask 瑙嗛宸℃浠诲姟 + * @return 缁撴灉 + */ + @Transactional + @Override + public int updateArdVideoInspectTaskSingle(ArdVideoInspectTask ardVideoInspectTask) { + ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername()); + ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate()); return ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask); } @@ -334,6 +363,7 @@ ardVideoInspectTaskMapper.updateArdVideoInspectTask(avit); } else { cmd.setEnable(false);//鍋滄褰曞儚 + cmd.setUploadMinio(true); hikClientService.recordToMinio(cmd); /*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/ ArdVideoInspectTask avit = new ArdVideoInspectTask(); @@ -377,6 +407,7 @@ String recordName = cameraId + "/" + time + "/" + uuid + ".mp4"; cmd.setRecordBucketName("record"); cmd.setRecordObjectName(recordName); + cmd.setUploadMinio(true); hikClientService.recordToMinio(cmd); /*鎻掑叆宸℃璁板綍*/ ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord(); -- Gitblit v1.9.3