Merge branch 'feature/dangjian'

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -30,8 +30,8 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-//@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
-@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://127.0.0.1:9068")
+//@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class, url = "http://127.0.0.1:9068")
 public interface UserFeignClient {
 
     /**
@@ -359,6 +359,9 @@ public interface UserFeignClient {
     @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
 
+    @PostMapping(value = "app-user/epdc-app/user/npmNeedCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<CachingUserInfoDTO> npmNeedCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
+
     /**
      * 根据用户ID需要缓存的用户信息
      *
@@ -495,6 +498,7 @@ public interface UserFeignClient {
 
     /**
      * 红色尖兵
+     *
      * @param dto
      * @return
      */
@@ -503,6 +507,7 @@ public interface UserFeignClient {
 
     /**
      * 骑士先锋
+     *
      * @param dto
      * @return
      */
@@ -511,6 +516,7 @@ public interface UserFeignClient {
 
     /**
      * 流动党员报到
+     *
      * @param dto
      * @return
      */

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -176,6 +176,11 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", formDTO);
     }
 
+    @Override
+    public Result<CachingUserInfoDTO> npmNeedCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "npmNeedCachingUserInfo", formDTO);
+    }
+
     @Override
     public Result<CachingUserInfoDTO> needCachingUserInfoByUserId(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfoByUserId", userId);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -133,7 +133,7 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getNMPToken(EpdcAppUserTokenFormDTO formDto) {
-        return this.getTokenByOpenId(this.getNMPWxUser(formDto.getWxCode()));
+        return this.getNPMTokenByOpenId(this.getNMPWxUser(formDto.getWxCode()));
     }
 
 
@@ -251,6 +251,19 @@ public class AppUserServiceImpl implements AppUserService {
         return this.getTokenByUserDto(userInfoResult.getData());
     }
 
+    private Result<EpdcAppAuthorizationDTO> getNPMTokenByOpenId(WxMaJscode2SessionResult wxMaJscode2SessionResult) {
+        // 查询当前微信是否已注册用户
+        EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO();
+        formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
+        formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid());
+        Result<CachingUserInfoDTO> userInfoResult = userFeignClient.npmNeedCachingUserInfo(formDTO);
+        if (!userInfoResult.success()) {
+            return new Result().error(userInfoResult.getMsg());
+        }
+        return this.getTokenByUserDto(userInfoResult.getData());
+    }
+
+
     /**
      * 用户登录
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java

@@ -432,6 +432,11 @@ public class EpdcAppUserController {
         return userService.queryCachingUserInfo(formDTO);
     }
 
+    @PostMapping("npmNeedCachingUserInfo")
+    public Result<CachingUserInfoDTO> npmNeedCachingUserInfo(@RequestBody EpdcAppQueryUserInfoFormDTO formDTO) {
+        return userService.queryNpmCachingUserInfo(formDTO);
+    }
+
     /**
      * 根据用户ID获取用户缓存信息
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java

@@ -202,6 +202,8 @@ public interface UserDao extends BaseDao<UserEntity> {
      **/
     CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
 
+    CachingUserInfoDTO selectNpmCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
+
     /**
      * @param userId
      * @return CachingUserInfoDTO

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java

@@ -352,6 +352,9 @@ public interface UserService extends BaseService<UserEntity> {
      **/
     Result<CachingUserInfoDTO> queryCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
 
+
+    Result<CachingUserInfoDTO> queryNpmCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
+
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Author yinzuomei

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java

@@ -513,7 +513,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (StringUtils.isNotBlank(identityNo)) {
             QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
             wrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo);
-            wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId());
+            wrapper.ne(formDto.getUserId() != null, FieldConstant.ID, formDto.getUserId());
             Integer count = this.baseDao.selectCount(wrapper);
             if (count > NumConstant.ZERO) {
                 return new Result().error("身份证号已被注册");
@@ -1365,6 +1365,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<CachingUserInfoDTO>().ok(cachingUserInfoDTO);
     }
 
+    @Override
+    public Result<CachingUserInfoDTO> queryNpmCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getOpenId())) {
+            throw new RenException("openId不能为空");
+        }
+        return new Result<CachingUserInfoDTO>().ok(baseDao.selectNpmCachingUserInfoDTO(formDTO.getOpenId(), formDTO.getUnionId()));
+    }
+
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Author yinzuomei
@@ -2097,8 +2105,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         entity1.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
         entity1.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
         LambdaUpdateWrapper<UserGridRelationEntity> updateWrapper = Wrappers.lambdaUpdate();
-        updateWrapper.eq(UserGridRelationEntity::getUserId,entity.getId());
+        updateWrapper.eq(UserGridRelationEntity::getUserId, entity.getId());
-        userGridRelationService.update(entity1,updateWrapper);
+        userGridRelationService.update(entity1, updateWrapper);
 
         return new Result<String>().ok("修改成功");
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -499,6 +499,45 @@
         limit 1
     </select>
 
+    <select id="selectNpmCachingUserInfoDTO" parameterType="map" resultMap="CachingUserInfoDTOMap">
+        SELECT
+        eu.ID,
+        eu.NICKNAME,
+        eu.MOBILE,
+        eu.FACE_IMG,
+        eu.SEX,
+        eu.REAL_NAME,
+        eu.STATE,
+        eu.REMARK,
+        eu.COUPLING_COMMUNITY,
+        (select r.GRID_ID
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.SWITCHED_TIME desc
+        limit 1
+        )as gridId,
+        (
+        select r.GRID
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.SWITCHED_TIME desc
+        limit 1
+        )as grid
+        FROM
+        epdc_user_djyl eu
+        WHERE
+        eu.DEL_FLAG = '0'
+        <if test="openId!=null and openId!=''">
+            and eu.WX_OPEN_ID=#{openId}
+        </if>
+        <if test="unionId!=null and unionId!=''">
+            and eu.WX_UNION_ID=#{unionId}
+        </if>
+        limit 1
+    </select>
+
     <!-- 根据用户id查询CachingUserInfoDTO   -->
     <select id="selectCachingUserInfoDTOByUserId" parameterType="java.lang.String" resultMap="CachingUserInfoDTOMap">
         SELECT