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:
cdf
2024-11-07 23:21:45 +08:00
parent c85df36f32
commit 739b697137
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,7 @@ 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();//获取响应的文本串
System.out.println("获取响应的文本串："+responseStr);
if (responseStr.indexOf("\\\"") != -1) { if (responseStr.indexOf("\\\"") != -1) {
responseStr = responseStr.replace("\\\"", "\""); responseStr = responseStr.replace("\\\"", "\"");
} }

2
pqs-gateway/src/main/resources/bootstrap.yml
View File

@@ -229,6 +229,8 @@ whitelist:
- /system-boot/file/** - /system-boot/file/**
- /system-boot/area/** - /system-boot/area/**
- /bpm-boot/** - /bpm-boot/**
- /harmonic-boot/comAccess/getComAccessData
#- /harmonic-boot/harmonic/getHistoryResult
#开始 #开始
# - /advance-boot/** # - /advance-boot/**
# - /device-boot/** # - /device-boot/**

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java
View File

@@ -95,18 +95,19 @@ public class RUploadCommPointBusServiceImpl extends ServiceImpl<RUploadCommPoint
if(StrUtil.isNotBlank(param.getDataType())){ if(StrUtil.isNotBlank(param.getDataType())){
sendParam.setStatisticalType(param.getDataType()); sendParam.setStatisticalType(param.getDataType());
sendParam.setStatisticalDate(temDate);
} }
sendParam.setStatisticalDate(temDate);
sendParam.setStats(list.get(i)); sendParam.setStats(list.get(i));
Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT); Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT);
List<String> ids = list.get(i).stream().map(RUploadCommPointBus::getObjId).collect(Collectors.toList()); List<String> ids = list.get(i).stream().map(RUploadCommPointBus::getObjId).collect(Collectors.toList());
int count = GwSendUtil.returnInfoMsg(ids,sendRes); int count = GwSendUtil.returnInfoMsg(ids,sendRes);
System.out.println("上送成功,上送成功返回"+count+"条,上传数据"+list.get(i).size()+"条"); System.out.println("上送成功,上送成功返回"+count+"条,上传数据"+list.get(i).size()+"条");
if(count == list.get(i).size()){
LambdaUpdateWrapper<RUploadCommPointBus> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<RUploadCommPointBus> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(RUploadCommPointBus::getUploadStatus,1).in(RUploadCommPointBus::getObjId,ids); lambdaUpdateWrapper.set(RUploadCommPointBus::getUploadStatus,1).in(RUploadCommPointBus::getObjId,ids);
this.update(lambdaUpdateWrapper); this.update(lambdaUpdateWrapper);
}
} }
return true; return true;
} }

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java
View File

@@ -143,19 +143,19 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl<RUploadMainMonito
if(StrUtil.isNotBlank(param.getDataType())){ if(StrUtil.isNotBlank(param.getDataType())){
sendParam.setStatisticalType(param.getDataType()); sendParam.setStatisticalType(param.getDataType());
sendParam.setStatisticalDate(temDate);
} }
sendParam.setStatisticalDate(temDate);
sendParam.setStats(list.get(i)); sendParam.setStats(list.get(i));
Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.MAIN_MONITOR); Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.MAIN_MONITOR);
List<String> ids = list.get(i).stream().map(RUploadMainMonitorDataDTO::getObjId).collect(Collectors.toList()); List<String> ids = list.get(i).stream().map(RUploadMainMonitorDataDTO::getObjId).collect(Collectors.toList());
int count = GwSendUtil.returnInfoMsg(ids,sendRes); int count = GwSendUtil.returnInfoMsg(ids,sendRes);
System.out.println("上送成功,上送成功返回"+count+"条"); System.out.println("上送成功,上送成功返回"+count+"条");
if(count == list.get(i).size()){ // if(count == list.get(i).size()){
LambdaUpdateWrapper<RUploadMainMonitorData> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<RUploadMainMonitorData> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(RUploadMainMonitorData::getUploadStatus,1).in(RUploadMainMonitorData::getObjId,ids); lambdaUpdateWrapper.set(RUploadMainMonitorData::getUploadStatus,1).in(RUploadMainMonitorData::getObjId,ids);
this.update(lambdaUpdateWrapper); this.update(lambdaUpdateWrapper);
} // }
} }
return true; return true;
} }