From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增，修改是工艺字段可以为多个，修改mapper,sql
---
screen-api/src/main/java/com/moral/api/controller/AlarmInfoController.java | 21 +++++++++++++++++++--
1 files changed, 19 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..2813e87 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,25 @@
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);
}
}
--
Gitblit v1.8.0