From 2ac9662268447c665038810aee0e255989b0430c Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 19 Dec 2023 16:20:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pms/pojo/param/MonitorParam.java | 1 - .../service/gwPush/impl/MonitorSendServiceImpl.java | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java index 1f7cfc41e..59a02e3a3 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java @@ -252,7 +252,6 @@ public class MonitorParam { private String objType; @ApiModelProperty(name = "ids",value = "id集合") -// @NotEmpty(message = "id集合不能为空") private List ids; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index 6a9e5376c..cd2fad681 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -548,23 +548,23 @@ public class MonitorSendServiceImpl implements MonitorSendService { public void exportSend(HttpServletResponse response) throws IOException { ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), WindSourceDto.class).build(); - List wind = this.windSend(getMonitors("f3daf821a351da6db44cdc952f90a5cb")); + List wind = this.windSend(getMonitors(dictTreeFeignClient.queryByCode("1401").getData().getId())); WriteSheet writeSheet = EasyExcel.writerSheet(0, "风电场" ).head(WindSourceDto.class).build(); excelWriter.write(wind, writeSheet); - List photovoltaic = this.photovoltaicSend(getMonitors("189b8db113a79738e07946b6ec2bb0da")); + List photovoltaic = this.photovoltaicSend(getMonitors(dictTreeFeignClient.queryByCode("1402").getData().getId())); WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "光伏电站" ).head(PhotovoltaicDto.class).build(); excelWriter.write(photovoltaic, writeSheet2); - List sensitive = this.sensitiveUserSend(getMonitors("f7ec8d78654629ae76203bf74041db18")); + List sensitive = this.sensitiveUserSend(getMonitors(dictTreeFeignClient.queryByCode("2400").getData().getId())); WriteSheet writeSheet3 = EasyExcel.writerSheet(2, "重要或敏感用户" ).head(SensitiveUserDto.class).build(); excelWriter.write(sensitive, writeSheet3); - List traction = this.tractionStationSend(getMonitors("88401081d00e17f1cd926ef5e57fecf9")); + List traction = this.tractionStationSend(getMonitors(dictTreeFeignClient.queryByCode("1300").getData().getId())); WriteSheet writeSheet4 = EasyExcel.writerSheet(3, "牵引站" ).head(TractionStationDTO.class).build(); excelWriter.write(traction, writeSheet4); - List other = this.otherUserSend(getMonitors("c22758666cd968b756db67dbfad9be32")); + List other = this.otherUserSend(getMonitors(dictTreeFeignClient.queryByCode("2300").getData().getId())); WriteSheet writeSheet5 = EasyExcel.writerSheet(4, "干扰用户" ).head(OtherUserDto.class).build(); excelWriter.write(other, writeSheet5); excelWriter.finish();