Merge branch 'bugfix_zhy'

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@@ -7,13 +7,13 @@
     <select id="selectUserInfosByUserIds" resultType="com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO">
         SELECT
             user_id,
-            CONCAT(STREET,'-',SURNAME,
+            CONCAT(SURNAME,
                    CASE WHEN GENDER = '1' THEN '先生'
                        WHEN GENDER = '2' THEN '女士'
                        ELSE '先生/女士' END
                 ) AS userShowName,
             HEAD_IMG_URL AS headPhoto,
-            CONCAT(STREET,'-',REAL_NAME) AS realName
+            CONCAT(REAL_NAME) AS realName
         FROM user_base_info
         WHERE DEL_FLAG = 0
           AND

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -521,7 +521,7 @@
 
     <select id="selectScreenProjectData" resultType="com.epmet.dto.screen.ScreenProjectDataDTO">
         SELECT
-        CONCAT( STREET, '-', SURNAME, CASE WHEN GENDER = '1' THEN '先生' WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS linkName,
+        CONCAT( SURNAME, CASE WHEN GENDER = '1' THEN '先生' WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS linkName,
         MOBILE AS linkMobile,
         USER_ID as topicId
         FROM

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -403,7 +403,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 		if (null != resiGroup  && ModuleConstant.GROUP_TYPE_BRANCH.equals(resiGroup.getGroupType())){
 			UserResiInfoResultDTO data = userResiInfo.getData();
-			userResiInfo.getData().setShowName(data.getStreet()+"-"+data.getSurname()+data.getName());
+			userResiInfo.getData().setShowName(data.getSurname()+data.getName());
 		}
 		return userResiInfo;
 	}
@@ -931,8 +931,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if("branch".equals(entity.getGroupType())){
 			//获取组长信息
 			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
-				String street = groupLeaderUserInfo.getData().getStreet() == null ? "" : groupLeaderUserInfo.getData().getStreet() + "-";
-				resultDTO.setLeaderName(street + groupLeaderUserInfo.getData().getSurname() + groupLeaderUserInfo.getData().getName());
+//				String street = groupLeaderUserInfo.getData().getStreet() == null ? "" : groupLeaderUserInfo.getData().getStreet() + "-";
+				resultDTO.setLeaderName(groupLeaderUserInfo.getData().getSurname() + groupLeaderUserInfo.getData().getName());
 			} else {
 				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId());
 			}
@@ -1022,10 +1022,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			//detail.setGroupLeaderName(userInfoResult.getData().get(0).getShowName().split("-")[NumConstant.ONE]);
 			//姓氏+名称
 			detail.setGroupLeaderName(userInfoResult.getData().get(0).getSurname() + userInfoResult.getData().get(0).getName());
-			detail.setStreet(userInfoResult.getData().get(0).getStreet());
-			StringBuffer buffer = new StringBuffer(detail.getStreet());
-			buffer.append(StringUtils.isBlank(buffer) ? "" : "-");
-			detail.setGroupLeaderName(buffer.append(detail.getGroupLeaderName()).toString());
+//			detail.setStreet(userInfoResult.getData().get(0).getStreet());
+//			StringBuffer buffer = new StringBuffer(detail.getStreet());
+//			buffer.append(StringUtils.isBlank(buffer) ? "" : "-");
+//			detail.setGroupLeaderName(buffer.append(detail.getGroupLeaderName()).toString());
 		}else{
 			logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND);
 		}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1559,9 +1559,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             resultDTOList.forEach(re->{
                 if(topicInfo.getPublishedUser().equals(re.getUserId())){
                     //话题发起人
-                    String street = re.getStreet() == null ? "" : re.getStreet() + "-";
+//                    String street = re.getStreet() == null ? "" : re.getStreet() + "-";
                     String realName = re.getRealName() == null ? "" : re.getRealName();
-                    topicInfo.setPublishedUser(street + realName);
+                    topicInfo.setPublishedUser(realName);
                 }
             });
         } else {
@@ -2754,7 +2754,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             ui.setReleaseUserHeadPhoto(u.getHeadImgUrl());
             ui.setMobile(u.getMobile());
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
-                ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
+                ui.setReleaseUserName(u.getRealName());
             }else {
                 if (StringUtils.isBlank(u.getGender())) {
                     //性别为空，默认为未知
@@ -2775,9 +2775,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 if (StringUtils.isNotBlank(u.getSurname())) {
                     name = u.getSurname().concat(gender);
                 }
-                String street = StringUtils.isNotBlank(u.getStreet()) ? u.getStreet() : StrConstant.EPMETY_STR;
-                if (StringUtils.isNotBlank(street) && StringUtils.isNotBlank(name)) {
-                    ui.setReleaseUserName(u.getStreet().concat("-").concat(name));
+//                String street = StringUtils.isNotBlank(u.getStreet()) ? u.getStreet() : StrConstant.EPMETY_STR;
+                if (StringUtils.isNotBlank(name)) {
+                    ui.setReleaseUserName(name);
                 } else {
                     log.warn(String.format("当前userId:%s,缓存信息缺失姓、街道等信息.....;群成员暂时显示昵称", u.getUserId()));
                     ui.setReleaseUserName(u.getNickname());

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java

@@ -43,7 +43,7 @@ public class IssueDetailResultDTO implements Serializable {
     private String belongsGridName;
 
     /**
-     * 议题发起人（山东路168-尹女士）
+     * 议题发起人（尹女士）
      */
     private String issueInitiator;
 

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -104,9 +104,8 @@ public class IssueServiceImpl implements IssueService {
             resultDTOList.forEach(re->{
                 if(issueResult.getUserId().equals(re.getUserId())){
                     //话题发起人
-                    String street = re.getStreet() == null ? "" : re.getStreet() + "-";
                     String realName = re.getRealName() == null ? "" : re.getRealName();
-                    issueDetailResult.setIssueInitiator(street + realName);
+                    issueDetailResult.setIssueInitiator(realName);
                 }
             });
         } else {

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

@@ -54,7 +54,7 @@ public class EditInfoFormDTO implements Serializable {
 	/**
 	 * 路牌号
 	 */
-	@NotBlank(message = "路牌号不能为空",groups = AddUserShowGroup.class)
+//	@NotBlank(message = "路牌号不能为空",groups = AddUserShowGroup.class)
 	private String street;
 	/**
 	 * 小区名称

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

@@ -135,7 +135,7 @@ public class UserBaseInfoRedis {
                             && 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());
+                        StringBuffer buffer = new StringBuffer(baseInfo.getSurname());
                         switch (baseInfo.getGender()) {
                             case NumConstant.ONE_STR:
                                 buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE);

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

@@ -194,16 +194,16 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             if(null!=baseInfo){
                 //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
                 //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
-                if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
+                if (StringUtils.isNotBlank(baseInfo.getSurname())) {
                     if ("1".equals(baseInfo.getGender())) {
                         //    男
-                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("先生")));
+                        baseInfo.setUserShowName(baseInfo.getSurname().concat("先生"));
                     } else if ("2".equals(baseInfo.getGender())) {
                         //   女
-                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士")));
+                        baseInfo.setUserShowName(baseInfo.getSurname().concat("女士"));
                     } else {
                         // 0 未知
-                        baseInfo.setUserShowName(baseInfo.getStreet().concat(StrConstant.HYPHEN).concat(baseInfo.getSurname().concat("女士/先生")));
+                        baseInfo.setUserShowName(baseInfo.getSurname().concat("女士/先生"));
                     }
                 } else {
                     //    社会为微信昵称

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

@@ -176,8 +176,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			resultDTO.setBuildingAddress(userBaseInfoResultDTO.getBuildingAddress());
 			resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
 			resultDTO.setShowName(StrConstant.EPMETY_STR);
-			if (StringUtils.isNotBlank(userBaseInfoResultDTO.getStreet()) && StringUtils.isNotBlank(userBaseInfoResultDTO.getSurname())){
-				String gender = null;
+			if (StringUtils.isNotBlank(userBaseInfoResultDTO.getSurname())){
+				String gender;
 				if (NumConstant.ONE_STR.equals(userBaseInfoResultDTO.getGender())) {
 					gender = UserConstant.MAN;
 				} else if (NumConstant.TWO_STR.equals(userBaseInfoResultDTO.getGender())) {
@@ -185,7 +185,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 				} else {
 					gender = UserConstant.MAN_WOMAN;
 				}
-				String leaderName = userBaseInfoResultDTO.getStreet().concat(StrConstant.HYPHEN).concat(userBaseInfoResultDTO.getSurname()).concat(gender);
+				String leaderName = userBaseInfoResultDTO.getSurname().concat(gender);
 				resultDTO.setShowName(leaderName);
 			}
 

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

@@ -62,8 +62,6 @@
             uri.RESI_VISIT_ID,
             ubi.BUILDING_ADDRESS,
                 CONCAT(
-                ubi.STREET,
-                '-',
                 ubi.SURNAME,
                 ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name,
@@ -83,8 +81,6 @@
         SELECT
             uri.USER_ID,
             CONCAT(
-            uri.STREET,
-            '-',
             uri.SURNAME,
             ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name
@@ -121,8 +117,6 @@
             ubi.DISTRICT,
             ubi.BUILDING_ADDRESS,
             CONCAT(
-            ubi.STREET,
-            '-',
             ubi.SURNAME,
             ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name,
@@ -141,8 +135,6 @@
     <select id="selectIssueInitiator" parameterType="com.epmet.dto.form.IssueInitiatorFormDTO" resultType="com.epmet.dto.result.IssueInitiatorResultDTO">
         SELECT
             CONCAT(
-                uri.street,
-                '-',
                 uri.surname,
                 CASE
             WHEN uw.sex = '1' THEN
@@ -154,8 +146,6 @@
             END
             ) AS issueInitiator,
             CONCAT(
-                uri.street,
-                '-',
                 uri.surname,
                 uri.NAME
             ) AS realUserName
@@ -171,8 +161,6 @@
     <select id="issueInitiatorByBaseInfo" parameterType="com.epmet.dto.form.IssueInitiatorFormDTO" resultType="com.epmet.dto.result.IssueInitiatorResultDTO">
         SELECT
             CONCAT(
-                uri.street,
-                '-',
                 uri.surname,
                 CASE
             WHEN uri.GENDER = '1' THEN
@@ -184,8 +172,6 @@
             END
             ) AS issueInitiator,
             CONCAT(
-                uri.street,
-                '-',
                 uri.surname,
                 uri.NAME
             ) AS realUserName