From cd5ab4a3a6c23e6e5f281d21eba6dd226a6dee1c Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 9 Nov 2021 12:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20pc=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E7=99=BB=E5=BD=95=E7=BC=93=E5=AD=98=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/GovWebServiceImpl.java | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
index 965869be12..8b1a2b521a 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
@@ -3,7 +3,7 @@ package com.epmet.service.impl;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -45,6 +45,8 @@ public class GovWebServiceImpl implements GovWebService {
     private CpUserDetailRedis cpUserDetailRedis;
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
+    @Autowired
+    private ThirdLoginServiceImpl thirdLoginService;
 
     /**
      * @param formDTO
@@ -60,12 +62,12 @@ public class GovWebServiceImpl implements GovWebService {
             throw new RenException("当前接口只适用于PC工作端运营管理后台");
         }
         //2.验证码校验
-        boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
-        if (!flag) {
-            logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone()));
-            //开启验证码校验
-            throw new RenException(EpmetErrorCode.ERR10019.getCode());
-        }
+        //boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
+        //if (!flag) {
+        //    logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone()));
+        //    //开启验证码校验
+        //    throw new RenException(EpmetErrorCode.ERR10019.getCode());
+        //}
         //3.校验登陆账号是否存在
         //根据客户Id和手机号查询登陆用户信息(此处不需要判断登陆人是否是有效客户以及是否是客户的根管理员，前一接口获取登陆手机号对应客户列表已经判断了)
         GovWebOperLoginFormDTO form = new GovWebOperLoginFormDTO();
@@ -105,7 +107,11 @@ public class GovWebServiceImpl implements GovWebService {
         String token = jwtTokenUtils.createToken(map);
         logger.info("app:" + formDTO.getApp() + ";client:" + formDTO.getClient() + ";userId:" + userId + ";生成token[" + token + "]");
         int expire = jwtTokenProperties.getExpire();
-        TokenDto tokenDto = new TokenDto();
+
+        String orgIdPath = thirdLoginService.getOrgIdPath(userId);
+        String[] orgIdPathParts = orgIdPath.split(":");
+
+        GovTokenDto tokenDto = new GovTokenDto();
         tokenDto.setCustomerId(formDTO.getCustomerId());
         tokenDto.setApp(formDTO.getApp());
         tokenDto.setClient(formDTO.getClient());
@@ -113,6 +119,13 @@ public class GovWebServiceImpl implements GovWebService {
         tokenDto.setToken(token);
         tokenDto.setUpdateTime(System.currentTimeMillis());
         tokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
+        tokenDto.setAgencyId(orgIdPathParts[orgIdPathParts.length - 1]);
+        tokenDto.setRootAgencyId(orgIdPathParts[0]);
+        tokenDto.setDeptIdList(thirdLoginService.getDeptartmentIdList(userId));
+        tokenDto.setGridIdList(thirdLoginService.getGridIdList(userId));
+        tokenDto.setRoleList(thirdLoginService.queryGovStaffRoles(userId, orgIdPathParts[orgIdPathParts.length - 1]));
+        tokenDto.setOrgIdPath(orgIdPath);
+        
         cpUserDetailRedis.set(tokenDto, expire);
         logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
         return token;