From a0c0d47464cb908f1a31c1cbe8a4d74edb71469d Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Wed, 25 Jun 2025 15:42:24 +0800 Subject: [PATCH] hjhc --- .../SysManagerEbtpProjectApplication.java | 2 +- .../ebtp/system/login/entity/BaseSelf.java | 2 -- .../service/impl/BaseUserServiceImpl.java | 23 ++++++++----------- .../system/user/dao/SysExpertUserMapper.java | 2 +- .../user/dao/SysSupplierUserMapper.java | 2 +- .../user/dao/mapper/SysExpertUserMapper.xml | 2 +- .../user/dao/mapper/SysSupplierUserMapper.xml | 2 +- .../impl/SysExpertUserServiceImpl.java | 8 +++---- .../impl/SysSupplierUserServiceImpl.java | 5 ++-- 9 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/coscoshipping/ebtp/system/SysManagerEbtpProjectApplication.java b/src/main/java/com/coscoshipping/ebtp/system/SysManagerEbtpProjectApplication.java index 7069035..c9797ee 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/SysManagerEbtpProjectApplication.java +++ b/src/main/java/com/coscoshipping/ebtp/system/SysManagerEbtpProjectApplication.java @@ -14,7 +14,7 @@ import org.springframework.context.annotation.ComponentScan; @EnableFeignClients(basePackages = { "com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.cloud.*", "com.chinaunicom.mall.ebtp.*" }) @MapperScan({"com.coscoshipping.ebtp.system.**.dao", "com.chinaunicom.mall.ebtp.**.dao" }) -@ComponentScan(basePackages = { "com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.cloud.*", +@ComponentScan(basePackages = { "com.coscoshipping.ebtp.system.*", "com.chinaunicom.mall.ebtp.cloud.*", "com.chinaunicom.mall.ebtp.*" }) public class SysManagerEbtpProjectApplication { diff --git a/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseSelf.java b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseSelf.java index aa1bc0f..b928853 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseSelf.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/entity/BaseSelf.java @@ -1,10 +1,8 @@ package com.coscoshipping.ebtp.system.login.entity; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; import com.coscoshipping.ebtp.project.user.entity.SysExpertUser; import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser; -import com.coscoshipping.ebtp.project.user.entity.SysUser; import com.coscoshipping.ebtp.system.org.entity.SysOrg; import com.coscoshipping.ebtp.system.user.entity.SysUser; import lombok.Data; diff --git a/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java index 0dac5cc..142ee7a 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java @@ -11,28 +11,21 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; + +import com.coscoshipping.ebtp.project.user.entity.SysExpertUser; +import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser; import com.coscoshipping.ebtp.system.login.common.Constants; import com.coscoshipping.ebtp.system.login.common.RSA; import com.coscoshipping.ebtp.system.login.dao.BaseUserMapper; -import com.coscoshipping.ebtp.system.login.entity.*; +import com.coscoshipping.ebtp.system.login.entity.BaseSelf; +import com.coscoshipping.ebtp.system.login.entity.BaseUserToken; import com.coscoshipping.ebtp.system.login.service.BaseUserService; import com.coscoshipping.ebtp.system.login.service.BaseUserTokenService; import com.coscoshipping.ebtp.system.org.entity.SysOrg; import com.coscoshipping.ebtp.system.org.service.SysOrgService; +import com.coscoshipping.ebtp.system.user.dao.SysExpertUserMapper; +import com.coscoshipping.ebtp.system.user.dao.SysSupplierUserMapper; import com.coscoshipping.ebtp.system.user.entity.SysUser; -import com.chinaunicom.mall.ebtp.login.common.Constants;; -import com.chinaunicom.mall.ebtp.login.common.RSA; -import com.chinaunicom.mall.ebtp.login.dao.BaseUserMapper; -import com.chinaunicom.mall.ebtp.login.entity.*; -import com.chinaunicom.mall.ebtp.login.service.BaseUserService; -import com.chinaunicom.mall.ebtp.login.service.BaseUserTokenService; -import com.coscoshipping.ebtp.project.org.entity.SysOrg; -import com.coscoshipping.ebtp.project.org.service.SysOrgService; -import com.coscoshipping.ebtp.project.user.dao.SysExpertUserMapper; -import com.coscoshipping.ebtp.project.user.dao.SysSupplierUserMapper; -import com.coscoshipping.ebtp.project.user.entity.SysExpertUser; -import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser; -import com.coscoshipping.ebtp.project.user.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -59,6 +52,8 @@ import java.util.concurrent.TimeUnit; import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.REDIS_USER_KEY; +; + /** * 对数据表 base_user 操作的 serviceImpl * diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysExpertUserMapper.java b/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysExpertUserMapper.java index 265ca4b..abc7354 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysExpertUserMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysExpertUserMapper.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.user.dao; +package com.coscoshipping.ebtp.system.user.dao; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysSupplierUserMapper.java b/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysSupplierUserMapper.java index 46aa74b..3997487 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysSupplierUserMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/dao/SysSupplierUserMapper.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.user.dao; +package com.coscoshipping.ebtp.system.user.dao; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysExpertUserMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysExpertUserMapper.xml index da23d12..300d3b6 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysExpertUserMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysExpertUserMapper.xml @@ -1,7 +1,7 @@ - + SELECT r.role_id AS roleId, diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysExpertUserServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysExpertUserServiceImpl.java index 0bee4ca..0121d22 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysExpertUserServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysExpertUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.user.service.impl; +package com.coscoshipping.ebtp.system.user.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import com.coscoshipping.ebtp.project.user.dao.SysExpertUserMapper; + import com.coscoshipping.ebtp.project.user.entity.SysExpertUser; import com.coscoshipping.ebtp.project.user.service.SysExpertUserService; +import com.coscoshipping.ebtp.system.user.dao.SysExpertUserMapper; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; - /** * 对数据表 sys_expert_user 操作的 serviceImpl * @author yss diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysSupplierUserServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysSupplierUserServiceImpl.java index 9914493..42a0b25 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysSupplierUserServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/service/impl/SysSupplierUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.user.service.impl; +package com.coscoshipping.ebtp.system.user.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,9 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import com.coscoshipping.ebtp.project.user.dao.SysSupplierUserMapper; + import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser; import com.coscoshipping.ebtp.project.user.service.SysSupplierUserService; +import com.coscoshipping.ebtp.system.user.dao.SysSupplierUserMapper; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service;