From 2beebbe4697356016295740ea01df1c99b26adc7 Mon Sep 17 00:00:00 2001 From: wh Date: Thu, 23 Apr 2026 17:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96mybatis=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=86=97=E4=BD=99=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/interceptor/AuthInterceptor.java | 2 +- .../backend/mapper/SysCompanyMapper.java | 8 +------ .../backend/mapper/SysUserMapper.java | 24 ++++--------------- .../backend/service/CompanyService.java | 2 +- .../labelsys/backend/service/UserService.java | 18 +++++++++----- .../resources/mapper/SysCompanyMapper.xml | 21 ++-------------- src/main/resources/mapper/SysUserMapper.xml | 21 +--------------- 7 files changed, 23 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/labelsys/backend/interceptor/AuthInterceptor.java b/src/main/java/com/labelsys/backend/interceptor/AuthInterceptor.java index 20ee660..37acd88 100644 --- a/src/main/java/com/labelsys/backend/interceptor/AuthInterceptor.java +++ b/src/main/java/com/labelsys/backend/interceptor/AuthInterceptor.java @@ -73,7 +73,7 @@ public class AuthInterceptor implements HandlerInterceptor { .orElseThrow(() -> new UnauthorizedException("未登录或登录已过期")); SysUser user = sysUserMapper.findByIdAndCompanyId(loginUser.userId(), loginUser.companyId()); - SysCompany company = sysCompanyMapper.findById(loginUser.companyId()); + SysCompany company = sysCompanyMapper.selectById(loginUser.companyId()); if (user == null || company == null || user.getStatus() != UserStatus.ENABLED || company.getStatus() != CompanyStatus.ENABLED) { throw new UnauthorizedException("未登录或登录已过期"); } diff --git a/src/main/java/com/labelsys/backend/mapper/SysCompanyMapper.java b/src/main/java/com/labelsys/backend/mapper/SysCompanyMapper.java index aafd165..f5d5a9e 100644 --- a/src/main/java/com/labelsys/backend/mapper/SysCompanyMapper.java +++ b/src/main/java/com/labelsys/backend/mapper/SysCompanyMapper.java @@ -8,17 +8,11 @@ import org.apache.ibatis.annotations.Param; public interface SysCompanyMapper extends BaseMapper { - int insert(SysCompany company); - - SysCompany findById(@Param("id") Long id); - SysCompany findByCompanyCode(@Param("companyCode") String companyCode); List findEnabledCompaniesByPhone(@Param("phone") String phone); - List listAll(); - int updateStatus(@Param("id") Long id, @Param("status") CompanyStatus status); void deleteAll(); -} +} \ No newline at end of file diff --git a/src/main/java/com/labelsys/backend/mapper/SysUserMapper.java b/src/main/java/com/labelsys/backend/mapper/SysUserMapper.java index 80688bd..99624a2 100644 --- a/src/main/java/com/labelsys/backend/mapper/SysUserMapper.java +++ b/src/main/java/com/labelsys/backend/mapper/SysUserMapper.java @@ -10,35 +10,21 @@ import org.apache.ibatis.annotations.Param; public interface SysUserMapper extends BaseMapper { - int insert(SysUser user); - - SysUser findById(@Param("id") Long id); - SysUser findByIdAndCompanyId(@Param("id") Long id, @Param("companyId") Long companyId); SysUser findByCompanyIdAndPhone(@Param("companyId") Long companyId, @Param("phone") String phone); - List listByCompanyId(@Param("companyId") Long companyId); - List listCompanyAdmins(@Param("companyId") Long companyId); - int updatePassword( - @Param("id") Long id, - @Param("companyId") Long companyId, - @Param("passwordHash") String passwordHash, - @Param("mustChangePassword") boolean mustChangePassword - ); + int updatePassword(@Param("id") Long id, @Param("companyId") Long companyId, + @Param("passwordHash") String passwordHash, @Param("mustChangePassword") boolean mustChangePassword); - int updateAssignment( - @Param("id") Long id, - @Param("companyId") Long companyId, - @Param("role") UserRole role, - @Param("position") UserPosition position - ); + int updateAssignment(@Param("id") Long id, @Param("companyId") Long companyId, @Param("role") UserRole role, + @Param("position") UserPosition position); int updateStatus(@Param("id") Long id, @Param("companyId") Long companyId, @Param("status") UserStatus status); int bumpSessionVersion(@Param("id") Long id, @Param("companyId") Long companyId); void deleteAll(); -} +} \ No newline at end of file diff --git a/src/main/java/com/labelsys/backend/service/CompanyService.java b/src/main/java/com/labelsys/backend/service/CompanyService.java index 0e37cb0..4bffbde 100644 --- a/src/main/java/com/labelsys/backend/service/CompanyService.java +++ b/src/main/java/com/labelsys/backend/service/CompanyService.java @@ -21,7 +21,7 @@ public class CompanyService { public List listCompanies(LoginUser currentUser) { assertPlatformAdmin(currentUser); - return sysCompanyMapper.listAll(); + return sysCompanyMapper.selectList(null); } public SysCompany createCompany(LoginUser currentUser, CreateCompanyRequest request) { diff --git a/src/main/java/com/labelsys/backend/service/UserService.java b/src/main/java/com/labelsys/backend/service/UserService.java index 8236682..776e632 100644 --- a/src/main/java/com/labelsys/backend/service/UserService.java +++ b/src/main/java/com/labelsys/backend/service/UserService.java @@ -1,5 +1,12 @@ package com.labelsys.backend.service; +import java.util.List; + +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.labelsys.backend.common.ResultCode; import com.labelsys.backend.common.exception.BusinessException; import com.labelsys.backend.common.exception.ForbiddenException; @@ -18,11 +25,8 @@ import com.labelsys.backend.mapper.SysCompanyMapper; import com.labelsys.backend.mapper.SysUserMapper; import com.labelsys.backend.service.session.TokenSessionRepository; import com.labelsys.backend.util.IdGenerator; -import java.util.List; + import lombok.RequiredArgsConstructor; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @@ -37,7 +41,9 @@ public class UserService { public List listCompanyUsers(LoginUser currentUser) { assertCompanyAdmin(currentUser); - return sysUserMapper.listByCompanyId(currentUser.companyId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(SysUser::getCompanyId, currentUser.companyId()).orderByAsc(SysUser::getId); + return sysUserMapper.selectList(wrapper); } public List listCompanyAdmins(LoginUser currentUser, Long companyId) { @@ -114,7 +120,7 @@ public class UserService { } private void ensureEnabledCompany(Long companyId) { - SysCompany company = sysCompanyMapper.findById(companyId); + SysCompany company = sysCompanyMapper.selectById(companyId); if (company == null || company.getStatus() != CompanyStatus.ENABLED) { throw new BusinessException(ResultCode.NOT_FOUND, "公司不存在或已禁用"); } diff --git a/src/main/resources/mapper/SysCompanyMapper.xml b/src/main/resources/mapper/SysCompanyMapper.xml index 75689d2..63b8dc3 100644 --- a/src/main/resources/mapper/SysCompanyMapper.xml +++ b/src/main/resources/mapper/SysCompanyMapper.xml @@ -14,17 +14,6 @@ id, company_code, company_name, status, created_at, updated_at - - insert into sys_company (id, company_code, company_name, status, created_at, updated_at) - values (#{id}, #{companyCode}, #{companyName}, #{status}, current_timestamp, current_timestamp) - - - - - - update sys_company set status = #{status}, updated_at = current_timestamp where id = #{id} - + delete from sys_company - + \ No newline at end of file diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index 6e20dee..d2f5dcb 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -22,21 +22,6 @@ status, session_version, created_at, updated_at - - insert into sys_user ( - id, company_id, phone, username, role, position, real_name, password_hash, must_change_password, - status, session_version, created_at, updated_at - ) - values ( - #{id}, #{companyId}, #{phone}, #{username}, #{role}, #{position}, #{realName}, #{passwordHash}, #{mustChangePassword}, - #{status}, #{sessionVersion}, current_timestamp, current_timestamp - ) - - - - @@ -45,10 +30,6 @@ select from sys_user where company_id = #{companyId} and phone = #{phone} - -