From eb4eb5ec588462e45f7dea235c578ac4fe346aa7 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 19 四月 2022 10:09:42 +0800
Subject: [PATCH] 菜单排序

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 e9ac80b..9a9b077 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
@@ -6,9 +6,11 @@
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.dto.YSY_MonitorDto;
 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 com.sandu.ximon.dao.mapper.MonitorMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,7 @@
     private final MonitorService monitorService;
 
     private final MonitorMapper monitorMapper;
+    private PermissionConfig permissionConfig;
 
 
     /**
@@ -40,6 +43,9 @@
 //        } else {
 //            list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
 //        }
+        if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
 
         List<String> list;
         list = monitorMapper.listMonitorDeviceSerial();
@@ -90,6 +96,17 @@
     }
 
     /**
+     * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/getYSYInfo/{deviceSerial}")
+    public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
+        return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
+    }
+
+    /**
      * 娣诲姞钀ょ煶浜戞憚鍍忓ご
      *
      * @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�

--
Gitblit v1.9.3