From 6888584781c77de6854b62f93a57dcce53240cf9 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 24 二月 2025 15:51:38 +0800
Subject: [PATCH] 清除标准库部分接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index eb0bfd5..4bdb129 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -1,11 +1,15 @@
package com.ruoyi.web.controller.system;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.system.service.UserService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Map;
/**
@@ -21,5 +25,28 @@
@Resource
private UserService userService;
+ /**
+ * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
+ * @param user
+ * @param type
+ * @return
+ */
+ @ApiOperation(value = "鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃")
+ @GetMapping("/selectUserCondition")
+ public Result selectUserCondition(User user, String type){
+ return Result.success(userService.selectUserCondition(user, type));
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+ * @return
+ */
+ @GetMapping("/getUserNow")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�")
+ public Result<?> getUserNow(){
+ return Result.success(userService.getUserNow());
+ }
+
}
--
Gitblit v1.9.3