From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index fba1c84..2d672a3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -9,13 +9,10 @@
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.MonitorService;
-import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* 鎽勫儚澶�
@@ -35,7 +32,10 @@
* @return
*/
@PostMapping("/listMonitor")
- public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
+ public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestBody(required = false) MonitorParam monitorParam) {
if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -43,9 +43,9 @@
//杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
CommonPage commonPage;
if (monitorParam == null) {
- commonPage = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO,order,seq, new MonitorParam());
} else {
- commonPage = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO,order,seq, monitorParam);
}
return ResponseUtil.success(commonPage);
@@ -60,6 +60,9 @@
*/
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteMonitor(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = monitorService.deleteMonitor(id);
if (result) {
return ResponseUtil.success(null);
@@ -86,6 +89,9 @@
*/
@PostMapping("/addYSYMonitor")
public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
throw new BusinessException("鍙傛暟涓嶆纭紒");
}
@@ -104,6 +110,9 @@
*/
@PostMapping("/getYSYMonitorInfo")
public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_INFO.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(getMonitorDto.getCode())) {
@@ -129,6 +138,9 @@
*/
@PostMapping("/getMonitorVideoUrl")
public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_VIDEO_URL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String URL = monitorService.getMonitorVideoUrl(monitorService.getAccessToken(),
monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
@@ -144,6 +156,9 @@
*/
@PostMapping("/updateNotes")
public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
if (flag) {
return ResponseUtil.success("淇敼澶囨敞鎴愬姛锛�");
--
Gitblit v1.9.3