From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java b/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java
index 4e06784..acfa362 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java
@@ -74,6 +74,19 @@
return ResultMessage.ok(resultMap);
}
+ @RequestMapping(value = "alarmReminder2", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage alarmReminder2(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Object monitorPointIds = parameters.get("monitorPointIds");
+ Object size = parameters.get("size");
+ if (ObjectUtils.isEmpty(monitorPointIds) || ObjectUtils.isEmpty(size)){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> resultMap = alarmInfoService.alarmReminderByMonitorPointIds(parameters);
+ return ResultMessage.ok(resultMap);
+ }
+
@RequestMapping(value = "getDataByConditionWithoutPage", method = RequestMethod.GET)
@ResponseBody
public ResultMessage getDataByConditionWithoutPage(HttpServletRequest request){
--
Gitblit v1.8.0