From 1fb64291c04ba40551d34aeeef28c4e5cf60b315 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 16:27:53 +0800 Subject: [PATCH 01/11] =?UTF-8?q?bugfix=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B7=AF=E7=89=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IssueDetailResultDTO.java | 2 +- .../src/main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- .../src/main/java/com/epmet/dto/form/EditInfoFormDTO.java | 2 +- .../src/main/resources/mapper/UserResiInfoDao.xml | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java index 69ebc4476c..27478b1f63 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java +++ b/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; diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2156bddd41..2e5a394688 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -106,7 +106,7 @@ public class IssueServiceImpl implements IssueService { //话题发起人 String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); - issueDetailResult.setIssueInitiator(street + realName); + issueDetailResult.setIssueInitiator(realName); } }); } else { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java index 6ef7eb715e..5cc4b7ea6a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java +++ b/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; /** * 小区名称 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index d308058d06..999b63af7f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -171,8 +171,6 @@ 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 @@ -182,8 +172,6 @@ END ) AS issueInitiator, CONCAT( - uri.street, - '-', uri.surname, uri.NAME ) AS realUserName From 2b54859af14f55d5fd7ff2ccd4991728cf748f23 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 16:59:33 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B7=AF=E7=89=8C?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml | 4 ++-- .../src/main/resources/mapper/user/UserDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 9ba9386fb3..49dad70cf7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -7,13 +7,13 @@ 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 From 14aa8de2daf83adfc9ff82ac843b8a6380321b0b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 17:31:39 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8E=A5=E5=88=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 48b68b15d5..f7bd3df1be 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2754,7 +2754,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl{ if(issueResult.getUserId().equals(re.getUserId())){ //话题发起人 - String street = re.getStreet() == null ? "" : re.getStreet() + "-"; String realName = re.getRealName() == null ? "" : re.getRealName(); issueDetailResult.setIssueInitiator(realName); } From 8101b0985bdcbb26eb27d3480086f671a301ca8d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 25 Aug 2022 17:56:04 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 6 +++--- .../com/epmet/service/impl/UserResiInfoServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 3bb3a435d7..b5aed3822e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/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 Date: Fri, 26 Aug 2022 09:17:35 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserBaseInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 4cccbd7bf4..7f9b4077d9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -197,13 +197,13 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 09:23:25 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E8=A1=97?= =?UTF-8?q?=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index f7bd3df1be..21398d37e4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2775,8 +2775,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 10:32:29 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B8=85=E9=99=A4=E8=A1=97=E9=81=93?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/redis/UserBaseInfoRedis.java | 2 +- .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index 435b99f213..83b08d384e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/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); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 7f9b4077d9..56a5f56400 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -194,7 +194,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 11:10:31 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index b5aed3822e..8d502c339d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1022,10 +1022,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 14:05:09 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 7ff2a2b5e8..f6395793e7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -176,7 +176,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 14:35:42 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 21398d37e4..244bec4d5d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/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{ 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 {