From 6c4bad22bcdea0f06d75d76c0d17f680d688d4e0 Mon Sep 17 00:00:00 2001 From: lijw Date: Tue, 11 Mar 2025 10:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 32 +++++++----- .../PatrolTaskStatusController.java | 51 +++++++++++-------- .../mapper/task/PatrolTaskInfoMapper.xml | 6 +-- ...asedataMontPatrolPointHandleComponent.java | 15 +++--- 4 files changed, 59 insertions(+), 45 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 37878a8..12f6fe4 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -331,15 +331,6 @@ public class PatrolTaskController extends BaseController { } } - if ("0".equals(patrolTask.getExecutionStatus())) { - try { - issueTask(patrolTask); - } catch (Exception e) { - e.printStackTrace(); - } - } - - String executionType = "1"; if (parseObject.get("executionType") != null) { executionType = parseObject.get("executionType").toString(); @@ -353,9 +344,11 @@ public class PatrolTaskController extends BaseController { patrolTaskIds.add(majorId + ""); PatrolTask patrolTaskTemp = patrolTaskService.selectPatrolTaskByTaskId((long) majorId); if (isUp == null || StringUtils.isEmpty(isUp.toString())) { - logger.info("[ADD] isUp null 2 !!!!!!!!!!!!!!!!!!!!: {}", isUp); + logger.info("[ADD] isUp is null: {}", isUp); patrolTaskTemp.setTaskCode(patrolTaskTemp.getTaskId() + ""); patrolTaskService.updatePatrolTask(patrolTaskTemp); + + patrolTask.setTaskCode(patrolTaskTemp.getTaskCode()); } logger.info("[ADD] patrolTaskInfo size: {}", patrolTaskInfo.size()); @@ -364,6 +357,16 @@ public class PatrolTaskController extends BaseController { info.setTaskMajorId(majorId + ""); patrolTaskInfoService.insertPatrolTaskInfo(info); } + +// if ("0".equals(patrolTask.getExecutionStatus())) { + try { + logger.info("-----------------patrolTask start"); + issueTask(patrolTask); + logger.info("-----------------patrolTask end"); + } catch (Exception e) { + logger.info("error", e); + } +// } } return AjaxResult.success(String.join(StringUtils.COMMA, patrolTaskIds)); @@ -442,6 +445,7 @@ public class PatrolTaskController extends BaseController { } } } + issueTask(patrolTask); } return toAjax(a); } catch (Exception e) { @@ -539,7 +543,8 @@ public class PatrolTaskController extends BaseController { sendCode = basedataEqpBookMoMains.get(0).getPatrolDeviceCode(); } - if (patrolTask.getDevNo() != null && patrolTask.getDevNo().contains(StringUtils.COMMA)) { + logger.info("-----------------patrolTask.getDevNo(): " + patrolTask.getDevNo()); + if (patrolTask.getDevNo() != null) { String[] devNos = patrolTask.getDevNo().split(StringUtils.COMMA); for (String devNo : devNos) { BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); @@ -583,14 +588,15 @@ public class PatrolTaskController extends BaseController { if (StringUtils.isNotEmpty(patrolTask.getDeviceList())) { patrolSendTask.setDeviceList(patrolTask.getDeviceList()); } else { - patrolSendTask.setDeviceList(""); + patrolSendTask.setDeviceList("[empty device list 1]"); } } else { List infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId())); + logger.info("-----------------patrolTask.getTaskId(): " + patrolTask.getTaskId()); if (!infoList.isEmpty()) { patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, infoList)); } else { - patrolSendTask.setDeviceList(""); + patrolSendTask.setDeviceList("[empty device list 2]"); } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index 5aa6b63..2d99bae 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -16,6 +16,7 @@ import com.inspect.base.redis.service.RedisService; import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.partrolresult.service.IPatrolResultService; import com.inspect.system.base.openDomain.BasedataEqpBookMoMain; +import com.inspect.task.controller.PatrolTaskController; import com.inspect.task.domain.PatrolSendTask; import com.inspect.task.domain.PatrolTask; @@ -43,6 +44,7 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -61,8 +63,10 @@ public class PatrolTaskStatusController extends BaseController { private final FeignTaskClient feignTaskClient; private final FeignJobTaskClient feignJobTaskClient; private final RedisService redisService; + private PatrolTaskController patrolTaskController; - public PatrolTaskStatusController(IPatrolTaskStatusService patrolTaskStatusService, IPatrolResultService patrolResultService, IPatrolTaskService patrolTaskService, FeignTaskClient feignTaskClient, FeignJobTaskClient feignJobTaskClient, RedisService redisService) { + public PatrolTaskStatusController(PatrolTaskController patrolTaskController, IPatrolTaskStatusService patrolTaskStatusService, IPatrolResultService patrolResultService, IPatrolTaskService patrolTaskService, FeignTaskClient feignTaskClient, FeignJobTaskClient feignJobTaskClient, RedisService redisService) { + this.patrolTaskController = patrolTaskController; this.patrolTaskStatusService = patrolTaskStatusService; this.patrolResultService = patrolResultService; this.patrolTaskService = patrolTaskService; @@ -507,6 +511,7 @@ public class PatrolTaskStatusController extends BaseController { return c.getTime(); } + //立即执行任务 @GetMapping({"/controlChange"}) public AjaxResult controlChange(PatrolTask patrolTask) { String taskCode = redisService.getCacheObject(RedisConst.TASK_CURRENT_CODE); @@ -515,8 +520,9 @@ public class PatrolTaskStatusController extends BaseController { return AjaxResult.error(501, "THERE TASK IS RUNNING!"); } else { PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId()); - //issueToRobot(patrol); - sendTaskToVideo(patrol); + patrolTaskController.issueTask(patrol); //type=101 下发任务 + issueToRobot(patrol); //type=41 立即执行任务 +// sendTaskToVideo(patrol); return toAjax(1); } } @@ -574,26 +580,27 @@ public class PatrolTaskStatusController extends BaseController { if (StringUtils.isNotEmpty(patrolTask.getDevNo())) { String[] devNos = patrolTask.getDevNo().split(StringUtils.COMMA); for (String devNo : devNos) { - BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); - basedataEqpbookMomain.setPatrolDeviceCode(devNo); - List eqpBookMoMains = this.patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain); - if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) { - receiveCode = eqpBookMoMains.get(0).getMainSystemCode(); - } +// BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); +// basedataEqpbookMomain.setPatrolDeviceCode(devNo); +// List eqpBookMoMains = this.patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain); +// if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) { +// receiveCode = eqpBookMoMains.get(0).getMainSystemCode(); +// } +// +// SendTask sendTaskcontrol = new SendTask(); +// sendTaskcontrol.setReceiveCode(receiveCode); +// sendTaskcontrol.setSendCode(sendCode); +// sendTaskcontrol.setCode(devNo); +// sendTaskcontrol.setType("1"); +// sendTaskcontrol.setCommand("5"); +// List sendTaskArrayList = new ArrayList<>(); +// PatrolSendTask patrolSendTask = new PatrolSendTask(); +// patrolSendTask.setValue("1"); +// sendTaskArrayList.add(patrolSendTask); +// sendTaskcontrol.setItems(sendTaskArrayList); +// String jsonString = JSONObject.toJSONString(sendTaskcontrol); +// this.feignTaskClient.sendCommand(jsonString); - SendTask sendTaskcontrol = new SendTask(); - sendTaskcontrol.setReceiveCode(receiveCode); - sendTaskcontrol.setSendCode(sendCode); - sendTaskcontrol.setCode(devNo); - sendTaskcontrol.setType("1"); - sendTaskcontrol.setCommand("5"); - List sendTaskArrayList = new ArrayList<>(); - PatrolSendTask patrolSendTask = new PatrolSendTask(); - patrolSendTask.setValue("1"); - sendTaskArrayList.add(patrolSendTask); - sendTaskcontrol.setItems(sendTaskArrayList); - String jsonString = JSONObject.toJSONString(sendTaskcontrol); - this.feignTaskClient.sendCommand(jsonString); SendTask sendTask = new SendTask(); sendTask.setReceiveCode(receiveCode); sendTask.setSendCode(sendCode); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml index 5c5b929..82eff10 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml @@ -104,9 +104,9 @@