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 b920b1c7c..70924d216 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 @@ -148,6 +148,7 @@ public class GwSendUtil { try { HttpReturn ret = HttpCaller.invokeReturn(builder.build()); String responseStr = ret.getResponseStr();//获取响应的文本串 + System.out.println("获取响应的文本串:"+responseStr); if (responseStr.indexOf("\\\"") != -1) { responseStr = responseStr.replace("\\\"", "\""); } diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml index 12d575fbd..4467a1634 100644 --- a/pqs-gateway/src/main/resources/bootstrap.yml +++ b/pqs-gateway/src/main/resources/bootstrap.yml @@ -229,6 +229,8 @@ whitelist: - /system-boot/file/** - /system-boot/area/** - /bpm-boot/** + - /harmonic-boot/comAccess/getComAccessData + #- /harmonic-boot/harmonic/getHistoryResult #开始 # - /advance-boot/** # - /device-boot/** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java index 3b54ff40a..3e9803b01 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java @@ -95,18 +95,19 @@ public class RUploadCommPointBusServiceImpl extends ServiceImpl sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT); List ids = list.get(i).stream().map(RUploadCommPointBus::getObjId).collect(Collectors.toList()); int count = GwSendUtil.returnInfoMsg(ids,sendRes); System.out.println("上送成功,上送成功返回"+count+"条,上传数据"+list.get(i).size()+"条"); - if(count == list.get(i).size()){ + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.set(RUploadCommPointBus::getUploadStatus,1).in(RUploadCommPointBus::getObjId,ids); this.update(lambdaUpdateWrapper); - } + } return true; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java index 7928bb523..3ff2549ac 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java @@ -143,19 +143,19 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.MAIN_MONITOR); List ids = list.get(i).stream().map(RUploadMainMonitorDataDTO::getObjId).collect(Collectors.toList()); int count = GwSendUtil.returnInfoMsg(ids,sendRes); System.out.println("上送成功,上送成功返回"+count+"条"); - if(count == list.get(i).size()){ + // if(count == list.get(i).size()){ LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.set(RUploadMainMonitorData::getUploadStatus,1).in(RUploadMainMonitorData::getObjId,ids); this.update(lambdaUpdateWrapper); - } + // } } return true; }