From 0a9c219e823c15080f2cadba0e1be0448cb8304f Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Tue, 23 Dec 2025 09:11:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9E=AA=E6=9C=BA=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E8=AE=BE=E7=BD=AE=E9=A2=84=E7=BD=AE=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E4=BA=91=E5=8F=B0=E6=8E=A7=E5=88=B6=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8F=8B=E5=A5=BD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/base/core/domain/Response.java | 9 +++++++++ .../ivs/controller/IvsControlController.java | 8 +++++++- .../inspect/ivs/service/IvsCommonService.java | 2 +- .../com/inspect/ivs/view/IvsPresetView.java | 16 ++++++++++++++++ .../task/controller/PatrolTaskController.java | 2 +- .../controller/PatrolPresetPosController.java | 19 +++++++++++++------ .../controller/PatrolVideotapeController.java | 11 +++++++++-- 7 files changed, 56 insertions(+), 11 deletions(-) diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/domain/Response.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/domain/Response.java index 418dad7..b62ae74 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/domain/Response.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/domain/Response.java @@ -80,4 +80,13 @@ public class Response implements Serializable { SUCCESS = Constants.SUCCESS; FAIL = Constants.FAIL; } + + @Override + public String toString() { + return "Response{" + + "code=" + code + + ", msg='" + msg + '\'' + + ", data=" + data + + '}'; + } } diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java index 9357603..86c9cf3 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java @@ -52,7 +52,10 @@ public class IvsControlController { jsonObject.put("controlCode", Integer.parseInt(ivsPtzVo.getControlCode())); jsonObject.put("controlPara1", ivsPtzVo.getControlPara1()); jsonObject.put("controlPara2", ivsPtzVo.getControlPara2()); - ivsCommonService.postJson(ivsResourceRetryableDelegate.getLabel(), jsonObject, IvsConst.URI_PTZ_CONTROL); + IvsResult ivsResult = ivsCommonService.postJson(ivsResourceRetryableDelegate.getLabel(), jsonObject, IvsConst.URI_PTZ_CONTROL); + if (!IvsConst.HTTP_STATUS_OK.equals(ivsResult.getResultCode())) { + return Response.fail("摄像机不支持该操作"); + } log.debug("[IVS] PTZ END"); return Response.ok(); } @@ -67,6 +70,9 @@ public class IvsControlController { paramJsonPreAdd.put("presetName", ivsPresetVo.getName()); IvsPresetView ivsPresetView = ivsCommonService.postJson(ivsResourceRetryableDelegate.getLabel(), paramJsonPreAdd, IvsConst.URI_PRESET_SET, IvsPresetView.class); log.debug("[IVS] PRESET SET RES: {}", ivsPresetView); + if (!IvsConst.HTTP_STATUS_OK.equals(ivsPresetView.getResultCode())) { + return Response.fail("摄像机不支持该操作"); + } return Response.ok(ivsPresetView); } else if (command.equals("update")) { JSONObject paramJsonPreUpdate = new JSONObject(); diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java index af1be70..35c75ff 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java @@ -154,7 +154,7 @@ public class IvsCommonService { } if (!IvsConst.HTTP_STATUS_OK.equals(resultCode)) { - throw new ServiceException(String.format("IVS SERVER FAIL: %s!", ErrorCode.map.get(resultCode).toString())); + log.error("IVS SERVER FAIL resultCode: {}", resultCode); } return result.toJavaObject(clazz); diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/view/IvsPresetView.java b/inspect-ivs/src/main/java/com/inspect/ivs/view/IvsPresetView.java index 83b6098..6bae87e 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/view/IvsPresetView.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/view/IvsPresetView.java @@ -5,6 +5,8 @@ import java.io.Serializable; public class IvsPresetView implements Serializable { private Integer presetIndex; + private String resultCode; + public Integer getPresetIndex() { return this.presetIndex; } @@ -12,4 +14,18 @@ public class IvsPresetView implements Serializable { public void setPresetIndex(Integer presetIndex) { this.presetIndex = presetIndex; } + + public String getResultCode() { + return this.resultCode; + } + + public void setResultCode(final String resultCode) { + this.resultCode = resultCode; + } + + @Override + public String toString() { + return "IvsPresetView [presetIndex=" + presetIndex + ", resultCode=" + resultCode + "]"; + } + } 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 4510c22..ad8fe87 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 @@ -677,7 +677,7 @@ public class PatrolTaskController extends BaseController { PatrolTask patrolTask = eqList.get(0); String key = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, String.valueOf(patrolTask.getTaskId())); if (key != null && key.contains(String.valueOf(patrolTask.getTaskId()))) { - return AjaxResult.error("Task is executing, modify forbidden!"); + return AjaxResult.error("任务正在执行，禁止修改！"); } if (!eqList.isEmpty()) { 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 5b3c7ba..1b4029c 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.inspect.access.base.model.RuleCollectionModel; import com.inspect.access.base.model.RuleModel; +import com.inspect.base.core.constant.Constants; import com.inspect.base.core.domain.Response; import com.inspect.base.core.exception.ServiceException; import com.inspect.base.core.sftp.SftpClient; @@ -51,10 +52,7 @@ import com.inspect.system.base.domain.SysDictData; import java.net.URLEncoder; import java.sql.SQLIntegrityConstraintViolationException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -235,7 +233,12 @@ public class PatrolPresetPosController extends BaseController { @GetMapping({"issue"}) public AjaxResult issue(PresetAccessModel presetAccessModel) throws Exception { presetAccessModel.setCommand(PresetControlEnum.SET); - String presetIndex = this.controlPresetAdd(presetAccessModel); + String presetIndex = null; + try { + presetIndex = this.controlPresetAdd(presetAccessModel); + } catch (ServiceException e) { + return AjaxResult.error(e.getMessage()); + } if (null != presetIndex) { presetAccessModel.setPreset(presetIndex); presetAccessModel.setPresetCode(presetIndex); @@ -303,7 +306,7 @@ public class PatrolPresetPosController extends BaseController { HttpClientUtils.get(this.deviceUrl + AccessApiConstant.PRESET_POINT_CONTROL, params); } - private String controlPresetAdd(PresetAccessModel presetAccessModel) throws Exception { + private String controlPresetAdd(PresetAccessModel presetAccessModel) throws ServiceException { String presetIndex = null; JSONObject jsonObject = new JSONObject(); jsonObject.put("code", presetAccessModel.getCode()); @@ -313,6 +316,10 @@ public class PatrolPresetPosController extends BaseController { jsonObject.put("channelCode", presetAccessModel.getChannelCode()); Response presetIndexRet = this.ivsFeignService.preset(jsonObject); JSONObject ivsPresetInfo = (JSONObject) JSONObject.toJSON(presetIndexRet); + logger.info("ivsPresetInfo:{}", ivsPresetInfo.toString()); + if (!Objects.equals(ivsPresetInfo.getInteger("code"), Constants.SUCCESS)) { + throw new ServiceException(ivsPresetInfo.getString("msg")); + } JSONObject resultJson = (JSONObject) ivsPresetInfo.get("data"); if (null != resultJson) { presetIndex = resultJson.getInteger("presetIndex") == null ? null : String.valueOf(resultJson.getInteger("presetIndex")); diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolVideotapeController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolVideotapeController.java index cf5fc66..2e6e1fd 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolVideotapeController.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolVideotapeController.java @@ -1,6 +1,7 @@ package com.inspect.patrol.controller; import com.alibaba.fastjson.JSONObject; +import com.inspect.base.core.constant.Constants; import com.inspect.base.core.sftp.SftpClient; import com.inspect.base.core.utils.HttpClientUtils; import com.inspect.base.core.web.controller.BaseController; @@ -21,6 +22,7 @@ import com.inspect.patrol.service.impl.DeviceIntoService; import com.inspect.patrol.service.impl.Video2NvrComponent; import java.util.Date; +import java.util.Objects; import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -99,8 +101,13 @@ public class PatrolVideotapeController extends BaseController { return AjaxResult.error("控制失败，正在执行任务，您的权限不足！"); } else { String params = JsonUtil.json2Str(JSONObject.parseObject(JSONObject.toJSONString(ptzModel))); - HttpClientUtils.get(this.deviceUrl + AccessApiConstant.PTZ_CONTROL, params); - return AjaxResult.success(); + String result = HttpClientUtils.get(this.deviceUrl + AccessApiConstant.PTZ_CONTROL, params); + JSONObject jsonObject = JSONObject.parseObject(result); + if (Objects.equals(jsonObject.getInteger("code"), Constants.SUCCESS)) { + return AjaxResult.success(); + } else { + return AjaxResult.error(jsonObject.getString("msg")); + } } }