From 0bd25daf605ae55e1cef4e5ba37bf37d1682e60f Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 5 Jan 2024 11:03:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=B8=8A=E9=80=81=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/web/utils/GwSendUtil.java | 7 +++++++ .../controller/majornetwork/EventDetailController.java | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java index 67d034a0e..20c4c9187 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java @@ -61,6 +61,13 @@ public class GwSendUtil { try { HttpReturn ret = HttpCaller.invokeReturn(builder.build()); String responseStr = ret.getResponseStr();//获取响应的文本串 + if (responseStr.indexOf("\\\"") != -1) { + responseStr = responseStr.replace("\\\"", "\""); + } + Map mapData = JSON.parseObject(responseStr, Map.class); + if(mapData.containsKey("error_msg")){ + throw new BusinessException("国网上送接口超时，请重新上送"); + } map.put("succeed", responseStr); } catch (HttpCallerException e) { // error process diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventDetailController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventDetailController.java index 324fbc548..551f7ad51 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventDetailController.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventDetailController.java @@ -188,8 +188,8 @@ public class EventDetailController extends BaseController { String methodDescribe = getMethodDescribe("getAppEventDetailLtAmplitude"); List list = eventDetailService.list(new LambdaQueryWrapper() .in(CollUtil.isNotEmpty(param.getIds()), RmpEventDetailPO::getLineId, param.getIds()) - .ge(StrUtil.isNotBlank(param.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime()))) - .le(StrUtil.isNotBlank(param.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))) + .ge(StrUtil.isNotBlank(param.getStartTime()), RmpEventDetailPO::getStartTime, param.getStartTime()) + .le(StrUtil.isNotBlank(param.getEndTime()), RmpEventDetailPO::getStartTime, param.getEndTime()) .lt(RmpEventDetailPO::getFeatureAmplitude,0.9) ); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);