From 71609e40ba719ff40c27bb00d7f5f4af521a80e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 08:52:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
index a64949a..215218d 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
@@ -4,9 +4,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pmsGlobal.aop.LogSv;
-import com.dy.pmsGlobal.aop.OperationDescription;
-import com.dy.pmsGlobal.aop.QueryVo;
+import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoBa.BaLog;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +18,7 @@
@RequestMapping(path = "log")
@SuppressWarnings("unchecked")
public class LogCtrl {
+
private LogSv sv;
@Autowired
public void setSv(LogSv sv) {
@@ -32,7 +31,7 @@
*/
@GetMapping(path = "one")
@SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @OperationDescription("鏌ヨ鍗曟潯鏃ュ織")
+ @Log("鏌ヨ鍗曟潯鏃ュ織")
public BaseResponse<BaLog> one(String id){
try {
return BaseResponseUtils.buildSuccess(sv.selectById(Long.parseLong(id)));
@@ -43,18 +42,18 @@
}
/**
- * 鍒嗛〉鏌ヨ鏃ュ織
+ * 鏌ヨ鏃ュ織
* @return
*/
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @OperationDescription("鍒嗛〉鏌ヨ鏃ュ織")
+ @Log("鏌ヨ鏃ュ織")
public BaseResponse<QueryResultVo<List<BaLog>>> some(@RequestBody QueryVo vo){
try {
QueryResultVo<List<BaLog>> res = sv.selectSome(vo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鍒嗛〉鏌ヨ鏃ュ織寮傚父", e);
+ log.error("鏌ヨ鏃ュ織寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
--
Gitblit v1.8.0