From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 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 9ad9d25..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
@@ -53,8 +53,58 @@
if (ObjectUtils.isEmpty(organization)){
return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
}
- List<Map<String, Object>> resultList = alarmInfoService.getDataByCondition(parameters);
- return ResultMessage.ok(resultList);
+ Map<String, Object> resultMap = alarmInfoService.getDataByCondition(parameters);
+ return ResultMessage.ok(resultMap);
+ }
+
+ @RequestMapping(value = "alarmReminder", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage alarmReminder(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Object orgid = parameters.get("organization_id");
+ Object size = parameters.get("size");
+ if (ObjectUtils.isEmpty(orgid) || ObjectUtils.isEmpty(size)){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
+ if (ObjectUtils.isEmpty(organization)){
+ return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+ }
+ Map<String, Object> resultMap = alarmInfoService.alarmReminder(parameters);
+ 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){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Object orgid = parameters.get("organization_id");
+ Object startTime = parameters.get("startTime");
+ Object endTime = parameters.get("endTime");
+ Object index = parameters.get("index");
+ Object alarmType = parameters.get("alarmType");
+ if (ObjectUtils.isEmpty(orgid) || ObjectUtils.isEmpty(startTime) || ObjectUtils.isEmpty(endTime) || ObjectUtils.isEmpty(index) || ObjectUtils.isEmpty(alarmType)){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
+ if (ObjectUtils.isEmpty(organization)){
+ return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+ }
+ Map<String, Object> resultMap = alarmInfoService.getDataByConditionWithoutPage(parameters);
+ return ResultMessage.ok(resultMap);
}
}
--
Gitblit v1.8.0