Просмотр исходного кода

feat:
新增用户、组织非分页接口

18339543638 2 лет назад
Родитель
Сommit
5c4f7d9a62

+ 9 - 2
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/controller/SysOrgController.java

@@ -42,12 +42,19 @@ public class SysOrgController extends BaseController {
 
     @PostMapping("/query/page")
     @ApiOperationSupport(author = "lf")
-    @ApiOperation(value = "根据条件查询组织",notes = "权限: 无")
-    public TableDataInfo<SysOrgDTO> selectList(@RequestBody SysOrgQueryDTO query){
+    @ApiOperation(value = "根据条件查询组织(分页)",notes = "权限: 无")
+    public TableDataInfo<SysOrgDTO> selectPage(@RequestBody SysOrgQueryDTO query){
         startPage();
         return getDataTable(orgService.selectSysOrgList(query));
     }
 
+    @PostMapping("/query/list")
+    @ApiOperationSupport(author = "lf")
+    @ApiOperation(value = "根据条件查询组织(不分页)",notes = "权限: 无")
+    public CommonResult<List<SysOrgDTO>> selectList(@RequestBody SysOrgQueryDTO query){
+        return CommonResult.success(orgService.selectSysOrgList(query));
+    }
+
     @GetMapping("/detail/{id}")
     @ApiOperationSupport(author = "lf")
     @ApiOperation(value = "根据id查询组织",notes = "权限: sys:org:query")

+ 12 - 8
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/controller/SysUserController.java

@@ -5,10 +5,8 @@ import cn.tr.core.pojo.CommonResult;
 import cn.tr.core.pojo.TableDataInfo;
 import cn.tr.core.validation.Insert;
 import cn.tr.core.validation.Update;
-import cn.tr.module.sys.user.dto.SysUserDTO;
-import cn.tr.module.sys.user.dto.SysUserEditDTO;
-import cn.tr.module.sys.user.dto.SysUserQueryDTO;
-import cn.tr.module.sys.user.dto.SysValidateUsernameDTO;
+import cn.tr.module.sys.user.dto.*;
+import cn.tr.module.sys.user.mapper.SysUserMapper;
 import cn.tr.module.sys.user.service.ISysUserService;
 import cn.tr.plugin.mybatis.base.BaseController;
 import cn.tr.module.api.sys.log.annotation.OperateLog;
@@ -18,8 +16,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Collection;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @ClassName : SysUserController
@@ -55,12 +52,19 @@ public class SysUserController extends BaseController {
 
     @PostMapping("/query/page")
     @ApiOperationSupport(author = "lf")
-    @ApiOperation(value = "根据条件查询用户",notes = "权限: 无")
-    public TableDataInfo<SysUserDTO> selectList(@RequestBody SysUserQueryDTO query){
+    @ApiOperation(value = "根据条件查询用户(分页)",notes = "权限: 无")
+    public TableDataInfo<SysUserDTO> selectPage(@RequestBody SysUserQueryDTO query){
         startPage();
         return getDataTable(userService.selectSysUserList(query));
     }
 
+    @PostMapping("/query/list")
+    @ApiOperationSupport(author = "lf")
+    @ApiOperation(value = "根据条件查询用户(不分页)",notes = "权限: 无")
+    public CommonResult<List<SysUserSmallDTO>> selectList(@RequestBody SysUserQueryDTO query){
+        return CommonResult.success(SysUserMapper.INSTANCE.toUserSmallDTOList(userService.selectSysUserList(query)));
+    }
+
     @GetMapping("/detail/{id}")
     @ApiOperationSupport(author = "lf")
     @ApiOperation(value = "根据id查询用户",notes = "权限: sys:user:query")

+ 34 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysUserSmallDTO.java

@@ -0,0 +1,34 @@
+package cn.tr.module.sys.user.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName : SysUserPO
+ * @Description : 系统用户实体类
+ * @Author : LF
+ * @Date: 2023年03月31日
+ */
+@Data
+public class SysUserSmallDTO implements Serializable {
+    /**
+     * 用户主键Id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String id;
+
+    /**
+     * 昵称
+     */
+    @ApiModelProperty(value = "昵称")
+    private String nickname;
+
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别")
+    private String gender;
+}

+ 3 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/mapper/SysUserMapper.java

@@ -1,6 +1,7 @@
 package cn.tr.module.sys.user.mapper;
 
 import cn.tr.module.sys.user.dto.SysUserEditDTO;
+import cn.tr.module.sys.user.dto.SysUserSmallDTO;
 import cn.tr.plugin.security.bo.UserLoginInfoBO;
 import cn.tr.module.sys.user.po.SysUserPO;
 import org.mapstruct.Mapper;
@@ -32,5 +33,7 @@ public interface SysUserMapper {
 
     List<SysUserDTO> toUserDTOList(List<SysUserPO> source);
 
+    List<SysUserSmallDTO> toUserSmallDTOList(List<SysUserDTO> source);
+
     SysUserPO toUserPO(SysUserDTO source);
 }