From 0a86cfc623812431f41bc0255e9e6e7730e60df0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 16:54:39 +0800
Subject: [PATCH] fix

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

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java
index 9df8c8a..8988412 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/DeviceOperationLogController.java
@@ -29,11 +29,21 @@
     private DeviceOperationLogService deviceOperationLogService;
 
     @GetMapping(value = "/getLogList")
-    public ResponseVO<Object> getLogList(BaseConditionVO baseConditionVO, @RequestParam String poleCode, @RequestParam String operation) {
+    public ResponseVO<Object> getLogList(BaseConditionVO baseConditionVO
+            , @RequestParam(value = "poleCode", required = false) String poleCode
+            , @RequestParam(value = "operation", required = false) String operation) {
         if (!permissionConfig.check(MenuEnum.LOG_RECORD.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         List<DeviceOperationLog> logList = deviceOperationLogService.getLogList(baseConditionVO, poleCode, 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(deviceOperationLogService.operationList());
+    }
 }

--
Gitblit v1.9.3