From bfc8646ba149529d411fdbc6e4be87468d48c5f9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 25 Dec 2020 10:57:18 +0800 Subject: [PATCH 01/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E6=8F=90=20=E7=A7=AF=E5=88=86=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GroupMemeberOperationServiceImpl.java | 3 +- .../impl/ResiGroupMemberServiceImpl.java | 3 +- .../service/impl/ResiTopicServiceImpl.java | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) 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 8f4deee6c3..67a74321bf 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 @@ -333,10 +333,11 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl> userResponse = userClient.queryUserBaseInfo(userParam); if(userResponse.success() && !CollectionUtils.isEmpty(userResponse.getData())){ UserBaseInfoResultDTO user = userResponse.getData().get(NumConstant.ZERO); - pointEventMsg.setRemark( new StringBuilder("邀请").append("加入") + pointEventMsg.setRemark( new StringBuilder("邀请") .append(user.getStreet()).append("-").append(user.getSurname()) .append(StringUtils.equals(NumConstant.ONE_STR,user.getGender()) ? "先生" : StringUtils.equals(NumConstant.TWO_STR,user.getGender()) ? "女士" : "先生/女士") + .append("加入") .append(resiGroupDTO.getGroupName()).append("小组").toString()); } pointEventMsgList.add(pointEventMsg); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index ae48951046..9207200b6e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -545,10 +545,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl> userResponse = userOpenFeignClient.queryUserBaseInfo(userParam); if(userResponse.success() && !CollectionUtils.isEmpty(userResponse.getData())){ UserBaseInfoResultDTO user = userResponse.getData().get(NumConstant.ZERO); - pointEventMsg.setRemark( new StringBuilder("邀请").append("加入") + pointEventMsg.setRemark( new StringBuilder("邀请") .append(user.getStreet()).append("-").append(user.getSurname()) .append(StringUtils.equals(NumConstant.ONE_STR,user.getGender()) ? "先生" : StringUtils.equals(NumConstant.TWO_STR,user.getGender()) ? "女士" : "先生/女士") + .append("加入") .append(resiGroupDTO.getGroupName()).append("小组").toString()); } 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 03b37dc87d..c12a36fb6d 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 @@ -1580,8 +1580,43 @@ public class ResiTopicServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); //1.话题被转为议题 组内成员 + group.getTopicAuthorId(); + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setCustomerId(groupCache.getCustomerId()); + //pointEventMsg.setUserId(inviter); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime()); + pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag()); + + pointEventMsgList.add(pointEventMsg); + //2.转话题为议题 组长 + topicTurnIssueFromDTO.getUserId(); + + + pointEventMsg.setCustomerId(groupCache.getCustomerId()); + //pointEventMsg.setUserId(inviter); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime()); + pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag()); + + pointEventMsgList.add(pointEventMsg); + + mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); + if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ + log.error("事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO)); + } } else { ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class); From 4bc88ee320e972ac18486b33f55b39ca25435d2c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 25 Dec 2020 11:04:51 +0800 Subject: [PATCH 02/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/TopicDraftServiceImpl.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/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java index edac718249..f2cde9802d 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 @@ -278,9 +278,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl imageDTOList = new ArrayList<>(); if(CollectionUtils.isNotEmpty(formDTO.getImageList())){ - TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO(); int sort = 0; for(String url : formDTO.getImageList()){ + TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO(); attachment.setCustomerId(formDTO.getCustomerId()); attachment.setAttachmentUrl(url); attachment.setTopicDraftId(topic.getId()); @@ -299,9 +299,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl voiceDTOList = new ArrayList<>(); if(CollectionUtils.isNotEmpty(formDTO.getVideoList())){ - TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO(); int sort = 0; for(FileDTO file : formDTO.getVideoList()){ + TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO(); attachment.setCustomerId(formDTO.getCustomerId()); attachment.setAttachmentUrl(file.getUrl()); attachment.setTopicDraftId(topic.getId()); From 891a7b53db19c46199d56b6e96cdf04222d5f1b5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 25 Dec 2020 15:20:39 +0800 Subject: [PATCH 03/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/service/impl/TopicDraftServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 f2cde9802d..97532861c0 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 @@ -298,9 +298,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl voiceDTOList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(formDTO.getVideoList())){ + if(CollectionUtils.isNotEmpty(formDTO.getVoiceList())){ int sort = 0; - for(FileDTO file : formDTO.getVideoList()){ + for(FileDTO file : formDTO.getVoiceList()){ TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO(); attachment.setCustomerId(formDTO.getCustomerId()); attachment.setAttachmentUrl(file.getUrl()); @@ -309,6 +309,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Fri, 25 Dec 2020 17:05:50 +0800 Subject: [PATCH 04/37] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.7__issue_share.sql => V0.0.8__issue_share.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.7__issue_share.sql => V0.0.8__issue_share.sql} (100%) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__issue_share.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__issue_share.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__issue_share.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__issue_share.sql From 23a73f2d119c515b9951f019d8f00e2ff0aa0cdc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 25 Dec 2020 17:12:16 +0800 Subject: [PATCH 05/37] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=810.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.8__issue_share.sql => V0.0.9__issue_share.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/{V0.0.8__issue_share.sql => V0.0.9__issue_share.sql} (100%) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__issue_share.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.9__issue_share.sql similarity index 100% rename from epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__issue_share.sql rename to epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.9__issue_share.sql From a25380dc1ea32eeab17a816574672fe851a089a1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 25 Dec 2020 17:19:33 +0800 Subject: [PATCH 06/37] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=A1=88=E6=8B=BC=E6=8E=A5=20=20=20=20?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E8=84=9A=E6=9C=AC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.4__addNewRuleTemplate.sql | 4 +- .../impl/ResiTopicCommentServiceImpl.java | 17 +++- .../service/impl/ResiTopicServiceImpl.java | 90 ++++++++++++++++--- .../service/impl/TopicDraftServiceImpl.java | 37 ++++++-- 4 files changed, 128 insertions(+), 20 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.4__addNewRuleTemplate.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.4__addNewRuleTemplate.sql index 069008ec48..6c8838b5cf 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.4__addNewRuleTemplate.sql +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.4__addNewRuleTemplate.sql @@ -23,13 +23,13 @@ INSERT INTO point_rule_default ( VALUES ( '3','发布话题', - '对小组内话题进行15字以上评论','publish_one_topic', + '楼院小组内通过我有话说功能发布话题','publish_one_topic', '1','plus', 15,'每天上限为15分',null,'day',5,'time','0','0',0,'APP_USER',now(),'APP_USER',now() ), ( '4','参与话题', - '楼院小组内通过我有话说功能发布话题','participate_one_topic', + '对小组内话题进行15字以上评论','participate_one_topic', '1','plus', 6,'每天上限为6分',null,'day',2,'time','0','0',0,'APP_USER',now(),'APP_USER',now() ), diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index b51e0c02cb..02f9e44a2b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -43,6 +43,7 @@ import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.comment.entity.ResiTopicCommentEntity; import com.epmet.modules.constant.ResiGroupRedisKeys; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.group.redis.ResiGroupRedis; import com.epmet.modules.member.dao.ResiGroupMemberDao; import com.epmet.modules.member.redis.ResiGroupMemberRedis; import com.epmet.modules.member.service.ResiGroupMemberService; @@ -97,6 +98,9 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl NumConstant.FIFTEEN){ //mq的事件类型 MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO(); @@ -248,6 +252,17 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl NumConstant.TEN ? + (topic.getTopicContent().substring(NumConstant.TEN) + "…") : + topic.getTopicContent()); + builder.append("\""); + } + pointEventMsg.setRemark(builder.toString()); pointEventMsgList.add(pointEventMsg); mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); 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 c12a36fb6d..d17e85f490 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 @@ -1580,42 +1580,55 @@ public class ResiTopicServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); //1.话题被转为议题 组内成员 - group.getTopicAuthorId(); + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); pointEventMsg.setCustomerId(groupCache.getCustomerId()); - //pointEventMsg.setUserId(inviter); + pointEventMsg.setUserId(group.getTopicAuthorId()); pointEventMsg.setActionFlag(MqConstant.PLUS); pointEventMsg.setIsCommon(false); - //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime()); - pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag()); + //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题 + + pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的") + .append( + StringUtils.isBlank(topic.getTopicContent()) ? "语音话题" : + "\"" + + topic.getTopicContent() + .substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN) + + (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"") + ).append("被转为议题").toString()); pointEventMsgList.add(pointEventMsg); //2.转话题为议题 组长 - topicTurnIssueFromDTO.getUserId(); - pointEventMsg.setCustomerId(groupCache.getCustomerId()); - //pointEventMsg.setUserId(inviter); + pointEventMsg.setUserId(topicTurnIssueFromDTO.getUserId()); pointEventMsg.setActionFlag(MqConstant.PLUS); pointEventMsg.setIsCommon(false); - //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime()); pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag()); - + //将话题“某某某…” （前十个字后面省略号） 转为议题 + pointEventMsg.setRemark(new StringBuilder("将话题") + .append( + "\"" + + topic.getTopicContent() + .substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN) + + (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"") + ).append("转为议题").toString()); pointEventMsgList.add(pointEventMsg); mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ - log.error("事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO)); + log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO)); } } else { @@ -1699,6 +1712,59 @@ public class ResiTopicServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); + //1.话题被转为议题 组内成员 + + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setCustomerId(groupCache.getCustomerId()); + pointEventMsg.setUserId(group.getTopicAuthorId()); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + + //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题 + + pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的") + .append( + StringUtils.isBlank(topic.getTopicContent()) ? "语音话题" : + "\"" + + topic.getTopicContent() + .substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN) + + (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"") + ).append("被转为议题").toString()); + pointEventMsgList.add(pointEventMsg); + + //2.转话题为议题 组长 + + pointEventMsg.setCustomerId(groupCache.getCustomerId()); + pointEventMsg.setUserId(param.getUserId()); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag()); + //将话题“某某某…” （前十个字后面省略号） 转为议题 + pointEventMsg.setRemark(new StringBuilder("将话题") + .append( + "\"" + + topic.getTopicContent() + .substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN) + + (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"") + ).append("转为议题").toString()); + pointEventMsgList.add(pointEventMsg); + + mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); + if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ + log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(param)); + } } return issueInfo; } 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 97532861c0..753804175b 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 @@ -638,8 +638,15 @@ public class TopicDraftServiceImpl extends BaseServiceImpl item.setStatus(TopicConstant.APPROVED)); topicDraftAttachmentService.updateBatchById(ConvertUtils.sourceToTarget(voiceList, TopicDraftAttachmentEntity.class)); } + //发送积分 - sendMqMsg(draft.getCreatedBy(), draft.getCustomerId()); + StringBuilder breviary = new StringBuilder(); + if(!StringUtils.isBlank(draft.getTopicContent())){ + breviary.append("\""); + breviary.append(draft.getTopicContent().length() > NumConstant.TEN ? (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent()); + breviary.append("\""); + }else breviary.append("语音话题"); + sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString()); } //记录操作记录 entity = baseDao.selectById(formDTO.getTopicDraftId()); @@ -750,11 +757,30 @@ public class TopicDraftServiceImpl extends BaseServiceImpl NumConstant.TEN ? (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent()); + breviary.append("\""); + }else breviary.append("语音话题"); + sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString()); - private void sendMqMsg(String userId, String customerId) { + } + + /** + * @Description 发送积分事件 + * @param userId + * @param customerId + * @param targetDate 可为空 + * @param groupName + * @param topicBreviary 话题内容摘要"内容…" 如果没有文字则是"语音话题" + * @return void + * @author wangc + * @date 2020.12.25 15:45 + */ + private void sendMqMsg(String userId, String customerId, Date targetDate, String groupName, String topicBreviary) { //6.发送积分 MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO(); //mq的事件类型 @@ -767,6 +793,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Mon, 28 Dec 2020 09:48:51 +0800 Subject: [PATCH 07/37] =?UTF-8?q?=E5=8F=91=E9=80=81=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=8E=A5=E5=8F=A3=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiTopicServiceImpl.java | 34 +++++++++---------- .../service/impl/TopicDraftServiceImpl.java | 1 + 2 files changed, 18 insertions(+), 17 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 d17e85f490..c1c8324494 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 @@ -1610,21 +1610,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topic.getTopicContent().length() ? "\"" : "…\"") ).append("转为议题").toString()); - pointEventMsgList.add(pointEventMsg); + pointEventMsgList.add(pointEventMsg2); mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ @@ -1731,7 +1731,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topic.getTopicContent().length() ? "\"" : "…\"") ).append("转为议题").toString()); - pointEventMsgList.add(pointEventMsg); + pointEventMsgList.add(pointEventMsg2); mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ 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 753804175b..4e39fb27da 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 @@ -795,6 +795,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Tue, 29 Dec 2020 09:26:36 +0800 Subject: [PATCH 08/37] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E6=96=87=E5=AD=97=E8=AF=AD=E9=9F=B3=E4=BA=8C=E9=80=89=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/topic/service/impl/TopicDraftServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e39fb27da..773ebf3b1c 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 @@ -251,7 +251,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Tue, 29 Dec 2020 14:40:55 +0800 Subject: [PATCH 09/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/dao/TopicDraftScanTaskDao.java | 12 +++++++ .../service/TopicDraftScanTaskService.java | 2 ++ .../impl/TopicDraftScanTaskServiceImpl.java | 5 +++ .../service/impl/TopicDraftServiceImpl.java | 33 ++++++++++++------- .../mapper/topic/TopicDraftScanTaskDao.xml | 17 ++++++++++ 5 files changed, 57 insertions(+), 12 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java index 15be6e2e7c..ea0029cb1b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/TopicDraftScanTaskDao.java @@ -19,7 +19,9 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.TopicDraftScanTaskEntity; +import com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 话题附件检测任务表 @@ -29,5 +31,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface TopicDraftScanTaskDao extends BaseDao { + void updateByTask(TopicDraftScanTaskEntity entity); + + /** + * 获取检测任务信息 + * @author zhaoqifeng + * @date 2020/12/29 14:30 + * @param taskId + * @return com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO + */ + TopicDraftScanTaskDTO selectScanByTask(@Param("taskId") String taskId); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java index 91ae43076d..3b1608a18c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java @@ -94,4 +94,6 @@ public interface TopicDraftScanTaskService extends BaseService list = voiceResults.getData(); for (VoiceResultDTO item : list) { + TopicDraftScanTaskDTO taskDTO = topicDraftScanTaskService.getScanByTask(item.getTaskId()); if (TopicConstant.REVIEW.equals(item.getSuggestion())) { //结果不确定 TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(item.getDataId()); + dto.setId(taskDTO.getTopicDraftAttachmentId()); dto.setStatus(TopicConstant.REVIEW); dto.setReason(item.getLabelDesc()); topicDraftAttachmentService.update(dto); - TopicDraftScanTaskDTO taskDTO = new TopicDraftScanTaskDTO(); - taskDTO.setTaskId(item.getTaskId()); taskDTO.setStatus(TopicConstant.REVIEW); - topicDraftScanTaskService.updateByTask(taskDTO); + topicDraftScanTaskService.update(taskDTO); + + TopicDraftEntity draftEntity = new TopicDraftEntity(); + draftEntity.setId(topic.getId()); + draftEntity.setDraftStatus(TopicConstant.REVIEW); + draftEntity.setDraftReason("需要人工审核"); + baseDao.updateById(draftEntity); + isAllPass = false; } else if (TopicConstant.BLOCK.equals(item.getSuggestion())) { //结果违规 TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(item.getDataId()); + dto.setId(taskDTO.getTopicDraftAttachmentId()); dto.setStatus(TopicConstant.BLOCK); dto.setReason(item.getLabelDesc()); topicDraftAttachmentService.update(dto); - TopicDraftScanTaskDTO taskDTO = new TopicDraftScanTaskDTO(); - taskDTO.setTaskId(item.getTaskId()); taskDTO.setStatus(TopicConstant.BLOCK); - topicDraftScanTaskService.updateByTask(taskDTO); + topicDraftScanTaskService.update(taskDTO); + + TopicDraftEntity draftEntity = new TopicDraftEntity(); + draftEntity.setId(topic.getId()); + draftEntity.setDraftStatus(TopicConstant.BLOCK); + draftEntity.setDraftReason(item.getLabelDesc()); + baseDao.updateById(draftEntity); + isAllPass = false; } else { //审核通过 TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(item.getDataId()); + dto.setId(taskDTO.getTopicDraftAttachmentId()); dto.setStatus(TopicConstant.AUTO_PASSED); dto.setReason(item.getLabelDesc()); topicDraftAttachmentService.update(dto); - TopicDraftScanTaskDTO taskDTO = new TopicDraftScanTaskDTO(); - taskDTO.setTaskId(item.getTaskId()); taskDTO.setStatus(TopicConstant.AUTO_PASSED); - topicDraftScanTaskService.updateByTask(taskDTO); + topicDraftScanTaskService.update(taskDTO); } //审核通过，发布话题 if(isAllPass) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml index 83c0305ab6..33a9869a66 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftScanTaskDao.xml @@ -23,6 +23,23 @@ `STATUS` = #{status} WHERE TASK_ID = #{taskId} + \ No newline at end of file From 102bad7524020db14a2bd0932598f65e8182651a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 29 Dec 2020 15:54:25 +0800 Subject: [PATCH 10/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/topic/service/impl/TopicDraftServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cc4cf44756..5db696e85c 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 @@ -629,7 +629,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Tue, 29 Dec 2020 16:03:52 +0800 Subject: [PATCH 11/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/group/dto/topic/form/FileDTO.java | 5 +++++ .../dto/topic/result/DraftDetailResultDTO.java | 5 +++-- .../topic/service/impl/TopicDraftServiceImpl.java | 13 +++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java index eb187299e0..1288ebeac1 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/FileDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.topic.form; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,10 +16,14 @@ import java.io.Serializable; public class FileDTO implements Serializable { private static final long serialVersionUID = -3930520724652521552L; + @JsonIgnore private String name; private String url; + @JsonIgnore private String type; + @JsonIgnore private String format; + @JsonIgnore private Integer size; private Integer duration; } 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 cd0772719d..b21ed3c51b 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 @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.topic.result; +import com.epmet.resi.group.dto.topic.form.FileDTO; import lombok.Data; import lombok.NoArgsConstructor; @@ -54,6 +55,6 @@ public class DraftDetailResultDTO implements Serializable { /** * 音频附件集合 */ - private List voiceList; - private List videoList; + private List voiceList; + private List videoList; } 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 5db696e85c..23f30e2584 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 @@ -570,6 +570,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl voiceUrls = topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), TopicConstant.VOICE).stream().map(TopicDraftAttachmentDTO::getAttachmentUrl).collect(Collectors.toList()); + List voiceUrls = + topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), TopicConstant.VOICE).stream().map(item ->{ + FileDTO fileDTO = new FileDTO(); + fileDTO.setUrl(item.getAttachmentUrl()); + fileDTO.setDuration(item.getDuration()); + return fileDTO; + }).collect(Collectors.toList()); result.setVoiceList(voiceUrls); //3.拿取用户信息 @@ -654,7 +661,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl NumConstant.TEN ? (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent()); breviary.append("\""); - }else breviary.append("语音话题"); + }else { + breviary.append("语音话题"); + } sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString()); } //记录操作记录 From 95c03e1b560f6d805840b1081c44cfaf466c7f70 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 29 Dec 2020 16:28:38 +0800 Subject: [PATCH 12/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/resi/group/constant/TopicConstant.java | 8 ++++---- .../resi/group/dto/topic/result/DraftDetailResultDTO.java | 1 + .../modules/topic/service/impl/TopicDraftServiceImpl.java | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 7937a708e7..6a0f97ca92 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -95,10 +95,10 @@ public interface TopicConstant { String REJECTED = "rejected"; String APPROVED = "approved"; String SUBMIT = "submit"; - String IMAGE = " image"; - String VIDEO = " video"; - String VOICE = " voice"; - String DOC = " doc"; + String IMAGE = "image"; + String VIDEO = "video"; + String VOICE = "voice"; + String DOC = "doc"; String GROUP_INFO_FAILURE = "根据groupId未查询到组信息......"; 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 b21ed3c51b..ed04fa23ac 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 @@ -17,6 +17,7 @@ import java.util.List; public class DraftDetailResultDTO implements Serializable { private static final long serialVersionUID = -7445417689558651158L; + private String groupId; /** * 话题草稿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 23f30e2584..084010e040 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 @@ -782,7 +782,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl NumConstant.TEN ? (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent()); breviary.append("\""); - }else breviary.append("语音话题"); + }else { + breviary.append("语音话题"); + } sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString()); } From 18767a58029ce1c468c0f977f2e1f216fca30e2a Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 29 Dec 2020 16:58:59 +0800 Subject: [PATCH 13/37] =?UTF-8?q?getstatus=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/topic/form/ShareLinkTypeFormDTO.java | 25 ++++++++++++ ...rRelationBetweenGroupAndGridResultDTO.java | 31 +++++++++++++++ .../TopicShareLinkRecordController.java | 17 +++++++++ .../service/TopicShareLinkRecordService.java | 11 ++++++ .../TopicShareLinkVisitRecordService.java | 2 + .../impl/ResiTopicCommentServiceImpl.java | 13 ++++--- .../service/impl/ResiTopicServiceImpl.java | 38 +++++++++---------- .../service/impl/TopicDraftServiceImpl.java | 21 +++++----- .../impl/TopicShareLinkRecordServiceImpl.java | 27 +++++++++++++ .../TopicShareLinkVisitRecordServiceImpl.java | 7 +++- 10 files changed, 155 insertions(+), 37 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ShareLinkTypeFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ShareLinkTypeFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ShareLinkTypeFormDTO.java new file mode 100644 index 0000000000..da7887bc8d --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ShareLinkTypeFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 分享链接类型和Id入参 + * @ClassName ShareLinkTypefFormDTO + * @Auth wangc + * @Date 2020-12-29 14:53 + */ +@Data +public class ShareLinkTypeFormDTO implements Serializable { + + @NotBlank(message = "链接Id不能为空") + private String id; + + @NotBlank(message = "链接类型不能为空") + private String type; + + @NotBlank(message = "用户Id不能为空") + private String userId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java new file mode 100644 index 0000000000..a00b489f3a --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java @@ -0,0 +1,31 @@ +package com.epmet.resi.group.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 通过链接进入小程序的用户与链接所在的小组与网格的关系 + * @ClassName MemberRelationBetweenGroupAndGridResultDTO + * @Auth wangc + * @Date 2020-12-29 14:58 + */ +@Data +public class MemberRelationBetweenGroupAndGridResultDTO implements Serializable { + private static final long serialVersionUID = -5389490307870064071L; + + /** + * 是否存在入组待审核记录，true：存在，false：不存在 + */ + private Boolean awaitAudit; + + /** + * 是否在群内标志，已经在群内:true, 不在群内:false + */ + private Boolean inGroup; + + /** + * 此人有没有加入所在小组所属网格下的任何一个小组，true：加入，false：未加入 + */ + private Boolean inAnyGroup; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java index d8e9614ff2..bd138b5583 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java @@ -10,11 +10,14 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.topic.service.TopicShareLinkRecordService; +import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService; import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO; import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO; +import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO; import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO; import com.epmet.resi.group.dto.topic.form.TopicVisitFormDTO; import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO; +import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO; import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO; import com.epmet.resi.group.dto.topic.result.TopicVisitResultDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -108,4 +111,18 @@ public class TopicShareLinkRecordController { return new Result().ok(topicShareLinkRecordService.topicVisit(formDTO,tokenDto)); } + /** + * @Description 根据链接信息查询被邀请人在组/网格内的状态 + * @param param + * @return com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO + * @author wangc + * @date 2020.12.29 15:01 + */ + @PostMapping("getstatus") + public Result getStatus(@LoginUser TokenDto token, @RequestBody ShareLinkTypeFormDTO param){ + param.setUserId(token.getUserId()); + ValidatorUtils.validateEntity(param); + return new Result().ok(topicShareLinkRecordService.getStatusByLinkAndInvitee(param)); + } + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkRecordService.java index c52f23d862..ec3bd6000d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkRecordService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkRecordService.java @@ -6,9 +6,11 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.modules.topic.entity.TopicShareLinkRecordEntity; import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO; import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO; +import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO; import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO; import com.epmet.resi.group.dto.topic.form.TopicVisitFormDTO; import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO; +import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO; import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO; import com.epmet.resi.group.dto.topic.result.TopicVisitResultDTO; @@ -107,4 +109,13 @@ public interface TopicShareLinkRecordService extends BaseService NumConstant.TEN ? - (topic.getTopicContent().substring(NumConstant.TEN) + "…") : - topic.getTopicContent()); + content.length() > NumConstant.TEN ? + (content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") : + content); builder.append("\""); - } + }else builder.append("语音话题"); + pointEventMsg.setRemark(builder.toString()); pointEventMsgList.add(pointEventMsg); 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 c1c8324494..05db5711cd 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 @@ -91,10 +91,12 @@ import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO; import com.epmet.resi.group.dto.topic.result.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.google.common.base.CharMatcher; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jsoup.helper.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -1598,14 +1600,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topic.getTopicContent().length() ? "\"" : "…\"") + content + .substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN) + + (NumConstant.TEN > content.length() ? "\"" : "…\"") ).append("被转为议题").toString()); pointEventMsgList.add(pointEventMsg); @@ -1619,11 +1621,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topic.getTopicContent().length() ? "\"" : "…\"") - ).append("转为议题").toString()); + new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst("小组中发布的","")) + .reverse().toString() + .replaceFirst("题议为转被","")).reverse() + ).append("转为议题").toString()); pointEventMsgList.add(pointEventMsg2); mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); @@ -1733,14 +1734,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topic.getTopicContent().length() ? "\"" : "…\"") + content + .substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN) + + (NumConstant.TEN > content.length() ? "\"" : "…\"") ).append("被转为议题").toString()); pointEventMsgList.add(pointEventMsg); @@ -1754,10 +1755,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topic.getTopicContent().length() ? "\"" : "…\"") + new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst("小组中发布的","")).reverse() + .toString().replaceFirst("题议为转被","")).reverse() ).append("转为议题").toString()); pointEventMsgList.add(pointEventMsg2); @@ -1768,7 +1767,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl NumConstant.TEN ? (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent()); + breviary.append(content.length() > NumConstant.TEN ? (content.substring(NumConstant.TEN) + "…") : content); breviary.append("\""); - }else { - breviary.append("语音话题"); - } + }else breviary.append("话题"); sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString()); } //记录操作记录 @@ -778,17 +778,16 @@ public class TopicDraftServiceImpl extends BaseServiceImpl NumConstant.TEN ? (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent()); + breviary.append(content.length() > NumConstant.TEN ? (content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") : content); breviary.append("\""); - }else { - breviary.append("语音话题"); - } + }else breviary.append("语音话题"); sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString()); } - + /** * @Description 发送积分事件 * @param userId diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java index 9d88bc7896..4b2ce36b96 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.feign.GovIssueOpenFeignClient; import com.epmet.modules.member.dao.GroupMemeberOperationDao; import com.epmet.modules.member.dao.ResiGroupMemberDao; import com.epmet.modules.topic.dao.TopicShareLinkRecordDao; @@ -19,9 +20,11 @@ import com.epmet.modules.topic.service.TopicShareLinkRecordService; import com.epmet.resi.group.constant.TopicShareConstant; import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO; import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO; +import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO; import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO; import com.epmet.resi.group.dto.topic.form.TopicVisitFormDTO; import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO; +import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO; import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO; import com.epmet.resi.group.dto.topic.result.TopicVisitResultDTO; import org.apache.commons.lang3.StringUtils; @@ -48,6 +51,8 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl page(Map params) { @@ -191,4 +196,26 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl Date: Wed, 30 Dec 2020 10:33:58 +0800 Subject: [PATCH 14/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/pom.xml | 6 + .../epmet/service/TopicAutoAuditService.java | 12 + .../impl/TopicAutoAuditServiceImpl.java | 22 ++ .../com/epmet/task/TopicAutoAuditTask.java | 31 +++ .../group/feign/ResiGroupOpenFeignClient.java | 10 + .../ResiGroupOpenFeignClientFallback.java | 12 + .../controller/TopicDraftController.java | 12 + .../service/TopicDraftScanTaskService.java | 10 + .../topic/service/TopicDraftService.java | 9 + .../impl/TopicDraftScanTaskServiceImpl.java | 18 ++ .../service/impl/TopicDraftServiceImpl.java | 256 ++++++++++++------ 11 files changed, 321 insertions(+), 77 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/TopicAutoAuditService.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TopicAutoAuditTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 01e91beca0..0aae470684 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -79,6 +79,12 @@ feign-httpclient 10.3.0 + + com.epmet + resi-group-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/TopicAutoAuditService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/TopicAutoAuditService.java new file mode 100644 index 0000000000..0102b54370 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/TopicAutoAuditService.java @@ -0,0 +1,12 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:45 + */ +public interface TopicAutoAuditService { + Result autoAudit(); +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java new file mode 100644 index 0000000000..00fb618f5b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java @@ -0,0 +1,22 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; +import com.epmet.service.TopicAutoAuditService; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:46 + */ +public class TopicAutoAuditServiceImpl implements TopicAutoAuditService { + + @Autowired + private ResiGroupOpenFeignClient resiGroupOpenFeignClient; + + @Override + public Result autoAudit() { + return resiGroupOpenFeignClient.autoAudit(); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TopicAutoAuditTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TopicAutoAuditTask.java new file mode 100644 index 0000000000..6bc7bb3c4b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/TopicAutoAuditTask.java @@ -0,0 +1,31 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.TopicAutoAuditService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:43 + */ +@Slf4j +@Component("topicAutoAuditTask") +public class TopicAutoAuditTask implements ITask { + + @Autowired + private TopicAutoAuditService topicAutoAuditService; + + @Override + public void run(String params) { + log.info("TopicAutoAuditTask定时任务正在执行，参数为：{}", params); + Result result = topicAutoAuditService.autoAudit(); + if (result.success()) { + log.info("TopicAutoAuditTask定时任务执行成功"); + } else { + log.error("TopicAutoAuditTask定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index ad9a19903f..d2ffdb794a 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -164,4 +164,14 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("resi/group/topicsharelinkvisitrecord/checkinviterelationship") Result checkInviteRelationship(@RequestBody SharableTopicAndInviteeFormDTO param); + + + /** + * 自动审核 + * @author zhaoqifeng + * @date 2020/12/30 10:11 + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("resi/group/topicdraft/autoAudit") + Result autoAudit(); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 1b6f214fa0..38dfbcb199 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -110,4 +110,16 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien public Result checkInviteRelationship(SharableTopicAndInviteeFormDTO param) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectTopicBelongGroup", param); } + + /** + * 自动审核 + * + * @return com.epmet.commons.tools.utils.Result + * @author zhaoqifeng + * @date 2020/12/30 10:11 + */ + @Override + public Result autoAudit() { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "autoAudit"); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicDraftController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicDraftController.java index 89081680fd..1c99d983c3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicDraftController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicDraftController.java @@ -180,4 +180,16 @@ public class TopicDraftController { formDTO.setUserId(tokenDto.getUserId()); return new Result>().ok(topicDraftService.myAuditingList(formDTO)); } + + /** + * 自动审核 + * @author zhaoqifeng + * @date 2020/12/30 10:11 + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("autoAudit") + public Result autoAudit() { + topicDraftService.autoAudit(); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java index 3b1608a18c..003b716a97 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftScanTaskService.java @@ -96,4 +96,14 @@ public interface TopicDraftScanTaskService extends BaseService + */ + List getScanTaskList(String draftId, String status); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java index 87b99bc51c..b6646cf19c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicDraftService.java @@ -153,4 +153,13 @@ public interface TopicDraftService extends BaseService { * @Description 个人中心-我发表的话题-审核中列表 **/ List myAuditingList(MyAuditingListFormDTO formDTO); + + /** + * 自动审核 + * @author zhaoqifeng + * @date 2020/12/29 17:51 + * @param + * @return void + */ + void autoAudit(); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java index 9f4b2f42d9..9890bf5c79 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftScanTaskServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.modules.topic.dao.TopicDraftScanTaskDao; import com.epmet.modules.topic.entity.TopicDraftScanTaskEntity; import com.epmet.modules.topic.service.TopicDraftScanTaskService; +import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.topic.TopicDraftScanTaskDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -107,4 +108,21 @@ public class TopicDraftScanTaskServiceImpl extends BaseServiceImpl + * @author zhaoqifeng + * @date 2020/12/29 17:57 + */ + @Override + public List getScanTaskList(String draftId, String status) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(draftId), "TOPIC_DRAFT_ID", draftId); + wrapper.eq(StringUtils.isNotBlank(status),"STATUS", status); + List entityList = baseDao.selectList(wrapper); + return ConvertUtils.sourceToTarget(entityList, TopicDraftScanTaskDTO.class); + + } + } \ No newline at end of file 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 084010e040..da10cf9b67 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 @@ -239,6 +239,110 @@ public class TopicDraftServiceImpl extends BaseServiceImpl taskList = topicDraftScanTaskService.getScanTaskList(null, TopicConstant.AUDITING); + if (CollectionUtils.isNotEmpty(taskList)) { + List taskIds = taskList.stream().map(TopicDraftScanTaskDTO :: getTaskId).collect(Collectors.toList()); + List draftIds = taskList.stream().map(TopicDraftScanTaskDTO :: getTopicDraftId).collect(Collectors.toList()); + Result> voiceResults = ScanContentUtils.voiceResults(scanApiUrl.concat(voiceResultsMethod), taskIds); + if (voiceResults.success()) { + List list = voiceResults.getData(); + for (VoiceResultDTO item : list) { + TopicDraftScanTaskDTO taskDTO = topicDraftScanTaskService.getScanByTask(item.getTaskId()); + if (TopicConstant.REVIEW.equals(item.getSuggestion())) { + //结果不确定 + TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); + dto.setId(taskDTO.getTopicDraftAttachmentId()); + dto.setStatus(TopicConstant.REVIEW); + dto.setReason(item.getLabelDesc()); + topicDraftAttachmentService.update(dto); + + taskDTO.setStatus(TopicConstant.REVIEW); + topicDraftScanTaskService.update(taskDTO); + + } else if (TopicConstant.BLOCK.equals(item.getSuggestion())) { + //结果违规 + TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); + dto.setId(taskDTO.getTopicDraftAttachmentId()); + dto.setStatus(TopicConstant.BLOCK); + dto.setReason(item.getLabelDesc()); + topicDraftAttachmentService.update(dto); + + taskDTO.setStatus(TopicConstant.BLOCK); + topicDraftScanTaskService.update(taskDTO); + } else { + //审核通过 + TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); + dto.setId(taskDTO.getTopicDraftAttachmentId()); + dto.setStatus(TopicConstant.AUTO_PASSED); + dto.setReason(item.getLabelDesc()); + topicDraftAttachmentService.update(dto); + + taskDTO.setStatus(TopicConstant.AUTO_PASSED); + topicDraftScanTaskService.update(taskDTO); + } + } + + //判断草稿是否审核完成 + draftIds.forEach(draftId -> { + List tasks = topicDraftScanTaskService.getScanTaskList(draftId, null); + String status = TopicConstant.AUTO_PASSED; + for (TopicDraftScanTaskDTO task : tasks) { + if (TopicConstant.AUDITING.equals(task.getStatus())) { + status = TopicConstant.AUDITING; + break; + } else if(TopicConstant.BLOCK.equals(task.getStatus())) { + status = TopicConstant.BLOCK; + } else if(TopicConstant.REVIEW.equals(task.getStatus())) { + if (!TopicConstant.BLOCK.equals(status)) { + status = TopicConstant.REVIEW; + } + } else { + if (!TopicConstant.BLOCK.equals(status) && !TopicConstant.REVIEW.equals(status)) { + status = TopicConstant.AUTO_PASSED; + } + } + } + + if (TopicConstant.BLOCK.equals(status)) { + //草稿状态更新为block + TopicDraftEntity draftEntity = new TopicDraftEntity(); + draftEntity.setId(draftId); + draftEntity.setDraftStatus(TopicConstant.REVIEW); + draftEntity.setDraftReason("需要人工审核"); + baseDao.updateById(draftEntity); + + } else if(TopicConstant.REVIEW.equals(status)) { + //草稿状态更新为review + TopicDraftEntity draftEntity = new TopicDraftEntity(); + draftEntity.setId(draftId); + draftEntity.setDraftStatus(TopicConstant.BLOCK); + draftEntity.setDraftReason("语音存在违规内容"); + baseDao.updateById(draftEntity); + + } else if(TopicConstant.AUTO_PASSED.equals(status)) { + //草稿状态更新为auto_passed + AuditDraftTopicFormDTO formDTO = new AuditDraftTopicFormDTO(); + formDTO.setTopicDraftId(draftId); + formDTO.setAuditType(TopicConstant.AUTO_PASSED); + audit(null, formDTO); + } + }); + + + } + } + } + /** * 发布话题 * @@ -429,77 +533,67 @@ public class TopicDraftServiceImpl extends BaseServiceImpl { - while (true) { - Result> voiceResults = ScanContentUtils.voiceResults(scanApiUrl.concat(voiceResultsMethod), taskIds); - if (voiceResults.success()) { - boolean isAllPass = true; - List list = voiceResults.getData(); - for (VoiceResultDTO item : list) { - TopicDraftScanTaskDTO taskDTO = topicDraftScanTaskService.getScanByTask(item.getTaskId()); - if (TopicConstant.REVIEW.equals(item.getSuggestion())) { - //结果不确定 - TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(taskDTO.getTopicDraftAttachmentId()); - dto.setStatus(TopicConstant.REVIEW); - dto.setReason(item.getLabelDesc()); - topicDraftAttachmentService.update(dto); - - taskDTO.setStatus(TopicConstant.REVIEW); - topicDraftScanTaskService.update(taskDTO); - - TopicDraftEntity draftEntity = new TopicDraftEntity(); - draftEntity.setId(topic.getId()); - draftEntity.setDraftStatus(TopicConstant.REVIEW); - draftEntity.setDraftReason("需要人工审核"); - baseDao.updateById(draftEntity); - - isAllPass = false; - } else if (TopicConstant.BLOCK.equals(item.getSuggestion())) { - //结果违规 - TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(taskDTO.getTopicDraftAttachmentId()); - dto.setStatus(TopicConstant.BLOCK); - dto.setReason(item.getLabelDesc()); - topicDraftAttachmentService.update(dto); - - taskDTO.setStatus(TopicConstant.BLOCK); - topicDraftScanTaskService.update(taskDTO); - - TopicDraftEntity draftEntity = new TopicDraftEntity(); - draftEntity.setId(topic.getId()); - draftEntity.setDraftStatus(TopicConstant.BLOCK); - draftEntity.setDraftReason(item.getLabelDesc()); - baseDao.updateById(draftEntity); - - isAllPass = false; - } else { - //审核通过 - TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); - dto.setId(taskDTO.getTopicDraftAttachmentId()); - dto.setStatus(TopicConstant.AUTO_PASSED); - dto.setReason(item.getLabelDesc()); - topicDraftAttachmentService.update(dto); - - taskDTO.setStatus(TopicConstant.AUTO_PASSED); - topicDraftScanTaskService.update(taskDTO); - } - //审核通过，发布话题 - if(isAllPass) { - saveTopic(tokenDto, formDTO, topic.getId()); - } - } - break; - } - try { - Thread.sleep(600000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }); +// Result> voiceResults = ScanContentUtils.voiceResults(scanApiUrl.concat(voiceResultsMethod), taskIds); +// if (voiceResults.success()) { +// boolean isAllPass = true; +// List list = voiceResults.getData(); +// for (VoiceResultDTO item : list) { +// TopicDraftScanTaskDTO taskDTO = topicDraftScanTaskService.getScanByTask(item.getTaskId()); +// if (TopicConstant.REVIEW.equals(item.getSuggestion())) { +// //结果不确定 +// TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); +// dto.setId(taskDTO.getTopicDraftAttachmentId()); +// dto.setStatus(TopicConstant.REVIEW); +// dto.setReason(item.getLabelDesc()); +// topicDraftAttachmentService.update(dto); +// +// taskDTO.setStatus(TopicConstant.REVIEW); +// topicDraftScanTaskService.update(taskDTO); +// +// TopicDraftEntity draftEntity = new TopicDraftEntity(); +// draftEntity.setId(topic.getId()); +// draftEntity.setDraftStatus(TopicConstant.REVIEW); +// draftEntity.setDraftReason("需要人工审核"); +// baseDao.updateById(draftEntity); +// +// isAllPass = false; +// } else if (TopicConstant.BLOCK.equals(item.getSuggestion())) { +// //结果违规 +// TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); +// dto.setId(taskDTO.getTopicDraftAttachmentId()); +// dto.setStatus(TopicConstant.BLOCK); +// dto.setReason(item.getLabelDesc()); +// topicDraftAttachmentService.update(dto); +// +// taskDTO.setStatus(TopicConstant.BLOCK); +// topicDraftScanTaskService.update(taskDTO); +// +// TopicDraftEntity draftEntity = new TopicDraftEntity(); +// draftEntity.setId(topic.getId()); +// draftEntity.setDraftStatus(TopicConstant.BLOCK); +// draftEntity.setDraftReason(item.getLabelDesc()); +// baseDao.updateById(draftEntity); +// +// isAllPass = false; +// } else { +// //审核通过 +// TopicDraftAttachmentDTO dto = new TopicDraftAttachmentDTO(); +// dto.setId(taskDTO.getTopicDraftAttachmentId()); +// dto.setStatus(TopicConstant.AUTO_PASSED); +// dto.setReason(item.getLabelDesc()); +// topicDraftAttachmentService.update(dto); +// +// taskDTO.setStatus(TopicConstant.AUTO_PASSED); +// topicDraftScanTaskService.update(taskDTO); +// } +// //审核通过，发布话题 +// if (isAllPass) { +// saveTopic(tokenDto, formDTO, topic.getId()); +// } +// } +// +// } } } else { @@ -611,6 +705,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl attachmentList = topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), null); List topicAttachments = ConvertUtils.sourceToTarget(attachmentList, ResiTopicAttachmentEntity.class); + topicAttachments.forEach(item -> { + item.setTopicId(resiTopic.getId()); + }); topicAttachments.forEach(item -> { item.setId(null); }); resiTopicAttachmentDao.insertBatch(topicAttachments); //将音频状态改为approved - List voiceList = - attachmentList.stream().filter(item -> TopicConstant.VOICE.equals(item.getAttachmentType()) && TopicConstant.REVIEW.equals(item.getStatus())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(voiceList)) { - voiceList.forEach(item -> item.setStatus(TopicConstant.APPROVED)); - topicDraftAttachmentService.updateBatchById(ConvertUtils.sourceToTarget(voiceList, TopicDraftAttachmentEntity.class)); + if (TopicConstant.APPROVED.equals(formDTO.getAuditType())) { + List voiceList = + attachmentList.stream().filter(item -> TopicConstant.VOICE.equals(item.getAttachmentType()) && TopicConstant.REVIEW.equals(item.getStatus())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(voiceList)) { + voiceList.forEach(item -> item.setStatus(TopicConstant.APPROVED)); + topicDraftAttachmentService.updateBatchById(ConvertUtils.sourceToTarget(voiceList, TopicDraftAttachmentEntity.class)); + } } //发送积分 @@ -672,7 +773,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Wed, 30 Dec 2020 10:47:32 +0800 Subject: [PATCH 15/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java index 00fb618f5b..2e497497e0 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/TopicAutoAuditServiceImpl.java @@ -4,12 +4,14 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.TopicAutoAuditService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; /** * @author zhaoqifeng * @dscription * @date 2020/12/29 17:46 */ +@Service public class TopicAutoAuditServiceImpl implements TopicAutoAuditService { @Autowired From cf5d42c347386c0550ffae31113e53fa825059f1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 30 Dec 2020 13:51:31 +0800 Subject: [PATCH 16/37] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=94=E5=9B=9E=E5=BD=93=E5=89=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=8E=E9=93=BE=E6=8E=A5=E4=B8=AD=E7=BB=84=E3=80=81?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9A=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rRelationBetweenGroupAndGridResultDTO.java | 6 +-- .../impl/TopicShareLinkRecordServiceImpl.java | 49 ++++++++++++++++++- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java index a00b489f3a..e3b0446113 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java @@ -17,15 +17,15 @@ public class MemberRelationBetweenGroupAndGridResultDTO implements Serializable /** * 是否存在入组待审核记录，true：存在，false：不存在 */ - private Boolean awaitAudit; + private Boolean awaitAudit = false; /** * 是否在群内标志，已经在群内:true, 不在群内:false */ - private Boolean inGroup; + private Boolean inGroup = false; /** * 此人有没有加入所在小组所属网格下的任何一个小组，true：加入，false：未加入 */ - private Boolean inAnyGroup; + private Boolean inAnyGroup = false; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java index 4b2ce36b96..4163761b96 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java @@ -9,15 +9,22 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IssueShareLinkRecordDTO; import com.epmet.feign.GovIssueOpenFeignClient; +import com.epmet.modules.group.dao.ResiGroupDao; +import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.member.dao.GroupMemeberOperationDao; import com.epmet.modules.member.dao.ResiGroupMemberDao; +import com.epmet.modules.topic.dao.ResiTopicDao; import com.epmet.modules.topic.dao.TopicShareLinkRecordDao; import com.epmet.modules.topic.dao.TopicShareLinkVisitRecordDao; import com.epmet.modules.topic.entity.TopicShareLinkRecordEntity; import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity; import com.epmet.modules.topic.service.TopicShareLinkRecordService; +import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.TopicShareConstant; +import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO; import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO; import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO; @@ -27,10 +34,12 @@ import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO; import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO; import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO; import com.epmet.resi.group.dto.topic.result.TopicVisitResultDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.List; @@ -43,6 +52,7 @@ import java.util.Map; * @since v1.0.0 2020-12-18 */ @Service +@Slf4j public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl implements TopicShareLinkRecordService { @Autowired @@ -53,7 +63,10 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -212,10 +225,42 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl issueShareLinkInfo = issueClient.shareLinkInfo(param.getId()); + if(issueShareLinkInfo.success() && null != issueShareLinkInfo.getData()){ + String issueId = issueShareLinkInfo.getData().getIssueId(); + if(StringUtils.isNotBlank(issueId)){ + group = topicDao.selectGroupIdByIssueId(issueId); + } + } + } + if(StringUtils.isBlank(group)) throw new RenException("根据分享链接Id没有找到对应的组Id"); + String userId = param.getUserId(); + GroupMemeberOperationDTO applyRecord = groupMemeberOperationDao.selectLatestRecord(group, userId); + if(null != applyRecord && StringUtils.equals(ModuleConstant.GROUP_STATUS_UNDER_AUDITTING,applyRecord.getOperateStatus())){ + //under_auditing + relation.setAwaitAudit(true); + } + if(null != applyRecord && StringUtils.equals(ModuleConstant.AUDITING_OPERATION_APPROVAL,applyRecord.getOperateStatus())){ + //approved + relation.setInGroup(true); + relation.setInAnyGroup(true); + } + if(!relation.getInAnyGroup()) { + ResiGroupEntity groupEntity = groupDao.selectById(group); + if(null == groupEntity || StringUtils.isBlank(groupEntity.getGridId())) + throw new RenException("没有找到相应的组记录"); + List groups = resiGroupMemberDao.getGroupIdByUserIdAndGridId(groupEntity.getGridId(), userId, NumConstant.ONE_STR); + if(!CollectionUtils.isEmpty(groups)){ + relation.setInAnyGroup(true); + if(groups.contains(group)){ + relation.setInGroup(true); + log.error("查出用户{}是组{}中成员，但是没有对应的入群记录",param.getUserId(),group); + } + } } - return null; + return relation; } } \ No newline at end of file From 0664b8b70bd7c0c377ef70be1a69a390bf6a24f2 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 30 Dec 2020 17:21:58 +0800 Subject: [PATCH 17/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicCommentServiceImpl.java | 1 + .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index 9280033a88..1fc645d6b6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -257,6 +257,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl NumConstant.TEN ? 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 05db5711cd..cb42704e9b 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 @@ -1598,7 +1598,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Wed, 30 Dec 2020 17:36:05 +0800 Subject: [PATCH 18/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=96=87=E6=A1=88=E6=8B=BC=E6=8E=A5=E7=9A=84=E9=97=AE=E9=A2=98?= 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 cb42704e9b..1320be4228 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 @@ -1621,7 +1621,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Mon, 4 Jan 2021 15:49:27 +0800 Subject: [PATCH 19/37] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=96=87=E6=A1=88?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.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/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 1320be4228..a4f80dbae0 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 @@ -1604,7 +1604,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl content.length() ? "\"" : "…\"") @@ -1619,7 +1619,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl content.length() ? "\"" : "…\"") @@ -1753,7 +1753,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Mon, 4 Jan 2021 18:09:11 +0800 Subject: [PATCH 20/37] =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E8=BD=AC=E6=88=90=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=A7=AF=E5=88=86=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueServiceImpl.java | 16 ++++-- .../dto/topic/form/TopicEventFormDTO.java | 45 ++++++++++++++++ .../group/feign/ResiGroupOpenFeignClient.java | 10 ++++ .../ResiGroupOpenFeignClientFallback.java | 5 ++ .../topic/controller/ResiTopicController.java | 14 +++++ .../topic/service/ResiTopicService.java | 9 ++++ .../service/impl/ResiTopicServiceImpl.java | 54 +++++++++++++++++++ .../service/impl/TopicDraftServiceImpl.java | 2 +- 8 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicEventFormDTO.java diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2fb277c4ec..89afe5967c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,6 +8,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.EventEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -26,6 +28,8 @@ import com.epmet.dao.IssueProcessDao; import com.epmet.dao.IssueProjectRelationDao; import com.epmet.dto.*; import com.epmet.dto.form.*; +import com.epmet.dto.form.IssueAuditionFormDTO; +import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueProcessEntity; @@ -40,10 +44,8 @@ import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO; import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO; import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; -import com.epmet.resi.group.dto.topic.form.ResiTopicTurnIssueFromDTO; -import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO; -import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.*; @@ -877,6 +879,14 @@ public class IssueServiceImpl extends BaseServiceImpl imp }catch(RenException e){ logger.error(e.getInternalMsg()); } + + //7:发送话题转议题积分事件 + TopicEventFormDTO eventParam = new TopicEventFormDTO(); + eventParam.setTopicId(entity.getSourceId()); + eventParam.setEvent(EventEnum.TOPIC_SHIFTED_TO_PROJECT); + if(!resiGroupOpenFeignClient.sendEvent(eventParam).success()){ + logger.warn("com.epmet.service.impl.IssueServiceImpl.shiftProject，话题被转为项目积分事件发送失败，参数：{}", JSON.toJSONString(formDTO)); + } } /** diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicEventFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicEventFormDTO.java new file mode 100644 index 0000000000..c6443c9d4a --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicEventFormDTO.java @@ -0,0 +1,45 @@ +package com.epmet.resi.group.dto.topic.form; + +import com.epmet.commons.tools.enums.EventEnum; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Description 话题相关积分入参dto + * @ClassName TopicEventFormDTO + * @Auth wangc + * @Date 2021-01-04 16:37 + */ +@Data +public class TopicEventFormDTO implements Serializable { + private static final long serialVersionUID = 2297474207576464905L; + + /** + * 话题Id + */ + @NotBlank(message = "话题Id不能为空") + private String topicId; + + /** + * 话题作者Id + */ + //private String topicAuthorId; + + /** + * 议题发起人Id + */ + private String issuePublisherId; + + /** + * 事件枚举 + */ + @NotNull(message = "楼院小组事件枚举类型不能为空") + private EventEnum event; + + /** + * 后续相关参数可再添加 + */ +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index d2ffdb794a..fcb56f25ba 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -174,4 +174,14 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("resi/group/topicdraft/autoAudit") Result autoAudit(); + + /** + * @Description 根据事件枚举发送积分事件 + * @param param + * @return void + * @author wangc + * @date 2021.01.04 16:41 + */ + @PostMapping("resi/group/topic/sendevent") + Result sendEvent(@RequestBody TopicEventFormDTO param); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 38dfbcb199..b8f7f9e2d7 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -122,4 +122,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien public Result autoAudit() { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "autoAudit"); } + + @Override + public Result sendEvent(TopicEventFormDTO param) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",param); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index d6e3bf75a6..ebd0bf7b0d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -402,4 +402,18 @@ public class ResiTopicController { return new Result().ok(topicService.topicAttachmentList(formDTO)); } + /** + * @Description 根据事件枚举发送积分事件 + * @param param + * @return void + * @author wangc + * @date 2021.01.04 16:41 + */ + @PostMapping("sendevent") + public Result sendEvent(@RequestBody TopicEventFormDTO param){ + ValidatorUtils.validateEntity(param); + topicService.sendTopicPointEventByEventType(param); + return new Result(); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 347f960f6e..e73a3f8c4e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -331,4 +331,13 @@ public interface ResiTopicService extends BaseService { * @Description 获取话题附件信息 **/ TopicAttachmentResultDTO topicAttachmentList(TopicAttachmentFormDTO formDTO); + + /** + * @Description 根据事件枚举发送积分事件 + * @param param + * @return void + * @author wangc + * @date 2021.01.04 16:41 + */ + void sendTopicPointEventByEventType(TopicEventFormDTO param); } \ No newline at end of file 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 a4f80dbae0..bd0a6e7963 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 @@ -1995,6 +1995,60 @@ public class ResiTopicServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); + //话题被转为项目 话题作者 + + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setCustomerId(group.getCustomerId()); + pointEventMsg.setUserId(topic.getCreatedBy()); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag()); + //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题 + String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent()); + pointEventMsg.setRemark(new StringBuilder(group.getGroupName()).append("小组中发布的") + .append( + StringUtils.isBlank(content) ? "语音话题" : + "话题\"" + + content + .substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN) + + (NumConstant.TEN > content.length() ? "\"" : "…\"") + ).append("被转为项目").toString()); + pointEventMsgList.add(pointEventMsg); + mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); + if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ + log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(param)); + } + } + } + } 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 d6975fa5de..61a490f58c 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 @@ -916,7 +916,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Fri, 8 Jan 2021 16:10:48 +0800 Subject: [PATCH 21/37] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=EF=BC=8C=E5=B0=86=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=E7=9A=84=E8=AF=AD=E9=9F=B3=E5=86=85=E5=AE=B9=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=88=90=E2=80=9C=E8=AF=AD=E9=9F=B3=E8=AF=9D=E9=A2=98=E2=80=9D?= =?UTF-8?q?=EF=BC=9B=E6=9F=A5=E8=AF=A2=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=9B=BE=E7=89=87=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=9D=A1=E4=BB=B6=E8=A6=81=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/resi/group/constant/TopicConstant.java | 10 ++++++++++ .../topic/service/impl/ResiTopicServiceImpl.java | 2 ++ .../src/main/resources/mapper/topic/ResiTopicDao.xml | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 6a0f97ca92..5aa7c8d3a30 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -107,4 +107,14 @@ public interface TopicConstant { String COMMENT_TOPIC_FAILURE = "评论话题加分失败......"; String GET_CUSTOMER_ID_FAILURE = "查询客户ID失败......"; + + /** + * 字段 附件类型 小写 驼峰 + */ + String FIELD_TOPIC_ATTACHMENT_TYPE_HUMP = "attachmentType"; + + /** + * 字段 附件类型 大写 下划线 + */ + String FIELD_TOPIC_ATTACHMENT_TYPE = "ATTACHMENT_TYPE"; } 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 bd0a6e7963..8dee3181c5 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 @@ -699,6 +699,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); wrapper.eq(TopicConstant.TOPIC_ID,topicId); + wrapper.eq(TopicConstant.FIELD_TOPIC_ATTACHMENT_TYPE,"image"); wrapper.orderByAsc(TopicConstant.SORT); List attachments = resiTopicAttachmentDao.selectList(wrapper); List attachmentUrls = new ArrayList<>(); @@ -1249,6 +1250,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId()); + wrapper.eq(TopicConstant.FIELD_TOPIC_ATTACHMENT_TYPE,"image"); wrapper.orderByAsc(TopicConstant.SORT); List attachments = resiTopicAttachmentDao.selectList(wrapper); if (attachments.size() != NumConstant.ZERO){ diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 11f21d3c27..fb1ac3a82c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -155,7 +155,7 @@ SELECT topic.ID AS topicId, topic.GROUP_ID, - topic.TOPIC_CONTENT, + IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent, topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, @@ -176,6 +176,7 @@ RESI_TOPIC_ATTACHMENT attachment WHERE attachment.DEL_FLAG = '0' + AND attachment.ATTACHMENT_TYPE = 'image' GROUP BY attachment.TOPIC_ID ) attachement2 ON @@ -202,7 +203,7 @@ SELECT topic.ID AS topicId, topic.GROUP_ID, - topic.TOPIC_CONTENT, + IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent, topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, @@ -225,6 +226,7 @@ RESI_TOPIC_ATTACHMENT attachment WHERE attachment.DEL_FLAG = '0' + AND attachment.ATTACHMENT_TYPE = 'image' GROUP BY attachment.TOPIC_ID ) attachement2 ON From 1cd400a1ce500f9b3a042df0a1e1d7a0bfdddab9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 8 Jan 2021 16:25:38 +0800 Subject: [PATCH 22/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/TopicDraftServiceImpl.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/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java index 61a490f58c..b1cd5d88e5 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 @@ -319,7 +319,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Fri, 8 Jan 2021 16:33:33 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/TopicDraftServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 b1cd5d88e5..af82f7dfe0 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 @@ -635,6 +635,10 @@ public class TopicDraftServiceImpl extends BaseServiceImpl { + List list = topicDraftAttachmentService.getFileList(item.getTopicDraftId(), TopicConstant.VOICE); + if (CollectionUtils.isNotEmpty(list) && StringUtils.isBlank(item.getTopicContent())) { + item.setTopicContent("语音话题"); + } ResiGroupMemberInfoRedisDTO memberRedis = resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName()); if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ From 3f77e97de36b6623a1f23f4707e0bfb9f53b43e8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 8 Jan 2021 17:15:14 +0800 Subject: [PATCH 24/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/service/impl/TopicDraftServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 af82f7dfe0..7e9cba4229 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 @@ -318,7 +318,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl { - List list = topicDraftAttachmentService.getFileList(item.getTopicDraftId(), TopicConstant.VOICE); - if (CollectionUtils.isNotEmpty(list) && StringUtils.isBlank(item.getTopicContent())) { - item.setTopicContent("语音话题"); - } ResiGroupMemberInfoRedisDTO memberRedis = resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName()); if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ @@ -768,7 +767,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl NumConstant.TEN ? (content.substring(NumConstant.TEN) + "…") : content); breviary.append("\""); - }else breviary.append("话题"); + }else { + breviary.append("话题"); + } sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString()); } //记录操作记录 From 5323ce3a50a0cb886571138b8ea4c5ef8692ef15 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 8 Jan 2021 17:18:32 +0800 Subject: [PATCH 25/37] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E8=AF=9D=E9=A2=98=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/topic/ResiTopicDao.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index fb1ac3a82c..8f21ba60b3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -137,6 +137,7 @@ RESI_TOPIC_ATTACHMENT attachment WHERE attachment.DEL_FLAG = '0' + AND attachment.ATTACHMENT_TYPE = 'image' GROUP BY attachment.TOPIC_ID ) attachement2 ON @@ -155,7 +156,7 @@ SELECT topic.ID AS topicId, topic.GROUP_ID, - IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent, + topic.TOPIC_CONTENT, topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, @@ -203,7 +204,7 @@ SELECT topic.ID AS topicId, topic.GROUP_ID, - IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent, + topic.TOPIC_CONTENT, topic.STATUS, topic.CREATED_TIME AS releaseTime, topic.CREATED_BY AS userId, From 229002c1ad2dc66d5aff05cffa811a6190e8dcff Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 8 Jan 2021 17:20:11 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/TopicDraftServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 7e9cba4229..2ee3045407 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 @@ -803,6 +803,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Mon, 11 Jan 2021 11:00:53 +0800 Subject: [PATCH 27/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=96=87=E6=A1=88=20sql=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.5__editResiGroupRuleCode.sql | 4 ++++ .../modules/topic/service/impl/ResiTopicServiceImpl.java | 6 ++++-- .../modules/topic/service/impl/TopicDraftServiceImpl.java | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql new file mode 100644 index 0000000000..4c3e4183f3 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql @@ -0,0 +1,4 @@ +update `point_rule_default` set event_code = 'invite_new_into_group' where event_code = 'invite_new_resident_into_group'; +update `point_rule_default` set event_code = 'invite_resi_into_group' where event_code = 'invite_resident_into_group'; +update `point_rule_default` set event_code = 'topic_to_issue' where event_code = 'topic_shifted_to_issue'; +update `point_rule_default` set event_code = 'topic_to_project' where event_code = 'topic_shifted_to_project'; \ No newline at end of file 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 8dee3181c5..7d6525228d 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 @@ -1605,7 +1605,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl NumConstant.TEN ? (content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") : content); breviary.append("\""); }else breviary.append("语音话题"); @@ -922,7 +922,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl Date: Mon, 11 Jan 2021 15:26:37 +0800 Subject: [PATCH 28/37] =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=A7=AF=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 5 +++-- 1 file changed, 3 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 7d6525228d..aa4d42bac9 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 @@ -2034,12 +2034,13 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Mon, 11 Jan 2021 15:36:52 +0800 Subject: [PATCH 29/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E6=9D=BF=E7=9A=84=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E4=B8=8A=E9=99=90=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql new file mode 100644 index 0000000000..04ae7bf19d --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql @@ -0,0 +1,4 @@ +update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'publish_one_topic'; +update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'participate_one_topic'; +update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'shift_topic_to_issue'; +update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'invite_resi_into_group'; \ No newline at end of file From 95a1ee5082ac6a5e73e9927bdb7b61cec740b1a9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 11 Jan 2021 15:54:38 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=92=8C=E5=9B=BE=E7=89=87=E6=97=B6=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E9=99=84=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=BAimage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/topic/ResiTopicDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 8f21ba60b3..a60dd51a97 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -430,6 +430,8 @@ topic.ID = attachment.TOPIC_ID AND attachment.DEL_FLAG = '0' + AND + attachment.ATTACHMENT_TYPE = 'image' WHERE topic.DEL_FLAG = '0' AND From 5566a9a1378fcdd5fa13d21c873b94bcf51ccb58 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 11 Jan 2021 16:53:24 +0800 Subject: [PATCH 31/37] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TopicDraftServiceImpl.java | 4 ++++ .../mapper/topic/ResiTopicAttachmentDao.xml | 2 ++ .../resources/mapper/topic/TopicDraftDao.xml | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) 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 0bd6bb3135..64df5855ad 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 @@ -740,6 +740,10 @@ public class TopicDraftServiceImpl extends BaseServiceImpl attachmentList = topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), null); List topicAttachments = ConvertUtils.sourceToTarget(attachmentList, ResiTopicAttachmentEntity.class); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml index 9ec26817f1..4df90acb9e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml @@ -84,6 +84,7 @@ del_flag, revision, sort, + duration, created_by, created_time, updated_by, @@ -100,6 +101,7 @@ #{item.delFlag}, #{item.revision}, #{item.sort}, + #{item.duration}, #{item.createdBy}, now(), #{item.updatedBy}, diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml index a956df46d7..e7bbab6d1e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml @@ -28,8 +28,13 @@