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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java

@@ -99,4 +99,8 @@ public interface TopicConstant {
     String VIDEO = " video";
     String VOICE = " voice";
     String DOC = " doc";
+
+    String GROUP_INFO_FAILURE = "根据groupId未查询到组信息......";
+
+    String CREATE_TOPIC_FAILURE = "发布话题加分失败......";
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java

@@ -194,4 +194,12 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
     List<String> selectTopicIdsByGroup(@Param("groupId") String groupId);
 
     String selectGroupIdByIssueId(@Param("issueId") String issueId);
+
+    /**
+     * @Description  查询此人今日发表话题数量
+     * @Param userId
+     * @author zxc
+     * @date 2020/12/23 上午10:02
+     */
+    Integer selectPublishTopicCountByUserId(@Param("userId")String userId);
 }

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

@@ -18,12 +18,17 @@
 package com.epmet.modules.topic.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
+import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
+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;
@@ -33,10 +38,7 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.*;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dto.CustomerGridDTO;
@@ -44,11 +46,8 @@ import com.epmet.dto.IssueApplicationDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.dto.result.CommonDataFilterResultDTO;
-import com.epmet.dto.result.IssueInitiatorResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -85,8 +84,8 @@ import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
-import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.form.IssueShiftedFromTopicFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.CheckTopicPublisherResultDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.*;
@@ -102,7 +101,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.swing.text.html.Option;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -358,6 +356,39 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         group2Update.setId(resiTopicPublishFormDTO.getGroupId());
         group2Update.setLatestTopicPublishDate(currentTime);
         resiGroupDao.updateById(group2Update);
+
+        // 创建话题增加积分
+        // 查询此人今日发表话题数量
+        Integer publishTopicCount = baseDao.selectPublishTopicCountByUserId(tokenDto.getUserId());
+        if (null != publishTopicCount && publishTopicCount <= NumConstant.FIVE){
+            //mq的事件类型
+            MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
+            mqBaseMsgDTO.setEventClass(EventEnum.PUBLISH_ONE_TOPIC.getEventClass());
+            //事件code
+            mqBaseMsgDTO.setEventTag(EventEnum.PUBLISH_ONE_TOPIC.getEventTag());
+            List<BasePointEventMsg> pointEventMsgList = new ArrayList<>();
+            BasePointEventMsg pointEventMsg = new BasePointEventMsg();
+            ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(resiTopicPublishFormDTO.getGroupId());
+            if (null == resiGroupInfoRedisDTO){
+                ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(resiTopicPublishFormDTO.getGroupId());
+                if (null == resiGroupEntity){
+                    throw new RenException(TopicConstant.GROUP_INFO_FAILURE);
+                }
+                pointEventMsg.setCustomerId(resiGroupInfoRedisDTO.getCustomerId());
+            }
+            pointEventMsg.setUserId(tokenDto.getUserId());
+            // 加分
+            pointEventMsg.setActionFlag(MqConstant.PLUS);
+            pointEventMsg.setIsCommon(false);
+            pointEventMsg.setEventTag(mqBaseMsgDTO.getEventTag());
+            pointEventMsgList.add(pointEventMsg);
+
+            mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
+            Result msgResult= SendMqMsgUtils.sendMsg(mqBaseMsgDTO);
+            if(!msgResult.success()){
+                logger.error(TopicConstant.CREATE_TOPIC_FAILURE);
+            }
+        }
         return new Result();
     }
 

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -541,5 +541,15 @@
             shift_issue = 1
     </select>
 
+    <!--查询此人今日发表话题数量  -->
+    <select id="selectPublishTopicCountByUserId" resultType="java.lang.Integer">
+        SELECT
+            COUNT(ID)
+        FROM resi_topic
+        WHERE DEL_FLAG = 0
+          AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') = DATE_FORMAT(NOW(),'%Y%m%d')
+          AND CREATED_BY = #{userId}
+    </select>
+
 </mapper>