From 7d76b9e89baa29a1ae2e5e406d6d11dcca15325a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 12:25:11 +0800
Subject: [PATCH] fix:实测补偿修复
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 93383e4..190bc4e 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
@@ -62,7 +62,22 @@
List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);
//������������������
- MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints);
+ MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,false);
+
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
+ }
+
+ @GetMapping("queryMonitorPointsState")
+ public ResultMessage queryMonitorPointsState(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,true);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
}
@@ -153,14 +168,17 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- public void exlOut(HttpServletResponse response) {
+ public void exlOut(HttpServletResponse response,@RequestBody Map<String, Object> params) {
//������������������
// List<ExcelHeader> excelHeaders = Arrays.asList(new ExcelHeader("phone", "���������"), new ExcelHeader("sexStr", "������"));
- Map<String, Object> params = new HashMap<>();
+ /* Map<String, Object> params = new HashMap<>();
params.put("macs", Arrays.asList("p5dnd7a0245446", "p5dnd7a0745450"));
params.put("sensors", "a34004,a34002");
params.put("type", "hours");
- params.put("times", Arrays.asList("2023-07-01 00", "2023-07-02 00"));
+ params.put("times", Arrays.asList("2023-07-01 00", "2023-07-02 00"));*/
+ if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("times") || !params.containsKey("type")) {
+ return;
+ }
//������������
List<Map<String, Object>> resList = monitorPointService.getHourlyDataDataV3Excel(params);
if (CollectionUtils.isEmpty(resList)) {
--
Gitblit v1.8.0