From ce767363a8ec3cbbf67f4ab30de074373457a5a1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 8 May 2021 14:36:36 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/topic/ResiTopicDTO.java | 15 ++++++++++++ .../resi/group/dto/topic/TopicDraftDTO.java | 15 ++++++++++++ .../dto/topic/form/CreateTopicFormDTO.java | 15 ++++++++++++ .../modules/topic/entity/ResiTopicEntity.java | 15 ++++++++++++ .../topic/entity/TopicDraftEntity.java | 16 +++++++++++++ .../service/impl/TopicDraftServiceImpl.java | 2 +- .../db/migration/V0.0.24__topic_locate.sql | 24 +++++++++++++++++++ 7 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.24__topic_locate.sql diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java index 03ca7df8d6..58d4e1bafa 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java @@ -88,6 +88,21 @@ public class ResiTopicDTO implements Serializable { */ private String dimension; + /** + * 定位地址 + * */ + private String locateAddress; + + /** + * 定位经度 + * */ + private String locateLongitude; + + /** + * 定位纬度 + * */ + private String locateDimension; + /** * 删除标记 0：未删除，1：已删除 */ diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java index 80fcc43105..e2747cdd83 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java @@ -103,6 +103,21 @@ public class TopicDraftDTO implements Serializable { */ private String dimension; + /** + * 定位地址 + * */ + private String locateAddress; + + /** + * 定位经度 + * */ + private String locateLongitude; + + /** + * 定位纬度 + * */ + private String locateDimension; + /** * 发布成功后的话题id */ diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java index e8daa37b2d..79d81c4fc9 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java @@ -44,6 +44,21 @@ public class CreateTopicFormDTO implements Serializable { @NotBlank(message = "地址信息不能为空") private String address; + /** + * 经度 + * */ + private String locateLongitude; + + /** + * 纬度 + * */ + private String locateDimension; + + /** + * 地址 + * */ + private String locateAddress; + /** * 省份 * */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java index 886b5d1ed1..738dfd36c9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java @@ -90,6 +90,21 @@ public class ResiTopicEntity extends BaseEpmetEntity { */ private String dimension; + /** + * 定位地址 + * */ + private String locateAddress; + + /** + * 定位经度 + * */ + private String locateLongitude; + + /** + * 定位纬度 + * */ + private String locateDimension; + /** * 议题Id */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java index 513e03c4cf..d4e87657e3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java @@ -103,6 +103,22 @@ public class TopicDraftEntity extends BaseEpmetEntity { */ private String dimension; + /** + * 定位地址 + * */ + private String locateAddress; + + /** + * 定位经度 + * */ + private String locateLongitude; + + /** + * 定位纬度 + * */ + private String locateDimension; + + /** * 发布成功后的话题id */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java index 8b800af1b5..96daf14858 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java @@ -851,7 +851,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Mon, 10 May 2021 10:13:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=BE=A4=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/group/GroupDataDao.xml | 20 +++++++++---------- .../service/ResiGroupMemberService.java | 10 ++++++++++ .../GroupMemeberOperationServiceImpl.java | 12 +++++------ .../impl/ResiGroupMemberServiceImpl.java | 18 +++++++++++++++++ .../mapper/member/ResiGroupMemberDao.xml | 7 +++++-- 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml index 9b6da626dc..4ec21cd214 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml @@ -26,12 +26,12 @@ COUNT(rgm.id) AS gridGroupPeopleTotal FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = #{state} AND rg.customer_id = #{customerId} - AND rgm.status != #{status} + AND (rgm.status = 'approved' OR rgm.status = 'silent') AND DATE_FORMAT(rgm.created_time,'%Y%m%d') #{dateId} GROUP BY rg.grid_id @@ -45,12 +45,12 @@ COUNT( rgm.id ) AS groupCount FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = #{state} AND rg.customer_id = #{customerId} - AND rgm.STATUS != #{status} + AND (rgm.status = 'approved' OR rgm.status = 'silent') AND DATE_FORMAT(rgm.created_time,'%Y%m%d') #{dateId} GROUP BY rgm.resi_group_id @@ -94,12 +94,12 @@ COUNT(rgm.id) AS gridGroupPeopleTotal FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = 'approved' AND rg.customer_id = #{customerId} - AND rgm.status != 'removed' + AND (rgm.status = 'approved' OR rgm.status = 'silent') AND DATE_FORMAT(rgm.created_time,'%Y%m%d') #{dateId} GROUP BY rg.grid_id @@ -112,12 +112,12 @@ COUNT( rgm.id ) AS groupCount FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = 'approved' AND rg.customer_id = #{customerId} - AND rgm.STATUS != 'removed' + AND (rgm.status = 'approved' OR rgm.status = 'silent') AND DATE_FORMAT(rgm.created_time,'%Y%m%d') #{dateId} GROUP BY rgm.resi_group_id @@ -145,12 +145,12 @@ COUNT( rgm.id ) AS groupCount FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = 'approved' AND rg.grid_id = #{gridId} - AND rgm.STATUS != 'removed' + AND (rgm.status = 'approved' OR rgm.status = 'silent') GROUP BY rgm.resi_group_id diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java index 2a0c0d9316..8027971cb6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java @@ -252,4 +252,14 @@ public interface ResiGroupMemberService extends BaseService getMemberList(String groupId); + + /** + * 查询小组人员信息 + * @author zhaoqifeng + * @date 2021/5/8 15:17 + * @param groupId + * @param userId + * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO + */ + ResiGroupMemberDTO getMemberInfo(String groupId, String userId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java index 343a6dbd64..90cf1e3b15 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java @@ -247,8 +247,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("RESI_GROUP_ID", groupId) + .eq("CUSTOMER_USER_ID", userId); + ResiGroupMemberEntity entity = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(entity, ResiGroupMemberDTO.class); + } + /** * @param groupMemberListFormDTO * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index 243b301d19..9fcc9983e6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -103,7 +103,8 @@ ) FROM RESI_GROUP groupp - INNER JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND member.STATUS ]]> 'removed' + INNER JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND (member.STATUS = 'approved' OR + member.STATUS = 'silent') WHERE groupp.DEL_FLAG = '0' AND @@ -122,7 +123,8 @@ ) as votableCount FROM RESI_GROUP groupp - LEFT JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND member.STATUS ]]> 'removed' + LEFT JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND (member.STATUS = 'approved' OR + member.STATUS = 'silent') WHERE groupp.DEL_FLAG = '0' AND @@ -163,6 +165,7 @@ AND CUSTOMER_USER_ID = #{userId} AND RESI_GROUP_ID = #{groupId} AND `STATUS` != 'removed' + AND `STATUS` != 'exit' From 547a3dfb3d7f8650790d5354107f4cea845190c6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 10 May 2021 10:45:52 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/topic/result/DraftDetailResultDTO.java | 9 +++++++++ .../result/ResiTopicIncludeIssueDetailResultDTO.java | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java index ed04fa23ac..dc8fda0ce1 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java @@ -42,6 +42,15 @@ public class DraftDetailResultDTO implements Serializable { * 发布地址 */ private String releaseAddress; + /** + * 经度 + */ + private String longitude; + + /** + * 维度 + */ + private String dimension; /** * 驳回理由 */ diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java index 06efffca1e..2bce88383f 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java @@ -41,6 +41,16 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable { * */ private String releaseAddress; + /** + * 经度 + */ + private String longitude; + + /** + * 维度 + */ + private String dimension; + /** * 话题内容 * */ From f0c16c22dd0b68ba2bf414d5555841807e67f7d6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 25 May 2021 10:33:33 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=BE=A4=E7=BB=84=20?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/GroupDataDao.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml index 4ec21cd214..de5fc6a9b9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml @@ -26,7 +26,7 @@ COUNT(rgm.id) AS gridGroupPeopleTotal FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = #{state} @@ -45,7 +45,7 @@ COUNT( rgm.id ) AS groupCount FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = #{state} @@ -94,7 +94,7 @@ COUNT(rgm.id) AS gridGroupPeopleTotal FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = 'approved' @@ -112,7 +112,7 @@ COUNT( rgm.id ) AS groupCount FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = 'approved' @@ -145,7 +145,7 @@ COUNT( rgm.id ) AS groupCount FROM resi_group rg - LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0 + LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0 WHERE rg.DEL_FLAG = 0 AND rg.state = 'approved' From ab056ec6c0d9831c4302a5c6b8fc2394a93c3ae7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 May 2021 13:36:27 +0800 Subject: [PATCH 5/8] =?UTF-8?q?wxcode=E8=8E=B7=E5=8F=96=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java index 95f8b34591..90cb5b5b4d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java @@ -41,6 +41,7 @@ public class WxLoginServiceImpl implements WxLoginService { @Override public UserWechatDTO resiAndWorkLogin(String appId, String wxCode, String customerId, String clientType) { //1.获取用户openid和session_key + logger.info(String.format("wxcode获取微信用户信息，接口入参appId：%s;wxCode：%s;customerId：%s;clientType：%s"), appId, wxCode, customerId, clientType); Map map = new HashMap<>(); map.put("appid", appId); map.put("js_code", wxCode); @@ -62,6 +63,7 @@ public class WxLoginServiceImpl implements WxLoginService { UserWechatDTO dto = new UserWechatDTO(); dto.setWxOpenId(openid); dto.setSessionKey(sessionKey); + logger.info("wxcode获取微信用户信息，接口返参UserWechatDTO->" + dto); /*//2.换取用户基本信息 //小程序access_token From a86aaae64194def64424816874dfaf2111476349 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 May 2021 15:18:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index ca009df6bb..2c3f734815 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -573,7 +573,7 @@