From 7a1c0a8f26b54db6fdf0dcb9a2568aa9811f8f4c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 18 Jun 2024 15:20:10 +0800
Subject: [PATCH] fix:测试提交
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 7db2d85..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);
}
--
Gitblit v1.8.0