From 14319912b6b5d58b2fc8514cd487392690a5e0ec Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Tue, 10 Jun 2025 16:42:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E4=BB=A3=E7=A0=81=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../login/controller/LoginController.java | 2 +- .../mall/ebtp/login/dao/BaseUserMapper.java | 3 +- .../ebtp/login/dao/mapper/BaseUserMapper.xml | 110 +++++++++--------- .../mall/ebtp/login/entity/BaseSelf.java | 8 +- .../ebtp/login/service/BaseUserService.java | 3 +- .../service/impl/BaseUserServiceImpl.java | 61 ++-------- 6 files changed, 77 insertions(+), 110 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/controller/LoginController.java b/src/main/java/com/chinaunicom/mall/ebtp/login/controller/LoginController.java index f8bc66d..8372c73 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/controller/LoginController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/login/controller/LoginController.java @@ -47,7 +47,7 @@ public class LoginController { @ApiOperation("账号登录") @PostMapping("/accountLogin") public BaseResponse idcardLogin(HttpServletResponse response,@RequestBody LoginUserVo vo) { - if(true||captchaGenerator.checkCaptcha(vo.getIdentifying(),vo.getEncryptValue())){ + if(captchaGenerator.checkCaptcha(vo.getIdentifying(),vo.getEncryptValue())){ BaseSelf self = iBaseUserService.idcardLogin(vo.getAccount(), vo.getPassword()); this.iBaseUserService.setCookie(response,"mall3_token",self.getToken()); return BaseResponse.success(self); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/BaseUserMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/login/dao/BaseUserMapper.java index 66156ff..f39e9f3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/BaseUserMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/login/dao/BaseUserMapper.java @@ -5,13 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.cloud.security.starter.entity.AuthorityEntity; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; import com.chinaunicom.mall.ebtp.login.entity.*; +import com.coscoshipping.ebtp.project.user.entity.SysUser; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @Repository -public interface BaseUserMapper extends IBaseMapper { +public interface BaseUserMapper extends IBaseMapper { public IPage selectOrgnUser(IPage page, @Param("vo") BaseUserSelect vo); public BaseUserSelectVo getUserById(@Param("id") String id, @Param("orgnId") String orgnId); public List getUserByObject(@Param("vo") BaseUserSelectVo vo); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/BaseUserMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/BaseUserMapper.xml index a805531..d3e3d27 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/BaseUserMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/login/dao/mapper/BaseUserMapper.xml @@ -2,7 +2,7 @@ - + @@ -23,31 +23,31 @@ @@ -56,58 +56,58 @@ SELECT - r.id AS roleId, - r.NAME AS roleName, - r.tag AS roleCode, - 'EBTP' AS roleScope + r.role_id AS roleId, + r.role_name AS roleName, + r.role_code AS roleCode, + r.role_scope AS roleScope FROM - base_user u, - base_orgn_user ou, - base_role r + sys_user u, + sys_user_role ou, + sys_role r WHERE - u.id = ou.userid - AND ou.roleid = r.id - AND u.id = #{userId} + u.user_id = ou.user_id + AND ou.role_id = r.role_id + AND u.user_id = #{userId} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseSelf.java b/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseSelf.java index 69d4d39..69ce3d5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseSelf.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/login/entity/BaseSelf.java @@ -1,6 +1,8 @@ package com.chinaunicom.mall.ebtp.login.entity; +import com.coscoshipping.ebtp.project.org.entity.SysOrg; +import com.coscoshipping.ebtp.project.user.entity.SysUser; import lombok.Data; import java.util.List; @@ -29,13 +31,13 @@ public class BaseSelf { /** * */ - private BaseUser user; //user + private SysUser user; //user /** * 所属机构 */ - private BaseOrgn orgn; + private SysOrg orgn; /** * 所属机构 */ - private List orgnList; + private List orgnList; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserService.java b/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserService.java index 3ba711e..b7d5253 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/login/service/BaseUserService.java @@ -8,6 +8,7 @@ import com.chinaunicom.mall.ebtp.login.entity.BaseSelf; import com.chinaunicom.mall.ebtp.login.entity.BaseUser; import com.chinaunicom.mall.ebtp.login.entity.BaseUserSelect; import com.chinaunicom.mall.ebtp.login.entity.BaseUserSelectVo; +import com.coscoshipping.ebtp.project.user.entity.SysUser; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -17,7 +18,7 @@ import java.util.List; * @author yss * */ -public interface BaseUserService extends IBaseService { +public interface BaseUserService extends IBaseService { BaseSelf idcardLogin(String account, String password); String getUserHost(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java index 320fb47..f376f16 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/login/service/impl/BaseUserServiceImpl.java @@ -16,6 +16,7 @@ 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.user.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; @@ -49,7 +50,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class BaseUserServiceImpl extends BaseServiceImpl implements BaseUserService { +public class BaseUserServiceImpl extends BaseServiceImpl implements BaseUserService { @Autowired private BaseUserMapper baseUserMapper; @@ -74,13 +75,13 @@ public class BaseUserServiceImpl extends BaseServiceImpl userList = this.list(new LambdaQueryWrapper().eq(BaseUser::getAccount, account).eq(BaseUser::getStatus,Constants.USER_STATUS_LIVE)); + List userList = this.list(new LambdaQueryWrapper().eq(SysUser::getEmployeeNumber, account).eq(SysUser::getStatus,Integer.parseInt(Constants.USER_STATUS_LIVE))); if (userList == null||userList.size()==0) { throw new RuntimeException("无效用户!"); } - BaseUser user = userList.get(0); + SysUser user = userList.get(0); - if(Constants.USER_STATUS_FREEZE.equals(user.getStatus())){ + if(Constants.USER_STATUS_FREEZE.equals(user.getStatus().toString())){ throw new RuntimeException("账号已冻结!"); } @@ -105,9 +106,9 @@ public class BaseUserServiceImpl extends BaseServiceImpl baseUserList = this.list((new LambdaQueryWrapper().eq(BaseUser::getAccount,user.getUserId()))); + List baseUserList = this.list((new LambdaQueryWrapper().eq(SysUser::getEmployeeNumber,user.getUserId()))); if(baseUserList!=null&&baseUserList.size()>0){ self = userLogin(baseUserList.get(0)); self.setToken(token); @@ -213,51 +214,13 @@ public class BaseUserServiceImpl extends BaseServiceImpl roleOrgnList = new ArrayList<>(); - List roleOrgnVoList = this.baseUserMapper.selectOrgnByUserId(baseUser.getId()); - roleOrgnVoList.forEach(ro->{ - BaseRoleOrgn baseRoleOrgn = new BaseRoleOrgn(); - BeanUtils.copyProperties(ro,baseRoleOrgn); - roleOrgnList.add(baseRoleOrgn); - }); - - List droleOrgnList = roleOrgnList.stream().distinct().collect(Collectors.toList()); - - List list = new ArrayList<>(); - List authorityList = new ArrayList<>(); - - droleOrgnList.forEach(droleOrgn->{ - List ro2List = roleOrgnVoList.stream().filter(ro2->ro2.getRoleId().equals(droleOrgn.getRoleId())).distinct().collect(Collectors.toList()); - List baseOrgnRList = new ArrayList<>(); - BaseRoleOrgnVo orgnVo = ro2List.get(0); - securityEntity.setOu(orgnVo.getOrgnId()); - securityEntity.setOuName(orgnVo.getOrgnName()); - securityEntity.setPartnerId(orgnVo.getOrgnId()); - securityEntity.setPartnerName(orgnVo.getOrgnName()); - - ro2List.forEach(ro3->{ - BaseOrgnR baseOrgnR = new BaseOrgnR(); - BeanUtils.copyProperties(ro3,baseOrgnR); - baseOrgnRList.add(baseOrgnR); - }); - droleOrgn.setBaseOrgnList(baseOrgnRList); - list.add(droleOrgn); - - AuthorityEntity authorityEntity = new AuthorityEntity(); - BeanUtils.copyProperties(droleOrgn,authorityEntity); - authorityEntity.setRoleScope("EBTP"); - authorityList.add(authorityEntity); - }); - + List authorityList =this.baseUserMapper.selectRoleByUserId(baseUser.getUserId());; securityEntity.setAuthorityList(authorityList); - // securityEntity.setRoleOrgnList(list); return securityEntity; }