From 2cedb574c22cf2f77418929e79f23ace0a7e7ac6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 29 四月 2024 10:05:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java
index 3263ddd..6733fd4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java
@@ -1,10 +1,15 @@
package com.vci.ubcs.log.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vci.ubcs.log.service.ILogOperateService;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.model.LogOperate;
import org.springblade.core.tenant.annotation.NonDS;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
/**
* 鎿嶄綔鏃ュ織绠＄悊:(鍖呮嫭鐧诲綍鏃ュ織銆佹搷浣滄棩蹇椼�佹巿鏉冩棩蹇楋紝浠ュ強绠＄悊鍛樼殑浠ヤ笂涓夌鏃ュ織)
@@ -18,6 +23,26 @@
@RequestMapping("/operateLog")
public class LogOperateController {
+ private final ILogOperateService operateLogService;
+ /**
+ * 鏌ヨ鏃ュ織鍒楄〃
+ * @param bladeQueryObject
+ * @return
+ */
+ @GetMapping("/listLogOperate")
+ public R<IPage<LogOperate>> listLogOperate(BladeQueryObject bladeQueryObject) {
+ return R.data(operateLogService.listByCondition(bladeQueryObject));
+ }
+
+ /**
+ * 鏍规嵁oid鏌ヨ鏃ュ織璇︽儏
+ * @param oid
+ * @return
+ */
+ @GetMapping("/detailByOid")
+ public R<LogOperate> detailByOid(String oid) {
+ return R.data(operateLogService.detailByOid(oid));
+ }
}
--
Gitblit v1.9.3