From 9bf891d878ae6edabc770609350daa60d8c41d8b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 17:03:38 +0800
Subject: [PATCH] fix：管理员登陆
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
index a2e6b2a..7c477bf 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -113,6 +113,7 @@
/*if(monitorPoint.contains("")){
}*/
+ params.put("monitorPointList", monitorPoint);
String[] monitorPointIds = monitorPoint.split(",");
if (monitorPointIds.length > 3) {
return ResultMessage.ok();
@@ -213,7 +214,7 @@
@RequestParam @ApiParam(value = "reportType",name = "type") int reportType,
@RequestParam @ApiParam(value = "endTime",name = "������������") String endTime*/
List<MonitoringStationDTO> resList = monitorPointService.listMonitoringStationDTO(params,Integer.parseInt(params.get("reportType").toString()),params.get("startTime").toString(),params.get("endTime").toString());
- List<MonitoringStationDTOResult> list = new ArrayList<>();
+ /*List<MonitoringStationDTOResult> list = new ArrayList<>();
for(MonitoringStationDTO m : resList){
MonitoringStationDTOResult result = new MonitoringStationDTOResult();
result.setName(m.getName());
@@ -235,7 +236,7 @@
result.setCO(m.getCO().compareTo(BigDecimal.ZERO)==0?"-":m.getCO().toString());
result.setCONum(m.getCONum()==0?"-":String.valueOf(m.getCONum()));
list.add(result);
- }
- return ResultMessage.ok(list);
+ }*/
+ return ResultMessage.ok(resList);
}
}
--
Gitblit v1.8.0