Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_badge_log_20210315

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java

@@ -47,4 +47,12 @@ public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
 
 
     RegisterRelationEntity selectRegisteredGridIdByUserIdAndCustomerId(@Param("userId") String userId, @Param("customerId")String customerId);
+
+    /**
+     * @Description  根据userId查询注册网格ID
+     * @Param userId
+     * @author zxc
+     * @date 2021/3/16 下午3:05
+     */
+    String selectRegisterGridIdByUserId(@Param("userId")String userId);
 }

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

@@ -112,4 +112,6 @@ public interface RegisterRelationService extends BaseService<RegisterRelationEnt
      * @Author sun
      **/
     Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO);
+
+    String selectRegisterGridIdByUserId(String userId);
 }

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

@@ -118,6 +118,14 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
      **/
     List<UserBaseInfoResultDTO> queryUserBaseInfo(List<String> userIdList);
 
+    /**
+     * @Description  查询用户信息
+     * @Param userIdList
+     * @author zxc
+     * @date 2021/3/16 下午2:52
+     */
+    List<UserBaseInfoResultDTO> queryUserBaseInfoPlus(List<String> userIdList);
+
     /**
      * @return void
      * @param

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

@@ -339,4 +339,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         return new Result();
     }
 
+    @Override
+    public String selectRegisterGridIdByUserId(String userId) {
+        return baseDao.selectRegisterGridIdByUserId(userId);
+    }
+
 }

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

@@ -194,7 +194,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         }else {
             List<String> oneUserIds = new ArrayList<>();
             oneUserIds.add(userId);
-            List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(oneUserIds);
+            List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfoPlus(oneUserIds);
             log.info("user【"+userId+"】基本信息："+userBaseInfoResultDTOS.toString());
             if (!CollectionUtils.isEmpty(userIds)) {
                 AtomicReference<Boolean> status = new AtomicReference<>(true);

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

@@ -40,6 +40,7 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
+import com.epmet.service.RegisterRelationService;
 import com.epmet.service.UserBaseInfoService;
 import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
@@ -77,6 +78,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     private GridLatestDao gridLatestDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private RegisterRelationService registerRelationService;
 
     @Override
     public PageData<UserBaseInfoDTO> page(Map<String, Object> params) {
@@ -181,6 +184,27 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         return userBaseInfoList;
     }
 
+    @Override
+    public List<UserBaseInfoResultDTO> queryUserBaseInfoPlus(List<String> userIdList) {
+        if (CollectionUtils.isEmpty(userIdList)){
+            return new ArrayList<>();
+        }
+        List<UserBaseInfoResultDTO> result = new ArrayList<>();
+        userIdList.forEach(id -> {
+            UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
+            if (null != baseInfo && StringUtils.isEmpty(baseInfo.getRegisteredGridId())){
+                String gridId = registerRelationService.selectRegisterGridIdByUserId(id);
+                if (StringUtils.isNotEmpty(gridId)){
+                    baseInfo.setRegisteredGridId(gridId);
+                }else {
+                    throw new RenException("查询用户【"+id+"】所属网格失败");
+                }
+            }
+            result.add(baseInfo);
+        });
+        return result;
+    }
+
     /**
      * @return void
      * @author yinzuomei

epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml

@@ -72,5 +72,10 @@
             LIMIT 1
     </select>
 
+    <!-- 根据userId查询注册网格ID -->
+    <select id="selectRegisterGridIdByUserId" resultType="java.lang.String">
+        SELECT GRID_ID FROM register_relation WHERE DEL_FLAG = 0 and USER_ID = #{userId}
+    </select>
+
 
 </mapper>