From 87b8db5d397bb38bb49b9c59258deff1a7919e68 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 16:39:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/service/MonitorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index f8f0096f..a8f9dc41 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -210,7 +210,7 @@ public class MonitorService { } String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); resultWrapper.setResultJson(json); - // log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); + log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); return (IPage) source.getRecords().apply(resultWrapper); } From 23be64fe8cddb00ec9dae7cdbbce18b1a4df36b9 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 18:04:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=A4=A7=E6=95=B0=E6=8D=AE=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3=E8=A7=A3=E6=9E=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yg/cz/enmu/MonitorSourceEnum.java | 34 +++++++++++++------ .../com/kms/yg/cz/service/MonitorService.java | 2 +- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java index ba634de4..dc6cdd16 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java @@ -52,10 +52,10 @@ public enum MonitorSourceEnum { MS_DSM_ST("应变监测表", MsDsmSt.class), MS_HDM_WAS("堰闸水情监测表", MsHdmWas.class), ATT_RES_SW("水库溢洪道表", MonitorTypeEnum.DATA, AttResSw.class), - ATT_RES_RSPP("水库溢洪道表", MonitorTypeEnum.DATA, AttResRspp.class), + ATT_RES_RSPP("水库溢洪道表", AttResRspp.class), ATT_DAM_BASE("水库大坝基础信息表", MonitorTypeEnum.DATA, SkAttDamBase.class), DWS_ATT_DAM_RSPP("大坝特征值表", MonitorTypeEnum.DATA, DwsAttDamRspp.class), - DWS_REL_ST_RES("代表站", SkRelStRes.class), + DWS_REL_ST_RES("代表站",MonitorTypeEnum.DATA, SkRelStRes.class), ; private final String zhName; @@ -102,30 +102,42 @@ public enum MonitorSourceEnum { if (this.type == null || Strings.isNullOrEmpty(json)) { return new Page<>(); } - if (this.type == MonitorTypeEnum.MONITOR) { + if (this.type.equals(MonitorTypeEnum.MONITOR)) { MonitorResponse response = JSON.parseObject(json, MonitorResponse.class); if (!response.isSuccess()) { log.error("record获取数据失败:{} [{}]", this.clazz, json); return new Page<>(); } + try { DataInfo dataInfo = JSON.parseObject(response.getData(), DataInfo.class); Page page = new Page<>(dataInfo.getCurrent(), dataInfo.getSize(), dataInfo.getTotal()); - List data = JSON.parseArray(response.getRecords(), this.clazz); - page.setRecords(Arrays.asList(data.toArray())); - return page; + List data = JSON.parseArray(response.getRecords(), this.clazz); + page.setRecords(Arrays.asList(data.toArray())); + return page; + } catch (Exception e) { + log.error("data获取数据失败:{} [{}],type[{}]", this.clazz, response, this.type); + } + return new Page<>(); } else { DataResponse response = JSON.parseObject(json, DataResponse.class); if (!response.isSuccess()) { log.error("data获取数据失败:{} [{}]", this.clazz, json); return new Page<>(); } + try { MonitorQueDto queDto = resultWrapper.getQueDto(); Page page = new Page<>(queDto.getPageNum(), queDto.getPageSize()); - List data = JSON.parseArray(response.getData(), this.clazz); - page.setRecords(Arrays.asList(data.toArray())); - return page; + List data = JSON.parseArray(response.getData(), this.clazz); + page.setRecords(Arrays.asList(data.toArray())); + return page; + } catch (Exception e) { + log.error("data获取数据失败:{} [{}],type:[{}]", this.clazz, response, this.type); + } + return new Page<>(); } - }; + } + + ; } @Data @@ -146,7 +158,7 @@ public enum MonitorSourceEnum { private String data; public Boolean isSuccess() { - return "0".equals(getCode()); + return "200".equals(getCode()) || "0".equals(getCode()); } } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java index 2ec79bb4..34ce45e8 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -211,7 +211,7 @@ public class MonitorService { } String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); resultWrapper.setResultJson(json); - log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); + // log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); return (IPage) source.getRecords().apply(resultWrapper); }