合并代码冲突解决

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

@@ -352,14 +352,6 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      */
     void sendWxmpUpdateSubscribe(TokenDto tokenDto, String id, String type);
 
-    /**
-     * @Description 根据事件枚举发送积分事件
-     * @param param
-     * @return void
-     * @author wangc
-     * @date 2021.01.04 16:41
-    */
-    void sendTopicPointEventByEventType(TopicEventFormDTO param);
 
     ResiTopicDTO queryTopicInfoByIssueId(String issueId);
 }

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

@@ -2176,60 +2176,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return resultDTO;
     }
 
-	/**
-	 * @Description 根据事件枚举发送积分事件
-	 * @param param
-	 * @return void
-	 * @author wangc
-	 * @date 2021.01.04 16:41
-	 */
-	@Override
-	public void sendTopicPointEventByEventType(TopicEventFormDTO param) {
-		ResiTopicEntity topic = baseDao.selectById(param.getTopicId());
-		if(null == topic){
-			log.error("com.epmet.modules.topic.service.impl.ResiTopicServiceImpl.sendTopicPointEventByEventType，根据话题Id没有找到对应的话题信息，参数：{}",JSON.toJSONString(param
-			));
-			return;
-		}
-		ResiGroupInfoRedisDTO group = resiGroupRedis.get(topic.getGroupId());
-		if(null == group){
-			log.error("com.epmet.modules.topic.service.impl.ResiTopicServiceImpl.sendTopicPointEventByEventType，根据组Id没有找到对应的小组信息，组Id：{}",topic.getGroupId());
-			return;
-		}
-		//某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为项目
-		if(EventEnum.TOPIC_SHIFTED_TO_PROJECT == param.getEvent()){
-
-			MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
-			mqBaseMsgDTO.setEventClass("resi_group");
-
-			mqBaseMsgDTO.setEventTag(EventEnum.TOPIC_SHIFTED_TO_PROJECT.getEventTag());
-			List<BasePointEventMsg> 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_PROJECT.getEventTag());
-			//某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题
-			String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
-			pointEventMsg.setRemark(new StringBuilder(group.getGroupName()).append("小组中发布的")
-					.append(
-							StringUtils.isBlank(content) ||
-                                    StringUtils.equals("语音话题",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));
-			}
-		}
-	}
 
     @Override
     public ResiTopicDTO queryTopicInfoByIssueId(String issueId) {