fix:武汉现场手动配置点位修改

inspect-job/src/main/java/com/inspect/job/domain/task/PatrolPresetPos.java

@@ -1,5 +1,6 @@
 package com.inspect.job.domain.task;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.inspect.base.core.annotation.Excel;
 import com.inspect.base.core.web.domain.BaseEntity;
 
@@ -29,6 +30,7 @@ public class PatrolPresetPos extends BaseEntity {
             name = "设备点位",
             readConverterExp = "部=件ID"
     )
+    @JsonProperty("patrolpointId")
     private Long patrolPointId;
     @Excel(
             name = "通道ID"

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

@@ -439,7 +439,8 @@ public class PatrolPresetPosController extends BaseController {
         logger.info("[PRESET] patrolPresetPos eqpBookId: {}, body: {}", patrolPresetPos.getEqpBookId(), patrolPresetPos);
         AjaxResult ajaxResult = this.basedataEqpbookService.queryById(patrolPresetPos.getEqpBookId());
         JSONObject eqpBook = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data");
-        patrolPresetPos.setPatrolDeviceCode(eqpBook.getString("patrolDeviceCode"));
+        logger.info("[PRESET] eqpBook: {}", eqpBook);
+        patrolPresetPos.setPatrolDeviceCode(StringUtils.isEmpty(eqpBook.getString("patrolDeviceCode")) ? eqpBook.getString("patroldeviceCode") : eqpBook.getString("patrolDeviceCode"));
         ajaxResult = this.basedataChannelService.queryById(patrolPresetPos.getChannelId());
         JSONObject channel = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data");
         patrolPresetPos.setChannelCode(channel.getString("channelCode"));