From d9326c6f02ff4dae1a301f6ad9dd5539450aa1ba Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 06 三月 2025 09:00:16 +0800
Subject: [PATCH] 用户管理&权限管理调整
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 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..67cc35f 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,19 @@
package com.ruoyi.web.controller.system;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.Company;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.core.dto.PersonDto;
import com.ruoyi.system.service.UserService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.web.controller.dto.UpdateUserDto;
+import com.ruoyi.web.controller.system.api.HeaderToken;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
@@ -21,5 +29,72 @@
@Resource
private UserService userService;
+ @Autowired
+ private HeaderToken headerToken;
+
+ /**
+ * 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());
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ @GetMapping("/selectUserDepartmentLimsName")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
+ public Result<?> selectUserDepartmentLimsName(){
+ return Result.success(userService.selectUserDepartmentLimsName());
+ }
+
+ @PostMapping("/upUserDepardLimsId")
+ @ApiOperation(value = "淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> upUserDepardLimsId(@RequestBody UpdateUserDto dto){
+ return Result.success(userService.upUserDepardLimsId(dto.getIds(), dto.getId()));
+ }
+
+ @DeleteMapping("/delUserDepardLimsId")
+ @ApiOperation(value = "鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> delUserDepardLimsId(Integer id){
+ return Result.success(userService.delUserDepardLimsId(id));
+ }
+
+
+ @ApiOperation(value = "鏌ョ湅浜轰簨绯荤粺缁勭粐鏋舵瀯")
+ @GetMapping(value = "/selectCompaniesList")
+ public Result<List<Company>> selectCompaniesList() {
+ return Result.success(headerToken.companyUrl());
+ }
+
+ @ApiOperation("鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳")
+ @GetMapping(value = "/selectSimpleList")
+ public Result<?> selectSimpleList(String companyId) {
+ return Result.success(headerToken.userUrl(companyId));
+ }
+
+ @ApiOperation("灏嗕汉浜嬬郴缁熷嬀閫夌殑鍐呭杞Щ鍒版湰绯荤粺")
+ @PostMapping(value = "/addPersonUser")
+ public Result<?> addPersonUser(@RequestBody PersonDto personDto) {
+ return Result.success(userService.addPersonUser(personDto));
+ }
+
}
--
Gitblit v1.9.3