Merge branch 'hpgp' into hpgp-m

cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/constant/enums/LoginTypeEnum.java

@@ -45,6 +45,7 @@ public enum LoginTypeEnum {
      * 上海交通大学医学院附属第九人民医院黄浦分院
      */
     WOA_WD("woa_wd", "万达公众号用户系统公众号登录"),
+    WOA_ND("woa_nd", "万达公众号用户系统南东社区公众号登录"),
 
     /**
      * H5登录

cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/dto/WOAWDUserInfo.java

@@ -3,6 +3,7 @@ package cn.sh.stc.sict.cloud.common.core.dto;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 万达公众号-用户基础信息
@@ -23,4 +24,13 @@ public class WOAWDUserInfo {
     private Date regtime;
     private String openid;
 
+    private List<Card> cards;
+
+    @Data
+    public static class Card {
+        private String hospitalId;
+        private String cardType;
+        private String cardNo;
+    }
+
 }

cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/util/CryptUtil.java

@@ -292,6 +292,11 @@ public class CryptUtil {
     	String pwdjm = toAES(pwd, token);
 		System.out.println(toAES(name, token));
     	System.out.println(pwdjm);
+		String text = "FaU+wh88VZr4E+YufJyuJMnxPJlQtyst/BkgZ0chipVSTcKNXVEGj9AhQ99wPGzC3QeNAYTU0slgpjqPCEX9lg==";
+
+		String test = "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";
+
+		System.out.println(AESToString(test,token));
 
 //    	String pwdorigin = AESToString(pwdjm, token);
 //    	System.out.println(pwdorigin);

cloud-common/cloud-common-core/src/main/java/cn/sh/stc/sict/cloud/common/core/util/WoaUtil.java

@@ -104,6 +104,13 @@ public class WoaUtil {
     private final static String WOA_WD_PROXY_PASS_URL = "http://30.30.5.74:9988/woa/wd";
     private final static String WOA_WD_USER_INFO_URL = WOA_WD_PROXY_PASS_URL + "/api/hosservice/visit/GetUserInfoByToken";
 
+
+    private final static String WOA_WD_ND_PROXY_PASS_URL = "http://30.30.5.74:9988/woa/wdnd";
+    /**
+     * 南东社区公众号用户信息
+     */
+    private final static String WOA_WD_ND_USER_INFO_URL = WOA_WD_ND_PROXY_PASS_URL + "/gzh/user/token/info";
+
     public WOAZzUserInfo getZzUserInfo(String appid, String accessToken) {
         try {
             ZzUserApiEnum zzUserApiEnum = ZzUserApiEnum.find(appid);
@@ -142,4 +149,30 @@ public class WoaUtil {
 
     }
 
+    /**
+     *  获取万达南东社区公众号用户信息
+     * @param accessToken
+     * @return
+     */
+    public WOAWDUserInfo getThirdPartyUserInfo(String accessToken){
+        try {
+            HttpResponse response = HttpRequest.get(WOA_WD_ND_USER_INFO_URL)
+                    .header("access-token", accessToken)
+                    .execute();
+            if (response.getStatus() != 200) {
+                log.error("万达公众号获取用户信息异常-1");
+                return null;
+            }
+            return JSONUtil.toBean(response.body(), WOAWDUserInfo.class);
+        } catch (Exception ex) {
+            log.error("万达公众号token获取用户信息异-2！");
+            log.error(ex.getMessage(), ex);
+            return null;
+        }
+    }
+
+
+
+
+
 }

smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/impl/SysUserBaseServiceImpl.java

@@ -100,6 +100,9 @@ public class SysUserBaseServiceImpl extends ServiceImpl<SysUserBaseMapper, SysUs
             // 万达公众号登录
             case WOA_WD:
                 return this.getWoaWDUserInfoByToken(split);
+            // 万达南东公众号登录
+            case WOA_ND:
+                return this.getWoaWDNDUserInfoByToken(split);
             // 微信登录
             default:
                 WxOAuth2AccessToken token = wxMpService.getOAuth2Service().getAccessToken(split[2]);
@@ -307,6 +310,55 @@ public class SysUserBaseServiceImpl extends ServiceImpl<SysUserBaseMapper, SysUs
         return info;
     }
 
+    private UserInfo getWoaWDNDUserInfoByToken(String[] infoArray) {
+        String source = infoArray[0];
+        String appId = infoArray[1];
+        String token = infoArray[2];
+        String hospitalCode = infoArray[3];
+
+        WOAWDUserInfo userInfo = WoaUtil.getThirdPartyUserInfo(token);
+        String userInfoStr = JSONUtil.toJsonStr(userInfo);
+        log.error("woa.login.wdndUser = {}", userInfoStr);
+        if (ObjectUtil.isNull(userInfo) || StrUtil.isBlank(userInfo.getId())) {
+            return null;
+        }
+
+        // 根据用户ID和手机号查询当前用户是否已注册过
+        LambdaQueryWrapper<SysUserBase> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUserBase::getOpenId, userInfo.getId())
+                .or()
+                .eq(SysUserBase::getPhone, userInfo.getMobile())
+                .orderByDesc(SysUserBase::getUpdateTime)
+                .last("limit 1");
+        SysUserBase user = this.getOne(wrapper);
+
+        // 未注册用户默认注册
+        if (user == null) {
+            user = new SysUserBase();
+            user.setUserName(userInfo.getMobile());
+            user.setOpenId(userInfo.getId());
+            user.setName(userInfo.getUsername());
+            user.setIdCard(userInfo.getPersoncard());
+            user.setSex(userInfo.getGender());
+            user.setHeadimg(userInfo.getAvator());
+            user.setSource(source);
+            user.setStatus(Constant.BYTE_NO);
+            user.setPasswd(ENCODER.encode(Constant.DEFAULT_PASSWORD));
+            user.setPhone(userInfo.getMobile());
+            user.setAppId(appId);
+
+            this.save(user);
+        }
+
+        UserInfo info = new UserInfo();
+        info.setSysUserBase(user);
+        info.setOpenId(userInfo.getId());
+
+        // 设置医疗机构代码，后续查询只显示当前医疗机构下的查询结果
+        info.setHospitalCode(hospitalCode);
+        return info;
+    }
+
     @Override
     public boolean saveDto(UserDTO dto) {
         if (NumberUtil.isNotNullOrZero(dto.getUser().getId())) {

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HphyPatientBaseController.java

@@ -182,6 +182,12 @@ public class HphyPatientBaseController {
                 log.error("wdUserInfo = {}", wdUserInfo);
                 base = hphyPatientBaseService.saveWoaWdInfo(current, wdUserInfo);
             }
+            // 万达南东社区公众后
+            if (LoginTypeEnum.WOA_ND.getType().equals(source)) {
+                WOAWDUserInfo wdUserInfo = WoaUtil.getThirdPartyUserInfo(token);
+                log.error("wdndUserInfo = {}", wdUserInfo);
+                base = hphyPatientBaseService.saveWoaWdInfo(current, wdUserInfo);
+            }
         }
 
         if (ObjectUtil.isNull(base) || NumberUtil.isNullOrZero(base.getId())) {

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/impl/HphyPatientBaseServiceImpl.java

@@ -159,6 +159,11 @@ public class HphyPatientBaseServiceImpl extends ServiceImpl<HphyPatientBaseMappe
                 base.setAge(String.valueOf(IdcardUtil.getAgeByIdCard(certId)));
                 base.setVerifyStatus(Constant.STRING_YES);
             }
+            if (CollUtil.isNotEmpty(userInfo.getCards())) {
+                WOAWDUserInfo.Card card = userInfo.getCards().get(0);
+                base.setMediCardId(card.getCardNo());
+                base.setMediCardType(card.getCardType());
+            }
             this.save(base);
             return base;
         }