From 0957c5458a9ade15c7a59ebc3dd8260bdbd6b26e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 14 十月 2022 10:35:28 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InnerFrameDataController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InnerFrameDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InnerFrameDataController.java
index 9e7f3bb..f3b4413 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InnerFrameDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InnerFrameDataController.java
@@ -29,11 +29,21 @@
     private InnerFrameDataService innerFrameDataService;
 
     @GetMapping(value = "/getLogList")
-    public ResponseVO<Object> getLogList(BaseConditionVO baseConditionVO, @RequestParam String deviceCode, @RequestParam String operation) {
+    public ResponseVO<Object> getLogList(BaseConditionVO baseConditionVO
+            , @RequestParam(value = "deviceCode", required = false) String deviceCode
+            , @RequestParam(value = "operation", required = false) String operation) {
         if (!permissionConfig.check(MenuEnum.LOG_RECORD.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         List<InnerFrameData> logList = innerFrameDataService.getLogList(baseConditionVO, deviceCode, operation);
         return ResponseUtil.success(logList);
     }
+
+    @GetMapping(value = "/operationList")
+    public ResponseVO<Object> operationList() {
+        if (!permissionConfig.check(MenuEnum.LOG_RECORD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(innerFrameDataService.operationList());
+    }
 }

--
Gitblit v1.9.3