diff --git a/inspect-gateway/src/main/java/com/inspect/gateway/filter/RequestParamGlobalFilter.java b/inspect-gateway/src/main/java/com/inspect/gateway/filter/RequestParamGlobalFilter.java index c2c4bf5..54a71ac 100644 --- a/inspect-gateway/src/main/java/com/inspect/gateway/filter/RequestParamGlobalFilter.java +++ b/inspect-gateway/src/main/java/com/inspect/gateway/filter/RequestParamGlobalFilter.java @@ -29,6 +29,7 @@ public class RequestParamGlobalFilter implements GlobalFilter, Ordered { private static final List PATH_WHITE_LIST = Arrays.asList( "/patrol/task/add", + "/patrol/task/save", "/example/path2" ); diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java index a6f48c0..b5fc657 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java @@ -17,6 +17,7 @@ import com.inspect.base.core.web.page.TableDataInfo; import com.inspect.common.log.annotation.Log; import com.inspect.common.log.enums.BizType; import com.inspect.base.redis.service.RedisService; +import com.inspect.fegin.FeignBasedataPatrolPointPresetService; import com.inspect.patrol.contants.AccessApiConstant; import com.inspect.patrol.contants.ChannelTypeEnum; import com.inspect.patrol.contants.PresetControlEnum; @@ -89,6 +90,8 @@ public class PatrolPresetPosController extends BaseController { private final RedisService redisService; private final Video2NvrComponent video2NvrComponent; private final IPatrolPresetRecordService patrolPresetRecordService; + + private final FeignBasedataPatrolPointPresetService basedataPatrolPointPresetServiceClient; final IvsFeignService ivsFeignService; @Value("${gwb.url}") @@ -129,7 +132,8 @@ public class PatrolPresetPosController extends BaseController { PatrolTaskService patrolTaskService, SftpClient sftpClient, BasedataAreaService basedataAreaService, - BasedataPatrolPointPresetService basedataPatrolpointPresetService) { + BasedataPatrolPointPresetService basedataPatrolpointPresetService, + FeignBasedataPatrolPointPresetService basedataPatrolPointPresetServiceClient) { this.patrolPresetPosService = patrolPresetPosService; this.basedataStdPatrolPointService = basedataStdPatrolPointService; this.basedataPatrolPointService = basedataPatrolPointService; @@ -150,6 +154,7 @@ public class PatrolPresetPosController extends BaseController { this.sftpClient = sftpClient; this.basedataAreaService = basedataAreaService; this.basedataPatrolpointPresetService = basedataPatrolpointPresetService; + this.basedataPatrolPointPresetServiceClient = basedataPatrolPointPresetServiceClient; } @GetMapping({"/list"}) @@ -478,6 +483,7 @@ public class PatrolPresetPosController extends BaseController { JSONObject basePreset; String snap; if (patrolPresetPos.getPatrolPointId() == null) { + // 标准点位 ajaxResult = this.basedataStdPatrolPointService.queryById(patrolPresetPos.getStdParolPointId()); //qinyl basePreset = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data"); @@ -505,7 +511,11 @@ public class PatrolPresetPosController extends BaseController { Integer basePresetId = null; try { this.basedataPatrolPointService.UpPatrolPointModel((new JSONObject()).fluentPut("patrolPointId", patrolPresetPos.getPatrolPointId())); - basePresetId = this.insertBasePreset(patrolPresetPos); + // insert into basedata_patrolpoint_preset + JSONArray objects = this.selectBasePreset(patrolPresetPos); + if (objects == null || objects.size() == 0) { + basePresetId = this.insertBasePreset(patrolPresetPos); + } SnapModel snapModel = new SnapModel(); snapModel.setCode(patrolPresetPos.getChannelCode()); snapModel.setPatrolDeviceCode(patrolPresetPos.getPatrolDeviceCode()); @@ -650,6 +660,16 @@ public class PatrolPresetPosController extends BaseController { return (Integer) this.basedataPatrolpointPresetService.add(params).get("data"); } + private JSONArray selectBasePreset(PatrolPresetPos patrolPresetPos) { + JSONObject params = new JSONObject(); + params.put("patrolPointId", patrolPresetPos.getPatrolPointId()); + Object presetListObject = basedataPatrolPointPresetServiceClient.getPatrolPointPresetListByDeviceIdS(params).getRows(); + JSONArray presetListObjects = JSONArray.parseArray(JSONObject.toJSONString(presetListObject)); + logger.info("[METADATA] !!!!!!!!!!!!!!!!!!!!!selectBasePreset params: {}", params.toString()); + logger.info("[METADATA] !!!!!!!!!!!!!!!!!!!!!selectBasePreset result: {}", presetListObjects); + return presetListObjects; + } + @Log( title = "绑定预置点", businessType = BizType.UPDATE @@ -668,6 +688,7 @@ public class PatrolPresetPosController extends BaseController { (new Thread(() -> { try { for (Long id : presetPosIds) { + // delete from patrol_preset_record this.removeRemotePreset(id + ""); } diff --git a/inspect-main/inspect-main-video/src/main/resources/mapper/patrol/PatrolPresetPosMapper.xml b/inspect-main/inspect-main-video/src/main/resources/mapper/patrol/PatrolPresetPosMapper.xml index 2cc8830..c3ede45 100644 --- a/inspect-main/inspect-main-video/src/main/resources/mapper/patrol/PatrolPresetPosMapper.xml +++ b/inspect-main/inspect-main-video/src/main/resources/mapper/patrol/PatrolPresetPosMapper.xml @@ -250,7 +250,7 @@ - delete from basedata_patrolpoint_preset where video_nvr_code is not null and patrol_point_id in + delete from basedata_patrolpoint_preset where patrol_point_id in (select patrol_point_id from patrol_preset_pos where preset_pos_id in #{presetPosId}