From 5461b8ebf2f8bf66a9d34351eb8783484304958a Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 22 八月 2022 16:17:28 +0800 Subject: [PATCH] 支持全局异常和统一返回结果,未完待续 --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java index 0d02173..d96b622 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import javax.sip.InvalidArgumentException; @@ -93,7 +94,7 @@ recordInfo.setName(getText(rootElementForCharset, "Name")); String sumNumStr = getText(rootElementForCharset, "SumNum"); int sumNum = 0; - if (!StringUtils.isEmpty(sumNumStr)) { + if (!ObjectUtils.isEmpty(sumNumStr)) { sumNum = Integer.parseInt(sumNumStr); } recordInfo.setSumNum(sumNum); @@ -172,16 +173,12 @@ public void releaseRequest(String deviceId, String sn){ String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn; - WVPResult<RecordInfo> wvpResult = new WVPResult<>(); - wvpResult.setCode(0); - wvpResult.setMsg("success"); // 瀵规暟鎹繘琛屾帓搴� Collections.sort(recordDataCatch.getRecordInfo(deviceId, sn).getRecordList()); - wvpResult.setData(recordDataCatch.getRecordInfo(deviceId, sn)); RequestMessage msg = new RequestMessage(); msg.setKey(key); - msg.setData(wvpResult); + msg.setData(recordDataCatch.getRecordInfo(deviceId, sn)); deferredResultHolder.invokeAllResult(msg); recordDataCatch.remove(deviceId, sn); } -- Gitblit v1.8.0