Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.优化上送提醒

Browse Source
This commit is contained in:
wr
2024-01-05 11:03:35 +08:00
parent 16e4520ce1
commit 0bd25daf60
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java
View File

@@ -61,6 +61,13 @@ public class GwSendUtil {
try { try {
HttpReturn ret = HttpCaller.invokeReturn(builder.build()); HttpReturn ret = HttpCaller.invokeReturn(builder.build());
String responseStr = ret.getResponseStr();//获取响应的文本串 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); map.put("succeed", responseStr);
} catch (HttpCallerException e) { } catch (HttpCallerException e) {
// error process // error process

4
pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventDetailController.java
View File

@@ -188,8 +188,8 @@ public class EventDetailController extends BaseController {
String methodDescribe = getMethodDescribe("getAppEventDetailLtAmplitude"); String methodDescribe = getMethodDescribe("getAppEventDetailLtAmplitude");
List<RmpEventDetailPO> list = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>() List<RmpEventDetailPO> list = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(CollUtil.isNotEmpty(param.getIds()), RmpEventDetailPO::getLineId, param.getIds()) .in(CollUtil.isNotEmpty(param.getIds()), RmpEventDetailPO::getLineId, param.getIds())
.ge(StrUtil.isNotBlank(param.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime()))) .ge(StrUtil.isNotBlank(param.getStartTime()), RmpEventDetailPO::getStartTime, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))) .le(StrUtil.isNotBlank(param.getEndTime()), RmpEventDetailPO::getStartTime, param.getEndTime())
.lt(RmpEventDetailPO::getFeatureAmplitude,0.9) .lt(RmpEventDetailPO::getFeatureAmplitude,0.9)
); );
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);