From 5c9f8f71b676dda74c740b60e5af4b58c5026776 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 16 Aug 2023 09:25:48 +0800
Subject: [PATCH] fix:补充提交
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 96b0729..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);
}
--
Gitblit v1.8.0