From 70a8bd2c65bb24af82c5bc8c88b4352622aec1d5 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Wed, 16 Oct 2024 16:49:07 +0800
Subject: [PATCH] 网格登录对接
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java | 36 +++++++++++++++++-------------------
dyh-service/dyh-sync/src/main/resources/config/application.yml | 4 ++--
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridUserRoleDTO.java | 2 ++
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java | 6 +++++-
4 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridUserRoleDTO.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridUserRoleDTO.java
index f033f0f..315b2fa 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridUserRoleDTO.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridUserRoleDTO.java
@@ -34,4 +34,6 @@
private boolean lastOrgRole;
+ private String orgRoleId;
+
}
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
index 87f5af2..9141311 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -354,25 +354,23 @@
// 判断账号是否存在
CtAccount ctAccount = null;
CtUser ctUser = null;
- //如果和亿迅系统的手机号对不上，在用身份证号去查询用户，如果查询得到，就对得上，如果查询不到，就说明用户不存在
- ctUser = ctUserService.getByIdCard(gridUserBaseDTO.getIdNumber());
- if (ObjectUtils.isNotEmpty(ctUser)) {
- ctAccount = this.getByUserIdAndType(ctUser.getId(), UserBaseConsts.ACC_TYPE_1);
+ ctAccount = this.getByAccAndType(gridUserBaseDTO.getAccount(), UserBaseConsts.ACC_TYPE_1);
+ if (ObjectUtils.isEmpty(ctAccount)) {
+ ctAccount = this.getByAccAndType(gridUserBaseDTO.getMobile(), UserBaseConsts.ACC_TYPE_1);
}
-// CtAccount ctAccount = this.getByAccAndType(gridUserBaseDTO.getAccount(), UserBaseConsts.ACC_TYPE_1);
-// if (ObjectUtils.isEmpty(ctAccount)) {
-// ctAccount = this.getByAccAndType(gridUserBaseDTO.getMobile(), UserBaseConsts.ACC_TYPE_1);
-// }
-
-// if (ObjectUtils.isNotEmpty(ctAccount)) {
-// //返回结果
-// ctUser = ctUserService.getById(ctAccount.getUserId());
-// if (ObjectUtils.isEmpty(ctUser)) {
-// return ReturnFailUtils.getRepInfo("用户不存在！");
-// }
-// } else {
-//
-// }
+ if (ObjectUtils.isNotEmpty(ctAccount)) {
+ //返回结果
+ ctUser = ctUserService.getById(ctAccount.getUserId());
+ if (ObjectUtils.isEmpty(ctUser)) {
+ return ReturnFailUtils.getRepInfo("用户不存在！");
+ }
+ } else {
+ //如果和亿迅系统的手机号对不上，在用身份证号去查询用户，如果查询得到，就对得上，如果查询不到，就说明用户不存在
+ ctUser = ctUserService.getByIdCard(gridUserBaseDTO.getIdNumber());
+ if (ObjectUtils.isNotEmpty(ctUser)) {
+ ctAccount = this.getByUserIdAndType(ctUser.getId(), UserBaseConsts.ACC_TYPE_1);
+ }
+ }
if (ObjectUtils.isNotEmpty(ctUser)) {
//有对应用户，则模拟登录，返回对应信息
UserLoginDTO userLoginDTO = login(ctAccount, ctUser);
@@ -449,7 +447,7 @@
}
//拿到用户角色菜单权限信息
GridRoleMenuVo gridRoleMenuVo = new GridRoleMenuVo();
- gridRoleMenuVo.setOrgRoleId(userRoleDTO.getRoleId());
+ gridRoleMenuVo.setOrgRoleId(userRoleDTO.getOrgRoleId());
gridRoleMenuVo.setMenuSys("sub-mdjfhj");
CtUserole roleMenu = sysClient.getRoleMenu(gridRoleMenuVo);
if (roleMenu == null || StringUtils.isEmpty(roleMenu.getRoleId())) {
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
index 25e28f1..a626ba0 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
@@ -358,7 +358,11 @@
ctUser.setJoinWay(UserBaseConsts.JOIN_WAY_1);
ctUser.setRealStatus(UserBaseConsts.REAL_STATUS_0);
ctUser.setStatus(UserBaseConsts.USER_STATUS_1);
- ctUser.setCustId(loginUser.getCustId());
+ if(loginUser!=null){
+ ctUser.setCustId(loginUser.getCustId());
+ }else {
+ ctUser.setCustId("-1");
+ }
mapper.insert(ctUser);
// 创建账号
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application.yml b/dyh-service/dyh-sync/src/main/resources/config/application.yml
index 882ac02..bd0819a 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application.yml
+++ b/dyh-service/dyh-sync/src/main/resources/config/application.yml
@@ -2,8 +2,8 @@
spring:
profiles:
active:
- - dev
-# - test
+# - dev
+ - test
# - prod
devtools:
restart:
--
Gitblit v1.8.0