联合任务区分不同巡视执行厂商

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;
 }

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 {

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);
                                 }
                             }