Merge branch 'dev-PTYH-0806' into 'release'

Dev ptyh 0806

See merge request !75

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

 package com.pica.cloud.account.account.server.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.entity.AesBean.AesAuthCodeReq;
+import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.enums.SourceTypeEnum;
@@ -19,17 +18,14 @@ import com.pica.cloud.account.account.server.service.TokenService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
 import com.pica.cloud.account.account.server.util.RSAUtil;
-import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
-import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.redis.CacheClient;
 import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
 import com.pica.cloud.foundation.utils.annotation.LoginPermission;
-import com.pica.cloud.foundation.utils.entity.PicaUser;
-import com.pica.cloud.foundation.utils.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.catalina.servlet4preview.http.HttpServletRequest;
@@ -38,9 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.spring.web.json.Json;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @Api(description = "登录资源")
@@ -439,4 +433,13 @@ public class LoginController extends AccountBaseController {
         return PicaResponse.toResponse(login.getToken());
     }
 
+    @ApiOperation(value = "切换登录")
+    @PostMapping("/login/switch")
+    @EnabledLoginValidate
+    public PicaResponse<String> loginSwitch(@RequestBody EncryptEntity entity) throws Exception {
+        Map<String, Object> req = CryptoUtil.decrypt(entity, Map.class);
+        loginService.loginSwitch(super.getAccountUser(), super.getRedisClient().getToken(String.valueOf(req.get("token")), AccountUser.class));
+        return PicaResponse.toResponse();
+    }
+
 }

server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java

 package com.pica.cloud.account.account.server.service;
 
+import com.pica.cloud.account.account.server.entity.AccountUser;
 import com.pica.cloud.account.account.server.entity.LogLoginAes;
 import com.pica.cloud.account.account.server.entity.LoginResult;
 import com.pica.cloud.account.account.server.entity.PICAPDoctor;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 import com.pica.cloud.account.account.server.req.OneClickLoginReq;
 import com.pica.cloud.account.account.server.vo.OneClickLoginResultVo;
+import com.pica.cloud.foundation.utils.entity.PicaUser;
 
 public interface LoginService {
     /**
@@ -101,4 +103,6 @@ public interface LoginService {
 
     LoginResult loginQRCode(BaseRequest request);
 
+    void loginSwitch(AccountUser oldUser, AccountUser loginUser);
+
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -12,6 +12,7 @@ import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.enums.SourceTypeEnum;
+import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.*;
@@ -29,6 +30,7 @@ import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
 import com.pica.cloud.foundation.utils.utils.ValidateUtils;
 import com.pica.cloud.patient.smartcontract.common.utils.HttpClientCloudUtils;
@@ -47,6 +49,7 @@ import java.security.PublicKey;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class LoginServiceImpl implements LoginService {
@@ -1083,4 +1086,23 @@ public class LoginServiceImpl implements LoginService {
         return logLoginAesMapper.insert(aes);
     }
 
+    /**
+     *切换登录
+     */
+    @Override
+    public void loginSwitch(AccountUser oldUser, AccountUser loginUser) {
+        if (Objects.isNull(loginUser)) {
+            throw new PicaException(PicaResultCode.LOGIN_FAILE);
+        }
+        tokenUtils.tokenContinueTime(loginUser.getToken(), oldUser.getLoginFrom(), 0);
+        //记录登录日志
+        LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(
+                Integer.valueOf(String.valueOf(loginUser.getAcctId())),
+                oldUser.getLoginPlatform(), oldUser.getLoginFrom(),
+                AccountTypeEnum.LOGIN_WE_CHAT.getCode(),
+                oldUser.getLoginIp(),
+                AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
+                AccountTypeEnum.LOG_TYPE_LOGIN.getCode(), loginUser.getToken(), 1, oldUser.getUserTokenTourist());
+        picaLogUtils.info(entity);
+    }
 }