From 4c855671b05efba9199c456adbd7c846db608230 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 16 六月 2023 15:29:37 +0800
Subject: [PATCH] 优化三维实景业务
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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..de2a82f 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,15 +1,17 @@
package com.ruoyi.alarm.globalAlarm.controller;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
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.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* @ClassName: globalAlarmController
@@ -19,7 +21,7 @@
* @Version: 1.0
**/
@RestController
-@RequestMapping("/ardAlarmLog")
+@RequestMapping("/ardAlarm")
@Api(tags = "鎶ヨ鏁版嵁姹囨�绘帴鍙�")
@Anonymous
public class GlobalAlarmController {
@@ -27,10 +29,24 @@
@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;
+ @ApiOperationSupport(includeParameters = {"condition.command"})
+ public AjaxResult selectAlarmLog(@RequestBody GlobalAlarmCondition condition) {
+ List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
+ return AjaxResult.success(result);
+ }
+ @PostMapping("/view")
+ @ApiOperation(value = "鏌ョ湅鎶ヨ鎺ュ彛",notes = "鎸囧畾鏌ョ湅鏌愪釜鎶ヨ鏁版嵁")
+ @ApiOperationSupport(includeParameters = {"condition.command","condition.id"})
+ public AjaxResult viewAlarmLog(@RequestBody GlobalAlarmCondition condition) {
+ Object result = globalAlarmService.updateAlarmViewTime(condition);
+ return AjaxResult.success(result);
+ }
+ @GetMapping("/count")
+ @ApiOperation(value = "鏌ョ湅鎶ヨ鐐规暟閲�",notes = "鏌ヨ鍒锋柊鏃堕棿鍐呮姤璀︾殑鐐逛綅鏁伴噺")
+ public AjaxResult countAlarmLog() {
+ Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
+ return AjaxResult.success(stringIntegerMap);
}
}
--
Gitblit v1.9.3