From 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 21 Oct 2024 09:01:18 +0800
Subject: [PATCH] fix:立行立改责任主体修改提交
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 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..895e4ef 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
@@ -58,7 +58,7 @@
List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);
//������������������
- MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,false);
+ MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,false,false);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
}
@@ -73,7 +73,22 @@
List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);
//������������������
- MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,true);
+ MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,true,false);
+
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
+ }
+
+ @GetMapping("queryMonitorPointsAvg")
+ public ResultMessage queryMonitorPointsAvg(MonitorPointQueryForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������������
+ List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);
+
+ //������������������
+ MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,false,true);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
}
@@ -113,13 +128,36 @@
/*if(monitorPoint.contains("")){
}*/
+ params.put("monitorPointList", monitorPoint);
+ String[] monitorPointIds = monitorPoint.split(",");
+ if (monitorPointIds.length > 7) {
+ return ResultMessage.ok();
+ }
+
+ params.put("monitorPointIds", monitorPointIds);
+ List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
+ return ResultMessage.ok(response);
+ }
+ @GetMapping("getWindDataCenter")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPointIds", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultMessage getWindDataCenter(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("monitorPointIds")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ String monitorPoint = params.remove("monitorPointIds").toString();
+ params.put("monitorPointList", monitorPoint);
String[] monitorPointIds = monitorPoint.split(",");
if (monitorPointIds.length > 3) {
return ResultMessage.ok();
}
params.put("monitorPointIds", monitorPointIds);
- List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
+ List<Object> response = historyFiveMinutelyService.getAreaWindDataCenter(params);
return ResultMessage.ok(response);
}
@@ -213,7 +251,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 +273,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