/*宜昌站点位增加问题解决；任务下发问题解决；*/

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1264,6 +1264,7 @@ public class PatrolResultController extends BaseController {
 
                 List<PatrolResult> resultList = new ArrayList<>();
                 for (PatrolResult arr : eqList) {
+                    logger.info(Color.GREEN + "[MAIN] eqList arr: {}" + Color.END, arr);
                     datetype = "";
                     String str;
                     if (StringUtils.isNotEmpty(arr.getPatrolDeviceCode())) {

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -3,6 +3,7 @@ package com.inspect.task.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.inspect.analysis.service.IResultAnalysisService;
+import com.inspect.base.core.constant.Color;
 import com.inspect.base.core.constant.RedisConst;
 import com.inspect.base.core.domain.DataMsg;
 import com.inspect.base.core.enums.TaskStatus;
@@ -1163,6 +1164,7 @@ public class PatrolTaskController extends BaseController {
     }
 
     public List<PatrolTask> toPatrolTaskList(JSONObject jsonObject, String flag) {
+        logger.info(Color.GREEN + "[MAIN] toPatrolTaskList jsonObject: {}" + Color.END, jsonObject);
         List<PatrolTask> patrolTaskList = new ArrayList<>();
         PatrolTask patrolTask = new PatrolTask();
         try {
@@ -1254,7 +1256,7 @@ public class PatrolTaskController extends BaseController {
 
             if (jsonObject.get("cycleMonth") != null) {
                 jsonObjectString = jsonObject.get("cycleMonth").toString();
-                if (StringUtils.isNotEmpty(jsonObjectString)) {
+                if (jsonObjectString != null && StringUtils.isNotEmpty(jsonObjectString)) {
                     patrolTask.setCycleMonth(jsonObjectString);
                 }
             }
@@ -1394,7 +1396,7 @@ public class PatrolTaskController extends BaseController {
 
             if (jsonObject.get("areaIdS") != null) {
                 jsonObjectString = jsonObject.get("areaIdS").toString();
-                if (StringUtils.isNotEmpty(jsonObjectString)) {
+                if (jsonObjectString != null && StringUtils.isNotEmpty(jsonObjectString)) {
                     patrolTask.setAreaIdS(jsonObjectString);
                     String areaNameS = getAreaNameSByAreaIdS(jsonObjectString);
                     patrolTask.setAreaName(areaNameS);

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

@@ -521,7 +521,7 @@ public class PatrolTaskStatusController extends BaseController {
         } else {
             PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId());
             issueToRobot(patrol); //type=41 立即执行任务
-//            sendTaskToVideo(patrol);
+            sendTaskToVideo(patrol);
             return toAjax(1);
         }
     }

inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java

@@ -458,7 +458,6 @@ public class PatrolPresetPosController extends BaseController {
             String stdPatrolPointId = patrolPresetPos.getStdParolPointId();
             JSONObject paramJson = (new JSONObject())
                     .fluentPut("deviceId", patrolPresetPos.getDeviceId())
-                    .fluentPut("patrolPointId", patrolPresetPos.getPatrolPointId())
                     .fluentPut("patrolContent", basePresetId.getString("patrolContent"))
                     .fluentPut("purpose", INSERT_PATROL_POINT_PURPOSE)
                     .fluentPut("areaId", snap)

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPointPreset.java

@@ -44,14 +44,14 @@ public class BasedataPatrolPointPreset extends BaseEntity {
     @Excel(
             name = "巡视设备编号"
     )
-    @JsonProperty("patroldeviceCode")
+    //@JsonProperty("patroldeviceCode")
     private String patrolDeviceCode;
     @Excel(
             name = "通道编号"
     )
     private String channelCode;
     private String videoNvrCode;
-    @JsonProperty("patroldeviceName")
+    //@JsonProperty("patroldeviceName")
     private String patrolDeviceName;
     private boolean noVideo;
     private List<String> patrolPointIdList;

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPointPreset2.java

@@ -0,0 +1,76 @@
+package com.inspect.metadata.patrolpointmnt.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inspect.base.core.annotation.Excel;
+import com.inspect.base.core.web.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class BasedataPatrolPointPreset2 extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private Long patrolPointPresetId;
+
+    @Excel(
+            name = "点位id"
+    )
+    @JsonProperty("patrolpointId")
+    private Long patrolPointId;
+    @Excel(
+            name = "巡检设备ID"
+    )
+    @JsonProperty("eqpbookId")
+    private Long eqpBookId;
+    @Excel(
+            name = "通道编号"
+    )
+    private Long channelId;
+    @Excel(
+            name = "预置点编号"
+    )
+    private String presetCode;
+    @Excel(
+            name = "预置点名称"
+    )
+    private String presetName;
+    @Excel(
+            name = "删除标志，0：正常；2：删除"
+    )
+    private String deleteFlag;
+    @Excel(
+            name = "巡视设备编号"
+    )
+    @JsonProperty("patroldeviceCode")
+    private String patrolDeviceCode;
+    @Excel(
+            name = "通道编号"
+    )
+    private String channelCode;
+    private String videoNvrCode;
+    @JsonProperty("patroldeviceName")
+    private String patrolDeviceName;
+    private boolean noVideo;
+    private List<String> patrolPointIdList;
+
+    @Override
+    public String toString() {
+        return "BasedataPatrolPointPreset{" +
+                "patrolPointPresetId=" + patrolPointPresetId +
+                ", patrolPointId=" + patrolPointId +
+                ", eqpBookId=" + eqpBookId +
+                ", channelId=" + channelId +
+                ", presetCode='" + presetCode + '\'' +
+                ", presetName='" + presetName + '\'' +
+                ", deleteFlag='" + deleteFlag + '\'' +
+                ", patrolDeviceCode='" + patrolDeviceCode + '\'' +
+                ", channelCode='" + channelCode + '\'' +
+                ", videoNvrCode='" + videoNvrCode + '\'' +
+                ", patrolDeviceName='" + patrolDeviceName + '\'' +
+                ", noVideo=" + noVideo +
+                ", patrolPointIdList=" + patrolPointIdList +
+                '}';
+    }
+}