From 6a55a49aea809f3b6e4921232f70d334d2779c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=80=A1?= Date: Thu, 26 Jun 2025 11:08:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=94=A8=E6=88=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AE=9E=E4=BD=93=E5=92=8C=E6=9C=8D=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E5=8C=85=E5=90=8D=EF=BC=8C=E5=B0=86=E5=85=B6=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=B8=BAcom.coscoshipping.ebtp.system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/system/login/entity/BaseSelf.java | 4 ++-- .../system/login/service/impl/BaseUserServiceImpl.java | 10 +++------- .../ebtp/system/user/dao/SysExpertUserMapper.java | 2 +- .../ebtp/system/user/dao/SysSupplierUserMapper.java | 2 +- .../system/user/dao/mapper/SysExpertUserMapper.xml | 2 +- .../system/user/dao/mapper/SysSupplierUserMapper.xml | 2 +- .../ebtp/system/user/entity/SysExpertUser.java | 2 +- .../ebtp/system/user/entity/SysSupplierUser.java | 2 +- .../ebtp/system/user/service/SysExpertUserService.java | 4 ++-- .../system/user/service/SysSupplierUserService.java | 4 ++-- .../user/service/impl/SysExpertUserServiceImpl.java | 5 ++--- .../user/service/impl/SysSupplierUserServiceImpl.java | 6 ++---- 12 files changed, 19 insertions(+), 26 deletions(-) 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 b928853..6238aba 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,9 +1,9 @@ package com.coscoshipping.ebtp.system.login.entity; -import com.coscoshipping.ebtp.project.user.entity.SysExpertUser; -import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser; import com.coscoshipping.ebtp.system.org.entity.SysOrg; +import com.coscoshipping.ebtp.system.user.entity.SysExpertUser; +import com.coscoshipping.ebtp.system.user.entity.SysSupplierUser; 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 142ee7a..962e7f1 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,20 +11,18 @@ 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.BaseSelf; -import com.coscoshipping.ebtp.system.login.entity.BaseUserToken; +import com.coscoshipping.ebtp.system.login.entity.*; 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.SysExpertUser; +import com.coscoshipping.ebtp.system.user.entity.SysSupplierUser; import com.coscoshipping.ebtp.system.user.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -52,8 +50,6 @@ 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 abc7354..ef38b7c 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 @@ -2,9 +2,9 @@ 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; +import com.coscoshipping.ebtp.system.user.entity.SysExpertUser; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.coscoshipping.ebtp.project.user.entity.SysExpertUser; import java.util.List; 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 3997487..7ba14b9 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 @@ -2,9 +2,9 @@ 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; +import com.coscoshipping.ebtp.system.user.entity.SysSupplierUser; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser; import java.util.List; 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 300d3b6..be058bb 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 @@ -18,4 +18,4 @@ AND u.user_id = #{userId} - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysSupplierUserMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysSupplierUserMapper.xml index 1395de1..548a79d 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysSupplierUserMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/user/dao/mapper/SysSupplierUserMapper.xml @@ -18,4 +18,4 @@ AND u.user_id = #{userId} - \ No newline at end of file + diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysExpertUser.java b/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysExpertUser.java index d566b4e..4f8467f 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysExpertUser.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysExpertUser.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.user.entity; +package com.coscoshipping.ebtp.system.user.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysSupplierUser.java b/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysSupplierUser.java index e46b86c..66117ba 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysSupplierUser.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/entity/SysSupplierUser.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.user.entity; +package com.coscoshipping.ebtp.system.user.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/service/SysExpertUserService.java b/src/main/java/com/coscoshipping/ebtp/system/user/service/SysExpertUserService.java index 42ac5b2..ef9eb77 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/service/SysExpertUserService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/service/SysExpertUserService.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.user.service; +package com.coscoshipping.ebtp.system.user.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.user.entity.SysExpertUser; +import com.coscoshipping.ebtp.system.user.entity.SysExpertUser; /** * 对数据表 sys_expert_user 操作的 service diff --git a/src/main/java/com/coscoshipping/ebtp/system/user/service/SysSupplierUserService.java b/src/main/java/com/coscoshipping/ebtp/system/user/service/SysSupplierUserService.java index e987814..f74e630 100644 --- a/src/main/java/com/coscoshipping/ebtp/system/user/service/SysSupplierUserService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/user/service/SysSupplierUserService.java @@ -1,8 +1,8 @@ -package com.coscoshipping.ebtp.project.user.service; +package com.coscoshipping.ebtp.system.user.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.user.entity.SysSupplierUser; +import com.coscoshipping.ebtp.system.user.entity.SysSupplierUser; /** * 对数据表 sys_supplier_user 操作的 service 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 0121d22..e7e03c7 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 @@ -6,10 +6,9 @@ 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.coscoshipping.ebtp.project.user.entity.SysExpertUser; -import com.coscoshipping.ebtp.project.user.service.SysExpertUserService; import com.coscoshipping.ebtp.system.user.dao.SysExpertUserMapper; +import com.coscoshipping.ebtp.system.user.entity.SysExpertUser; +import com.coscoshipping.ebtp.system.user.service.SysExpertUserService; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; 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 42a0b25..83bb841 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 @@ -6,11 +6,9 @@ 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.entity.SysSupplierUser; -import com.coscoshipping.ebtp.project.user.service.SysSupplierUserService; import com.coscoshipping.ebtp.system.user.dao.SysSupplierUserMapper; +import com.coscoshipping.ebtp.system.user.entity.SysSupplierUser; +import com.coscoshipping.ebtp.system.user.service.SysSupplierUserService; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service;