|
@@ -26,9 +26,33 @@ public class AlarmInfoController {
|
|
|
@PostMapping("alarmNotify")
|
|
|
public MessageResult<String> alarmNotify(String message){
|
|
|
MessageResult<String> msgResult = new MessageResult<>();
|
|
|
-
|
|
|
logger.info(message);
|
|
|
+ try {
|
|
|
+ AlarmInfo alarmInfo = new AlarmInfo();
|
|
|
+ alarmInfo.setId(UUID.randomUUID().toString());
|
|
|
+ alarmInfo.setDelFlag(false);
|
|
|
+ //alarmInfo.setCreateBy(subject);
|
|
|
+ alarmInfo.setIsRead(false);
|
|
|
+ alarmInfo.setMessage(message);
|
|
|
+ alarmInfo.setType("2");
|
|
|
+ alarmInfo.setCreateTime(new Date());
|
|
|
+
|
|
|
+ int affectCount = alarmInfoService.insert(alarmInfo);
|
|
|
+
|
|
|
+ if (affectCount > 0) {
|
|
|
+ msgResult.setResult(true);
|
|
|
+ msgResult.setData("成功");
|
|
|
+ } else {
|
|
|
+ msgResult.setResult(false);
|
|
|
+ msgResult.setMessage("添加失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ catch(Exception ex){
|
|
|
+ logger.error(ex.getMessage(),ex);
|
|
|
|
|
|
+ msgResult.setResult(false);
|
|
|
+ msgResult.setMessage(ex.getMessage());
|
|
|
+ }
|
|
|
return msgResult;
|
|
|
}
|
|
|
|
|
@@ -203,9 +227,8 @@ public class AlarmInfoController {
|
|
|
public MessageResult<Map> pageList(
|
|
|
String id,
|
|
|
@RequestParam(value="type",defaultValue="") String type,
|
|
|
- @RequestParam(value="draw",defaultValue="1") int draw,
|
|
|
- @RequestParam(value="start",defaultValue="1") int start,
|
|
|
- @RequestParam(value="length",defaultValue="20") int length,
|
|
|
+ @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
|
+ @RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
|
@RequestAttribute String subject){
|
|
|
|
|
|
//当前用户ID
|
|
@@ -226,19 +249,38 @@ public class AlarmInfoController {
|
|
|
searchParams.put("type",type);
|
|
|
}
|
|
|
|
|
|
- int pageNum = start / length;
|
|
|
+ Page<AlarmInfo> page = alarmInfoService.pageSearch(searchParams,pageIndex,pageSize,sortList);
|
|
|
|
|
|
- if (start % length != 0) {
|
|
|
- pageNum++;
|
|
|
- }
|
|
|
+ msgResult.setResult(true);
|
|
|
+ msgResult.setData(PojoUtils.pageWrapper(page));
|
|
|
|
|
|
- int pageSize = length;
|
|
|
+ return msgResult;
|
|
|
+ }
|
|
|
|
|
|
- Page<AlarmInfo> page = alarmInfoService.pageSearch(searchParams,pageNum,pageSize,sortList);
|
|
|
+ @ApiOperation(value="查询报警信息")
|
|
|
+ @RequestMapping(value = "queryNotify",method = RequestMethod.POST)
|
|
|
+ public MessageResult<String> queryNotify(
|
|
|
+ String type,
|
|
|
+ @RequestAttribute String subject){
|
|
|
|
|
|
- msgResult.setResult(true);
|
|
|
- msgResult.setData(PojoUtils.pageWrapper(page));
|
|
|
+ //当前用户ID
|
|
|
+ System.out.println(subject);
|
|
|
+
|
|
|
+ MessageResult<String> msgResult = new MessageResult<>();
|
|
|
+
|
|
|
+ AlarmInfo alarmInfo = alarmInfoService.queryLatestAlarm(type);
|
|
|
|
|
|
+ if(alarmInfo == null){
|
|
|
+ msgResult.setResult(false);
|
|
|
+ }else {
|
|
|
+ msgResult.setResult(true);
|
|
|
+ msgResult.setData(alarmInfo.getMessage());
|
|
|
+
|
|
|
+ //修改阅读状态
|
|
|
+ alarmInfo.setIsRead(true);
|
|
|
+ alarmInfoService.update(alarmInfo);
|
|
|
+ }
|
|
|
return msgResult;
|
|
|
}
|
|
|
+
|
|
|
}
|