From 608086c69aaf97ae6ecd73088a1aec6630f6b52c Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 5 Aug 2025 10:10:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?/*=20*=201.=20=20=20=E5=A4=84=E7=90=86sendC?= =?UTF-8?q?ommand=E4=B8=AD=E5=AF=B9=E4=BA=8EclientService.callDeviceComman?= =?UTF-8?q?d=E8=B0=83=E7=94=A8=E7=BB=93=E6=9E=9C=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E7=90=86=E7=9A=84=E5=9C=B0=E6=96=B9=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E8=BF=9C=E7=AB=AF=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=8C=E7=94=B1throw=E5=BC=82=E5=B8=B8=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=AD=A3=E5=B8=B8=E5=80=BC=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=AD=89=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BC=9A=E5=87=BA=E9=94=99=E3=80=82=20*=202.=20gotoSn?= =?UTF-8?q?apshotPresetRetryable=E6=9B=B4=E6=AD=A3=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=8D=E5=90=88=E7=90=86=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E6=96=B9=E3=80=82=20*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IvsResourceRetryableDelegate.java | 2 +- .../inspect/client/util/CallDeviceApi.java | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java index c273ff7..6c332e1 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java @@ -89,7 +89,7 @@ public class IvsResourceRetryableDelegate { final String apiAddr = getApiAddress(ivsPresetVo); log.info("URI_PTZ_CONTROL GOTO apiAddr: {}", apiAddr); ivsCommonService.postJson(ivsPresetVo.getUUID(), apiAddr, IvsConst.URI_PTZ_CONTROL, paramJson, IvsResult.class); - log.info("URI_PTZ_CONTROL SUCCESS retryCount: {}, apiAddr: {}", apiAddr, retryCount); + log.info("URI_PTZ_CONTROL SUCCESS retryCount: {}, apiAddr: {}", retryCount, apiAddr); } catch (Exception e) { log.info("URI_PTZ_CONTROL GOTO FAIL retryCount: {}, UUID: {}", retryCount, ivsPresetVo.getUUID()); //throw new IOException("URI_PTZ_CONTROL GOTO: FAIL UUID: " + ivsPresetVo.getUUID() + ", retryCount: " + retryCount + ", MSG: " + e); diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java index 3f73929..4e9d5cf 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java +++ b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java @@ -5,15 +5,28 @@ import com.inspect.client.service.SpringApplicationContext; import com.inspect.base.core.utils.HttpClientUtils; import com.inspect.base.core.utils.StringUtils; import com.inspect.base.redis.service.RedisService; +import lombok.extern.slf4j.Slf4j; + import java.util.concurrent.TimeUnit; +@Slf4j public class CallDeviceApi { public static final String DEVICE_API_TOKEN = "device_client_api_token"; public static JSONObject callDevice(String url, String jsonParam) { - String result = HttpClientUtils.postJson(url, jsonParam, (String)null); - JSONObject json = JSONObject.parseObject(result); - return json; + String result = HttpClientUtils.postJson(url, jsonParam, (String) null); + + if(StringUtils.isEmpty(result)) { + log.info("callDevice Exception: {} ", "Call remote server failed"); + JSONObject resultJson = new JSONObject(); + resultJson.put("code", "200"); + resultJson.put("msg", "Call remote server failed"); + return resultJson; + } + + JSONObject json = JSONObject.parseObject(result); + return json; + } public static String getDeviceToken() { From c8d9e3903a306c7139dd9eb943ed4f31dc468d8b Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Wed, 6 Aug 2025 09:53:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=BD=92=E6=A1=A3bug=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=97=A0=E6=95=B0=E6=8D=AE=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolTaskResultMainController.java | 3 +++ .../com/inspect/task/controller/PatrolTaskController.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index 381e635..113efc7 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -735,6 +735,9 @@ public class PatrolTaskResultMainController extends BaseController { inspectionReportDataService.selectInspectionReportDataList(inspectionReportData); if (!inspectionReportDataList.isEmpty()) { inspectionReport.setReportDatalist(inspectionReportDataList); + } else { + logger.info("--exportExcelWordAndZip------report lineId:{},filter:{} no report data!", lineId, inspectionReport.getFilter()); + return; } for (InspectionReportData reportData : inspectionReportDataList) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 78ce4ef..a1d14b8 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -154,8 +154,12 @@ public class PatrolTaskController extends BaseController { taskListEx.add(task); } } - - return getDataTable(taskListEx); + PageDomain pageDomain = TableSupport.buildPageRequest(); + int pageNum = pageDomain.getPageNum(); + int pageSize = pageDomain.getPageSize(); + int toNum = Math.min(taskListEx.size(), pageNum * pageSize); + List pageList = taskListEx.subList((pageNum - 1) * pageSize, toNum); + return getDataTable(0, pageList, taskListEx); } return getDataTable(taskList); }