From 56071eac7d2f1803e29c75854df1a4a1262425fd Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 15 Apr 2025 10:07:41 +0800 Subject: [PATCH] =?UTF-8?q?/*ivs=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=85=BC=E5=AE=B9zte=20ivs=E5=B9=B3=E5=8F=B0=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E7=9A=84=E6=97=B6=E5=80=99=E5=8E=BB=E6=8E=89code?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/inspect/job/task/JobMainTask.java | 3 ++- .../inspect/patrol/controller/PatrolPresetPosController.java | 5 ++--- .../controller/BasedataPatrolPointPresetController.java | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) 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 671d0af..37b7ddd 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 @@ -419,7 +419,8 @@ public class JobMainTask { try { log.info(Color.CYAN + "[JOB] *********************chanType: {}, patrolPointId: {}" + Color.END, chanType, presetPos.getPatrolPointId()); if ("vl".equals(chanType)) { - String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true&code=" + presetPos.getChannelCode(); + //String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true&code=" + presetPos.getChannelCode(); + String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true"; String paramFileName = taskPatrolId.split(StringUtils.UNDERLINE)[1] + StringUtils.UNDERLINE + taskPatrolId.split(StringUtils.UNDERLINE)[2] + StringUtils.UNDERLINE + presetPos.getPatrolPointId() + StringUtils.UNDERLINE 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 e574f66..b2d1dfa 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 @@ -156,13 +156,12 @@ public class PatrolPresetPosController extends BaseController { @GetMapping({"/camera/{channelType}"}) public AjaxResult findCameraByChannelType(@PathVariable("channelType") String channelType) { List list = patrolPresetPosService.selectCameraByChannelType(channelType); - JSONArray jsonArray = JSONObject.parseObject(JSONObject.toJSONString(basedataAreaService.list(new JSONObject()))).getJSONArray("data"); - + JSONArray jsonArray = + JSONObject.parseObject(JSONObject.toJSONString(basedataAreaService.list(new JSONObject()))).getJSONArray("data"); for (int i = 0; i < jsonArray.size(); ++i) { JSONObject jsonObject = jsonArray.getJSONObject(i); jsonObject.put("id", jsonObject.getString("areaId")); jsonObject.put("name", jsonObject.getString("areaName")); - for (int j = 0; j < list.size(); ++j) { CameraVo cameraVo = list.get(j); if (jsonObject.getString("areaId").equals(cameraVo.getAreaId())) { diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java index 9fd6075..78bd578 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java @@ -47,6 +47,9 @@ public class BasedataPatrolPointPresetController extends BaseController { try { this.startPage(); List list = this.basedataPatrolPointPresetService.selectBasedataPatrolPointPresetList(basedataPatrolPointPreset); + if(list == null) { + return this.getDataTable(new ArrayList<>()); + } List basedataEqpBooks = this.basedataEqpBookService.selectBasedataEqpBookList(new BasedataEqpBook()); Map eqpbookMap = new HashMap<>(); basedataEqpBooks.forEach((item) -> {