随手拍 token获取

epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java

@@ -206,6 +206,19 @@ public class ThirdLoginController {
         return new Result<ResiDingAppLoginResDTO>().ok(thirdLoginService.resiLoginInternalDing(formDTO));
     }
 
+    /**
+     * @Description: h5-登陆 随手拍 议事厅
+     * @param formDTO:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resiLoginHfive>
+     * @Author: lichao
+     * @Date: 2023/8/15 09:23
+     */
+    @PostMapping("resilogin-hfive")
+    public Result<ResiDingAppLoginResDTO> resiLoginHfive(@RequestBody HfiveLoginMdFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<ResiDingAppLoginResDTO>().ok(thirdLoginService.resiLoginHfive(formDTO));
+    }
+
     /**
      * 根据免登授权码, 获取登录用户身份
      *

epmet-auth/src/main/java/com/epmet/dto/form/HfiveLoginMdFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: h5-登陆 随手拍 议事厅 入参
+ * @Author: lichao
+ * @Date: 2023/8/15 09:25
+ */
+@Data
+public class HfiveLoginMdFormDTO {
+
+
+    @NotBlank(message = "phone不能为空")
+    private String phone;
+
+
+}
+

epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java

@@ -111,6 +111,13 @@ public interface ThirdLoginService {
 	 */
 	ResiDingAppLoginResDTO resiLoginInternalDing(DingAppLoginMdFormDTO formDTO);
 
+	/**
+	 * h5-登陆 随手拍 议事厅
+	 * @param formDTO
+	 * @return
+	 */
+	ResiDingAppLoginResDTO resiLoginHfive(HfiveLoginMdFormDTO formDTO);
+
 	/**
 	 * desc:企业内部应用 工作端登录
 	 * @param formDTO

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -943,6 +943,30 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         return token;
     }
 
+    private String saveTokenDtoHfive(String app,String client, String userId,String customerId) {
+        //生成token串
+        Map<String, Object> map = new HashMap<>();
+        map.put(AppClientConstant.APP, app);
+        // map.put(AppClientConstant.CLIENT, client);
+        // 第三方企业应用传应用的SuiteKey 作为client
+        map.put(AppClientConstant.CLIENT, client);
+        map.put("userId", userId);
+        String token = jwtTokenUtils.createToken(map);
+        int expire = jwtTokenProperties.getExpire();
+        TokenDto tokenDto = new TokenDto();
+        tokenDto.setCustomerId(customerId);
+        tokenDto.setApp(app);
+        tokenDto.setClient(client);
+        tokenDto.setUserId(userId);
+        tokenDto.setToken(token);
+        tokenDto.setUpdateTime(System.currentTimeMillis());
+        tokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
+        cpUserDetailRedis.set(tokenDto, expire);
+        // cpUserDetailRedis.setForDingApp(miniAppId,tokenDto, expire);
+        logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
+        return token;
+    }
+
     @Override
     public ResiDingAppLoginResDTO resiLoginDingMd(DingAppLoginMdFormDTO formDTO) {
         // 获取用户手机号
@@ -1075,6 +1099,47 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         return resDTO;
     }
 
+    /**
+     * h5-登陆 随手拍 议事厅
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public ResiDingAppLoginResDTO resiLoginHfive(HfiveLoginMdFormDTO formDTO) {
+        // 获取用户手机号
+        log.info("1、钉钉居民端应用登录入参:" + JSON.toJSONString(formDTO));
+        ResiDingAppLoginResDTO resDTO =  new ResiDingAppLoginResDTO();
+        resDTO.setCustomerId(getCurrentCustomerId());
+
+        // 1、获取用户手机号
+//        DingLoginResiFormDTO dingLoginResiFormDTO = getDingLoginResiFormDTOInternal(formDTO.getMiniAppId(), formDTO.getAuthCode());
+        HfiveLoginResiFormDTO hfiveLoginResiFormDTO = new HfiveLoginResiFormDTO();
+        // todo 目前只有手机号以及customerId
+        hfiveLoginResiFormDTO.setCustomerId(resDTO.getCustomerId());
+        hfiveLoginResiFormDTO.setMobile(formDTO.getPhone());
+        // todo 暂时无信息获取 编写h5
+        resDTO.setRealName("h5");
+        // 2、调用userfeign接口获取userId、注册网格相关信息
+        Result<DingLoginResiResDTO> loginResiResDTOResult = epmetUserOpenFeignClient.hFiveResiLogin(hfiveLoginResiFormDTO);
+        if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) {
+            // 临时打个日志
+            log.error(String.format("resiLoginHfive获取epmetUserId异常,入参：%s", JSON.toJSONString(hfiveLoginResiFormDTO)));
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取epmetUserId异常:"+ JSON.toJSONString(loginResiResDTOResult), "获取epmetUserId异常");
+        }
+        DingLoginResiResDTO resiResDTO = loginResiResDTOResult.getData();
+        resDTO.setGridId(resiResDTO.getGridId());
+        resDTO.setGridName(resiResDTO.getGridName());
+        resDTO.setAgencyId(resiResDTO.getAgencyId());
+        resDTO.setEpmetUserId(resiResDTO.getEpmetUserId());
+        resDTO.setRegFlag(resiResDTO.getRegFlag());
+
+        // 3.生成token，并且存放Redis
+        String token = this.saveTokenDtoHfive(AppClientConstant.APP_RESI, AppClientConstant.H_FIVE, resDTO.getEpmetUserId(), resDTO.getCustomerId());
+        resDTO.setAuthorization(token);
+
+        return resDTO;
+    }
+
     @Override
     public UserTokenResultDTO govLoginInternalDing(DingAppLoginMdFormDTO formDTO) {
         // 获取用户手机号

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java

@@ -37,6 +37,11 @@ public interface AppClientConstant {
      */
     String MINI_DING = "mini_ding";
 
+    /**
+     * H5
+     */
+    String H_FIVE = "h_five";
+
     /**
      * 客户来源App
      * */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/HfiveLoginResiFormDTO.java

@@ -0,0 +1,56 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: h5 登陆获取或者是注册
+ * @Author: lichao
+ * @Date: 2023/8/15 10:18
+ */
+@Data
+public class HfiveLoginResiFormDTO {
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "customerId不能为空", groups = AddUserShowGroup.class)
+    private String customerId;
+
+    // 以下参数是微信返回的
+    /**
+     * 头像URL。
+     */
+//    public String avatarUrl;
+    /**
+     * 用户的个人邮箱。
+     */
+//    public String email;
+    /**
+     * 用户的手机号。
+     * 说明 如果要获取用户手机号，需要在开发者后台申请个人手机号信息权限，如下图。
+     */
+    @NotBlank(message = "手机号不能为空", groups = AddUserShowGroup.class)
+    public String mobile;
+    /**
+     * 用户的钉钉昵称。
+     */
+//    public String nick;
+    /**
+     *
+     */
+//    public String openId;
+    /**
+     * 手机号对应的国家号。
+     */
+//    public String stateCode;
+    /**
+     *
+     */
+//    public String unionId;
+}
+

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -981,6 +981,9 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/userbaseinfo/dingResiLogin")
     Result<DingLoginResiResDTO> dingResiLogin(@RequestBody  DingLoginResiFormDTO formDTO);
 
+    @PostMapping("/epmetuser/userbaseinfo/hFiveResiLogin")
+    Result<DingLoginResiResDTO> hFiveResiLogin(@RequestBody  HfiveLoginResiFormDTO formDTO);
+
     @PostMapping("/epmetuser/dataSyncConfig/dataSyncForYanTaiTask")
     Result dataSyncForYanTaiTask(@RequestBody DataSyncTaskParam formDTO);
 

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -712,6 +712,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "dingResiLogin", formDTO);
     }
 
+    @Override
+    public Result<DingLoginResiResDTO> hFiveResiLogin(HfiveLoginResiFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "hFiveResiLogin", formDTO);
+    }
+
     @Override
     public Result dataSyncForYanTaiTask(DataSyncTaskParam formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "dataSyncForYanTaiTask", formDTO);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java

@@ -238,6 +238,18 @@ public class UserBaseInfoController {
         return new Result<DingLoginResiResDTO>().ok(userBaseInfoService.dingResiLogin(formDTO));
     }
 
+    /**
+     * @Description: h5 议事厅 登陆 逻辑同上dingResiLogin
+     * @param formDTO:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.DingLoginResiResDTO>
+     * @Author: lichao
+     * @Date: 2023/8/15 10:18
+     */
+    @PostMapping("hFiveResiLogin")
+    public Result<DingLoginResiResDTO> hFiveResiLogin(@RequestBody HfiveLoginResiFormDTO formDTO){
+        return new Result<DingLoginResiResDTO>().ok(userBaseInfoService.hFiveResiLogin(formDTO));
+    }
+
     /**
      * 来源于烟台需求，pc端新增菜单：用户完善信息列表
      * @return

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java

@@ -23,10 +23,7 @@ import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserBaseInfoDTO;
-import com.epmet.dto.form.CommonUserIdFormDTO;
-import com.epmet.dto.form.DingLoginResiFormDTO;
-import com.epmet.dto.form.PageRegUserFormDTO;
-import com.epmet.dto.form.VolunteerRegResiFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.UserBaseInfoEntity;
 
@@ -222,6 +219,9 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
      */
     DingLoginResiResDTO dingResiLogin(DingLoginResiFormDTO formDTO);
 
+
+    DingLoginResiResDTO hFiveResiLogin(HfiveLoginResiFormDTO formDTO);
+
     /**
      * 用户完善信息列表
      * @param formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -635,6 +635,89 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         return result;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public DingLoginResiResDTO hFiveResiLogin(HfiveLoginResiFormDTO formDTO) {
+        DingLoginResiResDTO result = new DingLoginResiResDTO();
+        result.setCustomerId(formDTO.getCustomerId());
+        result.setRegFlag(false);
+        result.setGridId(StrConstant.EPMETY_STR);
+        result.setGridName(StrConstant.EPMETY_STR);
+        result.setAgencyId(StrConstant.EPMETY_STR);
+        RLock lock = null;
+        try {
+            lock = distributedLock.getLock(String.format("epmet:lock:dingResiLogin:%s",formDTO.getMobile()), 120L, 3L, TimeUnit.SECONDS);
+            //根据手机号从baseinfo查对应的信息，如果有则返回，没有则注册
+            UserBaseInfoEntity baseInfo = baseDao.selectUserByMobile(formDTO.getCustomerId(),formDTO.getMobile());
+            if (null == baseInfo) {
+                //注册
+                UserEntity userEntity = new UserEntity();
+                userEntity.setFromApp(AppClientConstant.APP_RESI);
+                userEntity.setFromClient(AppClientConstant.MINI_DING);
+                userEntity.setCustomerId(formDTO.getCustomerId());
+                userDao.insert(userEntity);
+                //信息存入baseinfo
+                baseInfo = new UserBaseInfoEntity();
+                baseInfo.setCustomerId(formDTO.getCustomerId());
+                baseInfo.setUserId(userEntity.getId());
+                baseInfo.setMobile(formDTO.getMobile());
+                // todo 没有值  假的
+                baseInfo.setRealName("h5");
+                baseInfo.setSurname("h5");
+                baseInfo.setName("h5");
+                baseInfo.setNickname("h5");
+                baseInfo.setHeadImgUrl("");
+                // todo--------- 以上都是假的
+                baseInfo.setGender(NumConstant.ZERO_STR);
+                baseDao.insert(baseInfo);
+
+                result.setEpmetUserId(userEntity.getId());
+                result.setRegFlag(false);
+            } else {
+                // 更新下user_Base_info信息
+                // todo h5那边没有传过来信息 所以不需要更新
+                /*if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getRealName())) {
+                    baseInfo.setRealName(formDTO.getNick());
+                }
+                if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getSurname())) {
+                    baseInfo.setSurname(NameUtils.getSurNameComplex(formDTO.getNick()));
+                }
+                if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getName())) {
+                    baseInfo.setName(NameUtils.getNameComplex(formDTO.getNick()));
+                }
+                if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getNickname())) {
+                    baseInfo.setNickname(formDTO.getNick());
+                }
+                if (StringUtils.isNotBlank(formDTO.getAvatarUrl()) && StringUtils.isBlank(baseInfo.getHeadImgUrl())) {
+                    baseInfo.setHeadImgUrl(formDTO.getAvatarUrl());
+                }
+                baseDao.updateById(baseInfo);
+                */
+
+                result.setEpmetUserId(baseInfo.getUserId());
+                LambdaQueryWrapper<RegisterRelationEntity> registerWrapper = new LambdaQueryWrapper<>();
+                registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId());
+                registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId());
+                registerWrapper.eq(RegisterRelationEntity::getFirstRegister, NumConstant.ONE_STR);
+                RegisterRelationEntity registerRelation = registerRelationDao.selectOne(registerWrapper);
+                if (null != registerRelation) {
+                    result.setAgencyId(registerRelation.getAgencyId());
+                    result.setGridId(registerRelation.getGridId());
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(registerRelation.getGridId());
+                    if (null == gridInfo) {
+                        logger.error(String.format("获取用户注册网格信息为空,userId:%s,gridId:%s", baseInfo.getUserId(), registerRelation.getGridId()));
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格信息为空", "获取小程序注册网格信息失败");
+                    }
+                    result.setGridName(gridInfo.getGridNamePath());
+                    result.setRegFlag(true);
+                }
+            }
+        } finally {
+            distributedLock.unLock(lock);
+        }
+        return result;
+    }
+
     /**
      * 用户完善信息列表
      *