From d108d61f6735e93a2a7377832b6eb056ca8f0d4e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 13 六月 2023 16:10:20 +0800
Subject: [PATCH] 增加管线泄漏报警查询接口 增加管线泄漏报警查看接口
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
index 09c3417..3675937 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -1,9 +1,12 @@
package com.ruoyi.alarm.globalAlarm.controller;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
+import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.domain.AjaxResult;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -19,7 +22,7 @@
* @Version: 1.0
**/
@RestController
-@RequestMapping("/ardAlarmLog")
+@RequestMapping("/ardAlarm")
@Api(tags = "鎶ヨ鏁版嵁姹囨�绘帴鍙�")
@Anonymous
public class GlobalAlarmController {
@@ -27,10 +30,16 @@
@Resource
IGlobalAlarmService globalAlarmService;
- @PostMapping("/selectAlarmLog")
+ @PostMapping("/List")
@ApiOperation(value = "鎶ヨ鏌ヨ鎺ュ彛",notes = "杩欓噷鍖呭惈浜嗘墍鏈夋姤璀︾被鍨嬬殑鏁版嵁")
- public List<Object> selectAlarmLog(@RequestBody GlobalAlarmCondition condition) {
- List<Object> result = globalAlarmService.selectAlarmLogs(condition);
- return result;
+ public AjaxResult selectAlarmLog(@RequestBody GlobalAlarmCondition condition) {
+ List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
+ return AjaxResult.success(result);
+ }
+ @PostMapping("/view")
+ @ApiOperation(value = "鏌ョ湅鎶ヨ鎺ュ彛",notes = "鎸囧畾鏌ョ湅鏌愪釜鎶ヨ鏁版嵁")
+ public AjaxResult viewAlarmLog(@RequestBody GlobalAlarmCondition condition) {
+ Object result = globalAlarmService.updateAlarmViewTime(condition);
+ return AjaxResult.success(result);
}
}
--
Gitblit v1.9.3