From a8e5a54c8019c41a44d12b6ae3663314af883718 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Fri, 18 Apr 2025 16:37:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E4=BB=BB=E5=8A=A1=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E4=B8=8D=E5=90=8C=E5=B7=A1=E8=A7=86=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8E=82=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/domain/task/PatrolDevice.java | 4 ++++ .../java/com/inspect/job/task/JobMainTask.java | 2 +- .../controller/PatrolResultController.java | 15 +++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolDevice.java b/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolDevice.java index 40bea1d..f7a1c2d 100644 --- a/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolDevice.java +++ b/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolDevice.java @@ -1,5 +1,6 @@ package com.inspect.job.domain.task; +import com.alibaba.fastjson.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -10,7 +11,10 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor public class PatrolDevice { + @JSONField(name = "SendCode") private String sendCode; + @JSONField(name = "ReceiveCode") private String receiveCode; + @JSONField(name = "Type") private String type; } diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index 72997f4..ce1ef48 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -578,7 +578,7 @@ public class JobMainTask { TaskStateData taskStateData = new TaskStateData(); taskStateData.setType(StaEnum.RunState.getCode()); taskStateData.setReceiveCode(""); - taskStateData.setSendCode(""); + taskStateData.setSendCode("手动点位"); taskStateData.setTaskStateList(taskStates); Object patrolRunResult = JSONArray.toJSON(taskStateData); try { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index af34b03..fd72b81 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1054,7 +1054,7 @@ public class PatrolResultController extends BaseController { logger.info(Color.CYAN + "###### RECEIVE DATA TO ANALYSIS [41] start ######" + Color.END); try { JSONObject parseObject = JSONObject.parseObject(messageBody); - Object sendCode = parseObject.get("SendCode"); + String sendCode = (String)parseObject.get("SendCode"); Object jsonArray = parseObject.get("taskStateList"); if (jsonArray == null) { @@ -1084,11 +1084,11 @@ public class PatrolResultController extends BaseController { if (StringUtils.isNotEmpty(item.getPosType())) { patrolTaskStatus.setPosType(item.getPosType()); str = item.getPosType(); - } else if (StringUtils.isNotEmpty(sendCode + "")) { - str = sendCodeToDevType(sendCode + ""); + } else if (StringUtils.isNotEmpty(sendCode)) { + str = sendCodeToDevType(sendCode); patrolTaskStatus.setPosType(str); if ("1".equals(str) && "E100-001".equals(sendCode)) { - listEqpBook = baseDataClient.queryEqpBookCode(sendCode + ""); + listEqpBook = baseDataClient.queryEqpBookCode(sendCode); item.setCode(((BasedataEqpBookChannel) listEqpBook.get(0)).getChannelCode()); } } @@ -1102,6 +1102,10 @@ public class PatrolResultController extends BaseController { } if (!listEqpBook.isEmpty()) { item.setLineId(((PatrolTaskStatus) listEqpBook.get(0)).getLineId()); + + if(item.getTaskName().contains("联合") && !item.getTaskName().startsWith(sendCode)) { + item.setTaskName(sendCode + "-" + item.getTaskName()); + } i = iPatrolTaskStatusService.updatePatrolTaskStatus(item); if ("E100-001".equals(sendCode)) { if ("100".equals(item.getTaskProgress())) { @@ -1112,6 +1116,9 @@ public class PatrolResultController extends BaseController { item.setPosType(str); item.setCreateTime(new Date()); item.setStartTime(new Date()); + if(item.getTaskName().contains("联合") && !item.getTaskName().startsWith(sendCode)) { + item.setTaskName(sendCode + "-" + item.getTaskName()); + } i = iPatrolTaskStatusService.insertPatrolTaskStatus(item); } }