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

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java

@@ -205,17 +205,17 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
 
             List<String> userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList());
             Result<List<UserBaseInfoResultDTO>> userInfo =
-                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+                    epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
             boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
             for(int i = NumConstant.ZERO ; i < dataList.size() ; i++){
 
-                WorkPointVerificationDetailResultDTO o = new WorkPointVerificationDetailResultDTO();
+                WorkPointVerificationDetailResultDTO o = ConvertUtils.sourceToTarget(dataList.get(i),WorkPointVerificationDetailResultDTO.class);
                 o.setPoint(new StringBuilder("-").append(dataList.get(i).getPoint().toString()).toString());
-                o.setRemark(dataList.get(i).getRemark());
                 if(userRequestCallback) {
                     //如果是陌生人显示微信昵称
                     o.setUserNickname(userInfo.getData().get(i) == null ? ModuleConstant.EMPTY_STR : (StringUtils.isBlank(userInfo.getData().get(i).getShowName()) ? userInfo.getData().get(i).getNickname() : userInfo.getData().get(i).getShowName()));
                 }
+
                 resultObj.add(o);
             }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -108,17 +108,17 @@ public class UserBaseInfoRedis {
                     gridParam.setGridId(relation.getGridId());
                     baseInfo.setRegisteredGridId(relation.getGridId());
                     Result<BelongGridNameResultDTO> gridResult =
-                        govOrgOpenFeignClient.getGridNameByGridId(gridParam);
+                            govOrgOpenFeignClient.getGridNameByGridId(gridParam);
                     if(gridResult.success() && null != gridResult.getData()
                             && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){
                         String gridFullName = gridResult.getData().getBelongsGridName();
                         baseInfo.setRegisteredGridName(gridFullName);
                         StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname());
-                        switch(baseInfo.getGender()){
+                        switch (baseInfo.getGender()) {
-                            case NumConstant.ONE_STR :
+                            case NumConstant.ONE_STR:
                                 buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE);
                                 break;
-                            case  NumConstant.TWO_STR :
+                            case NumConstant.TWO_STR:
                                 buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE);
                                 break;
                             default:
@@ -126,18 +126,19 @@ public class UserBaseInfoRedis {
                         }
                         baseInfo.setShowName(buffer.toString());
                     }
-                }else{
+                }
-                    //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id
+            }else{
-                    LatestGridInfoResultDTO gridLatest =
+                //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id
+                LatestGridInfoResultDTO gridLatest =
                         gridLatestDao.selectLatestGridInfoByUserId(userId);
-                    if(null != gridLatest){
+                if(null != gridLatest){
-                        baseInfo.setCustomerId(gridLatest.getCustomerId());
+                    baseInfo.setCustomerId(gridLatest.getCustomerId());
-                    }
                 }
-                set(baseInfo);
-                return baseInfo;
             }
+            set(baseInfo);
+            return baseInfo;
         }
+
         return null;
     }
 }

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

@@ -197,7 +197,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
             if(StringUtils.isNotBlank(info.getUserId())){
                 UserBaseInfoResultDTO cache = userBaseInfoRedis.getUserInfo(info.getUserId());
                 if(null != cache) {
-                    info.setRegisteredGrid(cache.getRegisteredGridName());
+                    info.setRegisteredGrid(StringUtils.isBlank(cache.getRegisteredGridName()) ? ModuleConstant.EMPTY_STR : cache.getRegisteredGridName());
                 }
             }
         });

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

@@ -28,24 +28,28 @@
     <!-- 根据用户id查询user_base_info基本信息  -->
     <select id="selectListByUserIdList" parameterType="java.lang.String" resultType="com.epmet.dto.result.UserBaseInfoResultDTO">
         SELECT
-            ubi.id,
+        ubi.id,
-            ubi.USER_ID,
+        wechat.USER_ID,
-            ubi.MOBILE,
+        ubi.MOBILE,
-            ubi.SURNAME,
+        ubi.SURNAME,
-            ubi.`NAME`,
+        ubi.`NAME`,
-            ubi.real_name,
+        ubi.real_name,
-            ubi.ID_NUM,
+        ubi.ID_NUM,
-            ubi.GENDER,
+        ubi.GENDER,
-            ubi.STREET,
+        ubi.STREET,
-            ubi.DISTRICT,
+        ubi.DISTRICT,
-            ubi.BUILDING_ADDRESS,
+        ubi.BUILDING_ADDRESS,
-            ubi.NICKNAME,
+        wechat.NICKNAME,
-            ubi.HEAD_IMG_URL
+        wechat.HEAD_IMG_URL
-        FROM
+    FROM
-            user_base_info ubi
+        user_wechat wechat
-        WHERE
+        LEFT JOIN user_base_info ubi ON wechat.USER_ID = ubi.USER_ID
-            ubi.DEL_FLAG = '0'
+        AND wechat.DEL_FLAG = '0'
-            AND ubi.USER_ID = #{userId}
+        AND ubi.DEL_FLAG = '0'
+        AND ubi.USER_ID = #{userId}
+    WHERE
+        wechat.USER_ID = #{userId}
+
     </select>
 
     <!-- 根据用户id获取user_wechat表微信用户基本信息   -->

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

@@ -93,10 +93,10 @@
     <!-- 查询人员信息，排序，包括陌生人与注册居民，没有注册居民则只有微信昵称 -->
     <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUser4PointResultDTO">
         SELECT
-            wechat.USER_ID,
+        wechat.USER_ID,
-            wechat.NICKNAME AS userNickname,
+        IFNULL(wechat.NICKNAME,'') AS userNickname,
-            wechat.HEAD_IMG_URL AS userHeadPhoto,
+        IFNULL(wechat.HEAD_IMG_URL,'') AS userHeadPhoto,
-            base.REAL_NAME AS userName
+        IFNULL(base.REAL_NAME,'') AS userName
         FROM
             user_wechat wechat
         LEFT JOIN