feat(usr): selectUserList XML + getUserList service + GET /api/usr/users REQ-USR-003

zichun
1 parent 32dcaa25
Showing 7 changed files with 180 additions and 0 deletions
backend/src/main/java/com/example/erp/module/usr/controller/UserController.java
backend/src/main/java/com/example/erp/module/usr/mapper/UsrUserMapper.java
backend/src/main/java/com/example/erp/module/usr/service/UserService.java
backend/src/main/java/com/example/erp/module/usr/service/impl/UserServiceImpl.java
backend/src/main/resources/mapper/UsrUserMapper.xml
backend/src/test/java/com/example/erp/module/usr/UserControllerTest.java
backend/src/test/java/com/example/erp/module/usr/UserServiceTest.java
 package com.example.erp.module.usr.controller;
 import com.example.erp.common.response.Result;
+import com.example.erp.common.vo.PageVO;
 import com.example.erp.config.UserPrincipal;
 import com.example.erp.module.usr.dto.UserCreateReqDTO;
+import com.example.erp.module.usr.dto.UserListQueryDTO;
 import com.example.erp.module.usr.service.UserService;
 import com.example.erp.module.usr.vo.PermissionGroupVO;
 import com.example.erp.module.usr.vo.StaffVO;
 import com.example.erp.module.usr.vo.UserCreateRespVO;
+import com.example.erp.module.usr.vo.UserListItemVO;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -28,6 +31,23 @@ public class UserController {
         return Result.ok(userService.createUser(req, principal));
     }
+    @GetMapping("/users")
+    public Result<PageVO<UserListItemVO>> getUsers(
+            @RequestParam(defaultValue = "username") String queryField,
+            @RequestParam(defaultValue = "contains") String matchType,
+            @RequestParam(defaultValue = "") String queryValue,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "20") int pageSize,
+            @AuthenticationPrincipal UserPrincipal principal) {
+        UserListQueryDTO q = new UserListQueryDTO();
+        q.setQueryField(queryField);
+        q.setMatchType(matchType);
+        q.setQueryValue(queryValue);
+        q.setPage(page);
+        q.setPageSize(pageSize);
+        return Result.ok(userService.getUserList(q, principal.brandId()));
+    }
+
     @GetMapping("/users/staffs")
     public Result<List<StaffVO>> getStaffs(@AuthenticationPrincipal UserPrincipal principal) {
         return Result.ok(userService.getStaffs(principal.brandId()));
 package com.example.erp.module.usr.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.module.usr.entity.UsrUserEntity;
+import com.example.erp.module.usr.vo.UserListItemVO;
+import org.apache.ibatis.annotations.Param;
 public interface UsrUserMapper extends BaseMapper<UsrUserEntity> {
+
+    IPage<UserListItemVO> selectUserList(
+            IPage<UserListItemVO> page,
+            @Param("brandId") String brandId,
+            @Param("queryField") String queryField,
+            @Param("matchType") String matchType,
+            @Param("queryValue") String queryValue
+    );
 }
 package com.example.erp.module.usr.service;
+import com.example.erp.common.vo.PageVO;
 import com.example.erp.config.UserPrincipal;
 import com.example.erp.module.usr.dto.UserCreateReqDTO;
+import com.example.erp.module.usr.dto.UserListQueryDTO;
 import com.example.erp.module.usr.vo.PermissionGroupVO;
 import com.example.erp.module.usr.vo.StaffVO;
 import com.example.erp.module.usr.vo.UserCreateRespVO;
+import com.example.erp.module.usr.vo.UserListItemVO;
 import java.util.List;
@@ -15,4 +18,6 @@ public interface UserService {
     List<StaffVO> getStaffs(String brandId);
     List<PermissionGroupVO> getPermissionGroups(String brandId);
+
+    PageVO<UserListItemVO> getUserList(UserListQueryDTO query, String brandId);
 }
 package com.example.erp.module.usr.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.erp.common.constants.UsrErrorCode;
 import com.example.erp.common.exception.BizException;
+import com.example.erp.common.vo.PageVO;
 import com.example.erp.config.UserPrincipal;
 import com.example.erp.module.usr.dto.UserCreateReqDTO;
+import com.example.erp.module.usr.dto.UserListQueryDTO;
 import com.example.erp.module.usr.entity.PermissionGroupEntity;
 import com.example.erp.module.usr.entity.StaffEntity;
 import com.example.erp.module.usr.entity.UserPermissionEntity;
@@ -17,6 +21,7 @@ import com.example.erp.module.usr.service.UserService;
 import com.example.erp.module.usr.vo.PermissionGroupVO;
 import com.example.erp.module.usr.vo.StaffVO;
 import com.example.erp.module.usr.vo.UserCreateRespVO;
+import com.example.erp.module.usr.vo.UserListItemVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -118,6 +123,16 @@ public class UserServiceImpl implements UserService {
     @Override
     @Transactional(readOnly = true)
+    public PageVO<UserListItemVO> getUserList(UserListQueryDTO query, String brandId) {
+        int cappedSize = Math.min(query.getPageSize(), 100);
+        IPage<UserListItemVO> iPage = new Page<>(query.getPage(), cappedSize);
+        String queryValue = query.getQueryValue() == null ? "" : query.getQueryValue();
+        IPage<UserListItemVO> result = userMapper.selectUserList(iPage, brandId, query.getQueryField(), query.getMatchType(), queryValue);
+        return PageVO.of(result);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
     public List<PermissionGroupVO> getPermissionGroups(String brandId) {
         List<PermissionGroupEntity> groups = permGroupMapper.selectList(new LambdaQueryWrapper<PermissionGroupEntity>()
                 .eq(PermissionGroupEntity::getSBrandsId, brandId));
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.erp.module.usr.mapper.UsrUserMapper">
+
+    <select id="selectUserList" resultType="com.example.erp.module.usr.vo.UserListItemVO">
+        SELECT u.sId, u.sUsername, u.sUserCode, u.sUserType, u.sLanguage,
+               u.bIsDisabled, u.tLastLoginDate, u.sCreatorUsername, u.tCreateDate,
+               s.sStaffName, s.sDepartment
+        FROM usr_user u
+        LEFT JOIN tStaff s ON u.sEmployeeId = s.sId
+                           AND s.sBrandsId = u.sBrandsId
+                           AND s.bDeleted = 0
+        WHERE u.sBrandsId = #{brandId}
+        <if test="queryValue != null and queryValue != ''">
+            <choose>
+                <when test="queryField == 'username'">
+                    <choose>
+                        <when test="matchType == 'contains'">AND u.sUsername LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <when test="matchType == 'notContains'">AND u.sUsername NOT LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <otherwise>AND u.sUsername = #{queryValue}</otherwise>
+                    </choose>
+                </when>
+                <when test="queryField == 'staffName'">
+                    <choose>
+                        <when test="matchType == 'contains'">AND s.sStaffName LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <when test="matchType == 'notContains'">AND s.sStaffName NOT LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <otherwise>AND s.sStaffName = #{queryValue}</otherwise>
+                    </choose>
+                </when>
+                <when test="queryField == 'userCode'">
+                    <choose>
+                        <when test="matchType == 'contains'">AND u.sUserCode LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <when test="matchType == 'notContains'">AND u.sUserCode NOT LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <otherwise>AND u.sUserCode = #{queryValue}</otherwise>
+                    </choose>
+                </when>
+                <when test="queryField == 'department'">
+                    <choose>
+                        <when test="matchType == 'contains'">AND s.sDepartment LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <when test="matchType == 'notContains'">AND s.sDepartment NOT LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <otherwise>AND s.sDepartment = #{queryValue}</otherwise>
+                    </choose>
+                </when>
+                <when test="queryField == 'userType'">
+                    <choose>
+                        <when test="matchType == 'contains'">AND u.sUserType LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <when test="matchType == 'notContains'">AND u.sUserType NOT LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <otherwise>AND u.sUserType = #{queryValue}</otherwise>
+                    </choose>
+                </when>
+                <when test="queryField == 'creator'">
+                    <choose>
+                        <when test="matchType == 'contains'">AND u.sCreatorUsername LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <when test="matchType == 'notContains'">AND u.sCreatorUsername NOT LIKE CONCAT('%', #{queryValue}, '%')</when>
+                        <otherwise>AND u.sCreatorUsername = #{queryValue}</otherwise>
+                    </choose>
+                </when>
+                <when test="queryField == 'disabled'">
+                    <choose>
+                        <when test="queryValue == '是'">AND u.bIsDisabled = 1</when>
+                        <when test="queryValue == '否'">AND u.bIsDisabled = 0</when>
+                    </choose>
+                </when>
+                <when test="queryField == 'lastLoginDate'">
+                    AND DATE(u.tLastLoginDate) = #{queryValue}
+                </when>
+            </choose>
+        </if>
+        ORDER BY u.tCreateDate DESC
+    </select>
+
+</mapper>
@@ -7,7 +7,10 @@ import com.example.erp.config.SecurityConfig;
 import com.example.erp.common.util.JwtUtil;
 import com.example.erp.module.usr.controller.UserController;
 import com.example.erp.module.usr.service.UserService;
+import com.example.erp.common.vo.PageVO;
+import com.example.erp.module.usr.dto.UserListQueryDTO;
 import com.example.erp.module.usr.vo.UserCreateRespVO;
+import com.example.erp.module.usr.vo.UserListItemVO;
 import com.example.erp.module.usr.vo.StaffVO;
 import com.example.erp.module.usr.vo.PermissionGroupVO;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -103,6 +106,28 @@ class UserControllerTest {
     }
     @Test
+    void getUsers_withToken_returns200() throws Exception {
+        PageVO<UserListItemVO> page = new PageVO<>();
+        page.setTotal(0);
+        page.setPage(1);
+        page.setPageSize(20);
+        page.setList(List.of());
+        when(userService.getUserList(any(UserListQueryDTO.class), anyString())).thenReturn(page);
+
+        mockMvc.perform(get("/api/usr/users").with(superAdmin()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data.total").value(0))
+                .andExpect(jsonPath("$.data.list").isArray());
+    }
+
+    @Test
+    void getUsers_noAuth_returns401() throws Exception {
+        mockMvc.perform(get("/api/usr/users"))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
     void getPermissionGroups_returns200() throws Exception {
         PermissionGroupVO g = new PermissionGroupVO();
         g.setSId("g1");
 package com.example.erp.module.usr;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.erp.common.exception.BizException;
+import com.example.erp.common.vo.PageVO;
 import com.example.erp.config.UserPrincipal;
 import com.example.erp.module.usr.dto.UserCreateReqDTO;
 import com.example.erp.module.usr.dto.UserListQueryDTO;
+import com.example.erp.module.usr.vo.UserListItemVO;
 import com.example.erp.module.usr.entity.StaffEntity;
 import com.example.erp.module.usr.entity.UsrUserEntity;
 import com.example.erp.module.usr.entity.UserPermissionEntity;
@@ -118,6 +122,33 @@ class UserServiceTest {
     }
     @Test
+    void getUserList_capsPageSizeAt100_callsMapper() {
+        IPage<UserListItemVO> mockPage = new Page<>(1, 100, 5);
+        when(userMapper.selectUserList(argThat(p -> p.getSize() == 100), eq("b1"), any(), any(), any()))
+                .thenReturn(mockPage);
+
+        UserListQueryDTO q = new UserListQueryDTO();
+        q.setPageSize(200);
+        PageVO<UserListItemVO> result = userService.getUserList(q, "b1");
+
+        assertEquals(5L, result.getTotal());
+        verify(userMapper).selectUserList(argThat(p -> p.getSize() == 100), eq("b1"), any(), any(), any());
+    }
+
+    @Test
+    void getUserList_emptyQueryValue_doesNotFilter() {
+        IPage<UserListItemVO> mockPage = new Page<>(1, 20, 2);
+        when(userMapper.selectUserList(any(), eq("b1"), eq("username"), eq("contains"), eq("")))
+                .thenReturn(mockPage);
+
+        UserListQueryDTO q = new UserListQueryDTO();
+        q.setQueryValue(null);
+        PageVO<UserListItemVO> result = userService.getUserList(q, "b1");
+
+        assertEquals(2L, result.getTotal());
+    }
+
+    @Test
     void createUser_invalidEmployeeId_throws40001() {
         req.setEmployeeId("bad-staff-id");
         when(userMapper.selectCount(any())).thenReturn(0L);