Merge branch 'release' into 'master'

Release



See merge request !44

common/src/main/java/com/pica/cloud/account/account/common/req/circle/DiyAcctInit.java

+package com.pica.cloud.account.account.common.req.circle;
+
+public class DiyAcctInit {
+
+    private String userName;
+
+    private String decryMobile;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDecryMobile() {
+        return decryMobile;
+    }
+
+    public void setDecryMobile(String decryMobile) {
+        this.decryMobile = decryMobile;
+    }
+}

common/src/main/java/com/pica/cloud/account/account/common/req/circle/DiyAcctInitReq.java

+package com.pica.cloud.account.account.common.req.circle;
+
+import java.util.List;
+
+public class DiyAcctInitReq {
+
+    private List<String> decryMobileList;
+
+    public List<String> getDecryMobileList() {
+        return decryMobileList;
+    }
+
+    public void setDecryMobileList(List<String> decryMobileList) {
+        this.decryMobileList = decryMobileList;
+    }
+}

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

@@ -174,7 +174,14 @@ public class AccountController extends AccountBaseController {
 
         //登录成功，清除旧token，生成新token
         String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
-        String newToken = this.generateToken(account, deviceType);
+//        String newToken = this.generateToken(account, deviceType);
+        String newToken = "";
+        if(deviceType.equals("1")){
+            newToken = this.generateToken(account, "4"); //pc端注册，目前无法生成新token
+        }else {
+            newToken = this.generateToken(account, deviceType);
+        }
+
         intactUtil.sendIntact(batchNo,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"req:"+ JSON.toJSONString(req));
         return PicaResponse.toResponse(newToken);
     }
@@ -207,7 +214,12 @@ public class AccountController extends AccountBaseController {
         accountService.createAccount(account,null);
 
         //生成token并返回
-        String newToken = this.generateToken(account, deviceType);
+        String newToken = "";
+        if(deviceType.equals("1")){
+            newToken = this.generateToken(account, "4"); //pc端注册，目前无法生成新token
+        }else {
+            newToken = this.generateToken(account, deviceType);
+        }
 
         LoginResult result = new LoginResult();
         result.setToken(newToken);

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

 package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
+import com.pica.cloud.account.account.common.req.circle.DiyAcctInitReq;
 import com.pica.cloud.account.account.server.service.CircleAccountService;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
@@ -35,4 +36,10 @@ public class CircleUserController {
         return PicaResponse.toResponse(circleAccountService.createCircleAccount(circleAcctInitReq));
     }
 
+    @PostMapping("/acct/decryMobile")
+    @EnabledLoginValidate
+    public PicaResponse<List<Integer>> circleUserInitDecryMobile(@RequestBody DiyAcctInitReq diyAcctInitReq) {
+        return PicaResponse.toResponse(circleAccountService.createDiyAccount(diyAcctInitReq));
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.pica.cloud.account.account.server.service;
 
 
 import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
+import com.pica.cloud.account.account.common.req.circle.DiyAcctInitReq;
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
 
@@ -17,5 +18,7 @@ public interface CircleAccountService {
     //创建圈子入口-用户账号
     List<Integer> createCircleAccount(CircleAcctInitReq circleAcctInitReq);
 
+    //批量创建用户-  手机号，姓名
+    List<Integer> createDiyAccount(DiyAcctInitReq diyAcctInitReq);
 
 }

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

@@ -3,11 +3,15 @@ package com.pica.cloud.account.account.server.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.common.req.circle.CircleAcctInit;
 import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
+import com.pica.cloud.account.account.common.req.circle.DiyAcctInit;
+import com.pica.cloud.account.account.common.req.circle.DiyAcctInitReq;
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.service.AccountService;
 import com.pica.cloud.account.account.server.service.CircleAccountService;
+import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
+import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,4 +69,33 @@ public class CircleAccountServiceImpl implements CircleAccountService {
         return savedIds;
     }
 
+    @Override
+    public List<Integer> createDiyAccount(DiyAcctInitReq diyAcctInitReq) {
+        logger.info("createDiyAccount:{}", JSONObject.toJSONString(diyAcctInitReq));
+        List<Integer> savedIds = new ArrayList<>();
+        try {
+            for(String decryMobile : diyAcctInitReq.getDecryMobileList()){
+                String encryMobile = EncryptUtils.encryptContent(decryMobile, EncryptConstants.ENCRYPT_TYPE_MOBILE);
+
+                Account dbAcct = accountMapper.getByMobilePhone(encryMobile);  //获取医生表账号信息
+                if(null == dbAcct){
+                    Account account = new Account();
+                    account.setMobilePhone(encryMobile);
+                    account.setRegisterSource(5); //admin
+                    accountService.createAccount(account,AccountTypeEnum.PRODUCT_TYPE_ECO_LIVE.getCode());
+                    savedIds.add(account.getId().intValue());
+                    logger.info("createDiyAccount insert {}",account.getId().intValue());
+                }else {
+                    savedIds.add(dbAcct.getId().intValue());
+                    logger.info("createDiyAccount exist {}",dbAcct.getId().intValue());
+                }
+            }
+        }catch (Exception e){
+            logger.error("createDiyAccount error:{}",e.getMessage());
+            throw e;
+        }
+
+        return savedIds;
+    }
+
 }

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

@@ -407,8 +407,12 @@ public class LoginServiceImpl implements LoginService {
                 account.setId(userId);
                 account.setAcctId(acctId.intValue());
                 account.setCreatTime(new Date());
-                //account.setMobilePhone(request.getMobile());
+                Doctor d = doctorInfoMapper.selectByPrimaryKey(Math.toIntExact(userId));
+                if (d != null && StringUtils.isNotBlank(d.getMobilePhone())){
+                    account.setMobilePhone(AESUtil.decryptV0(d.getMobilePhone()));
+                } else {
                     account.setMobilePhone("");
+                }
                 account.setRegisterSource(request.getSourceType());
                 String newToken = tokenUtils.generateToken(account);
                 LoginResult result = new LoginResult();