From 4a9566ba1c800535504462b06a93b1a6e5092f28 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期六, 03 六月 2023 21:11:03 +0800
Subject: [PATCH] 解决手动巡检启动2次的问题
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 4116465..f482870 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
@@ -115,7 +115,7 @@
ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername());
ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate());
// ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId());
- insertArdVideoInspectTaskStep(ardVideoInspectTask);
+ // insertArdVideoInspectTaskStep(ardVideoInspectTask);
return ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
}
@@ -193,6 +193,10 @@
public void manualTaskRun(String TaskId) {
try {
ArdVideoInspectTask videoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(TaskId);
+ if(!videoInspectTask.getMenualSwitch().equals("寮�"))
+ {
+ return;
+ }
if (videoInspectTask.getArdVideoInspectTaskStepList().size() == 0) {
return;
}
@@ -425,6 +429,10 @@
.findFirst();
if (objectOptional.isPresent()) {
ArdVideoInspectTaskStep step = objectOptional.get();
+ /*鏇存柊浠诲姟褰撳墠姝ラid鍜屾楠ゅ惎鍔ㄦ椂闂�*/
+ ardVideoInspectTask.setCurrentStepId(step.getId());
+ ardVideoInspectTask.setCurrentStepStartTime(DateUtils.getTime());
+ ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
String wellId = step.getWellId();
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
@@ -456,10 +464,6 @@
hikClientService.recordToMinio(cmd);
Global.task_record.add(ardVideoInspectTask.getId());
}
- /*鏇存柊浠诲姟褰撳墠姝ラid鍜屾楠ゅ惎鍔ㄦ椂闂�*/
- ardVideoInspectTask.setCurrentStepId(step.getId());
- ardVideoInspectTask.setCurrentStepStartTime(DateUtils.getTime());
- ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
} else {
cmd.setEnable(false);//鍋滄褰曞儚
cmd.setUploadMinio(true);
@@ -520,7 +524,6 @@
log.error("宸℃鍋滄寮傚父:" + ex.getMessage());
}
}
-
//姝ラ鍒ゆ柇鏄惁杩囨湡
private boolean isExpirdStep(ArdVideoInspectTask ardVideoInspectTask) {
try {
@@ -551,7 +554,6 @@
return false;
}
}
-
//姝ラ鍒囨崲
private String changeNextStep(ArdVideoInspectTask ardVideoInspectTask) {
try {
--
Gitblit v1.9.3