From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysUserController.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysUserController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysUserController.java
index 0696fdb..8d1ed1e 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysUserController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysUserController.java
@@ -3,20 +3,28 @@
import com.sinata.common.annotation.Log;
import com.sinata.common.core.controller.BaseController;
import com.sinata.common.core.domain.AjaxResult;
+import com.sinata.common.core.domain.R;
import com.sinata.common.core.domain.entity.SysDept;
import com.sinata.common.core.domain.entity.SysRole;
import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.core.page.TableDataInfo;
+import com.sinata.common.entity.PageDTO;
import com.sinata.common.enums.BusinessType;
import com.sinata.common.utils.SecurityUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.common.utils.poi.ExcelUtil;
+import com.sinata.system.domain.dto.SysUserDTO;
+import com.sinata.system.domain.dto.SysUserStatusDTO;
+import com.sinata.system.domain.query.SysUserQuery;
+import com.sinata.system.domain.vo.SysUserVO;
import com.sinata.system.service.ISysDeptService;
import com.sinata.system.service.ISysPostService;
import com.sinata.system.service.ISysRoleService;
import com.sinata.system.service.ISysUserService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -27,10 +35,13 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,7 +50,8 @@
*
* @author ruoyi
*/
-@Api(tags = {"管理后台-用户管理"})
+@Api(tags = {"用户管理"})
+@Validated
@RestController
@RequestMapping("/backend/system/user")
public class SysUserController extends BaseController
@@ -56,6 +68,82 @@
@Autowired
private ISysPostService postService;
+ /**
+ * 用户分页列表
+ *
+ * @param query
+ * @return
+ */
+ @ApiOperation("用户分页列表")
+ @PostMapping("/page")
+ public R<PageDTO<SysUserVO>> pageList(@RequestBody SysUserQuery query) {
+ return R.ok(userService.pageList(query));
+ }
+
+ /**
+ * 新增用户
+ *
+ * @param dto
+ * @return
+ */
+ @ApiOperation("新增用户")
+ @PostMapping("/add")
+ public R<?> add(@Valid @RequestBody SysUserDTO dto) {
+ userService.add(dto);
+ return R.ok();
+ }
+
+ /**
+ * 编辑用户
+ *
+ * @param dto
+ * @return
+ */
+ @ApiOperation("编辑用户")
+ @PostMapping("/edit")
+ public R<?> edit(@Valid @RequestBody SysUserDTO dto) {
+ userService.edit(dto);
+ return R.ok();
+ }
+
+ /**
+ * 查询用户详情
+ *
+ * @param userId
+ * @return
+ */
+ @ApiOperation("用户详情")
+ @GetMapping("/detail/{userId}")
+ public R<SysUserVO> getDetailInfo(@ApiParam(name = "userId", value = "用户id", required = true) @PathVariable("userId") Long userId) {
+ return R.ok(userService.getDetailInfo(userId));
+ }
+
+ /**
+ * 批量修改账号状态
+ * @param dto
+ * @return
+ */
+ @ApiOperation("批量修改账号状态")
+ @PostMapping("/updStatusBatch")
+ public R<?> updStatusBatch(@Valid @RequestBody SysUserStatusDTO dto) {
+ userService.updStatusBatch(dto);
+ return R.ok();
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param userIds
+ * @return
+ */
+ @ApiOperation("批量删除")
+ @DeleteMapping("/delBatch")
+ @ApiImplicitParam(name = "userIdStr", value = "用户id字符串列表", required = true)
+ public R<?> delBatch(@RequestParam String userIdStr) {
+ List<Long> userIds = Arrays.stream(userIdStr.split(",")).map(Long::valueOf).collect(Collectors.toList());
+ userService.delBatch(userIds);
+ return R.ok();
+ }
/**
* 获取用户列表
*/
@@ -124,7 +212,6 @@
*/
//@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
- @ApiOperation(value = "新增用户")
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user)
{
--
Gitblit v1.7.1