和代码解决冲突

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -3,7 +3,6 @@ package com.epmet.resi.group.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
@@ -15,16 +14,13 @@ import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
-import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.HashMap;
 import java.util.List;
-import org.springframework.http.MediaType;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -197,12 +193,4 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("resi/group/topic/sendevent")
     Result sendEvent(@RequestBody TopicEventFormDTO param);
 
-    /**
-     * @Description 发送内容更新类的微信订阅
-     * @return void
-     * @Author liushaowen
-     * @Date 2021/1/12 11:22
-     */
-    @PostMapping("resi/group/topic/sendwxmpupdatesubscribe")
-    void sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO);
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -138,10 +138,4 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",param);
     }
 
-
-    @Override
-    public void sendWxmpUpdateSubscribe(SendWxmpUpdateSubscribeFormDTO fromDTO) {
-
-    }
-
 }

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

@@ -1973,43 +1973,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         throw new RenException(reply.getInternalMsg());
     }
 
-    /**
-     * @param formDTO
-     * @return
-     * @Author sun
-     * @Description 获取话题附件信息
-     **/
-    @Override
-    public TopicAttachmentResultDTO topicAttachmentList(TopicAttachmentFormDTO formDTO) {
-        TopicAttachmentResultDTO resultDTO = new TopicAttachmentResultDTO();
-        //1.根据话题id查询所有的附件数据
-        List<ResiTopicAttachmentDTO> list = resiTopicAttachmentDao.selectTopicAttachmentList(formDTO.getTopicId());
-        if(list.size()<NumConstant.ONE){
-            return resultDTO;
-        }
-        //2.封装数据并返回
-        LinkedList<TopicFileResultDTO> docList = new LinkedList<>();
-        LinkedList<TopicFileResultDTO> voiceList = new LinkedList<>();
-        LinkedList<TopicFileResultDTO> videoList = new LinkedList<>();
-        list.forEach(l->{
-            TopicFileResultDTO dto = new TopicFileResultDTO();
-            dto.setUrl(l.getAttachmentUrl());
-            dto.setDuration(l.getDuration());
-            if(TopicConstant.FILE_DOC.equals(l.getAttachmentType())){
-                docList.add(dto);
-            }
-            if(TopicConstant.FILE_VOICE.equals(l.getAttachmentType())){
-                voiceList.add(dto);
-            }
-            if(TopicConstant.FILE_VIDEO.equals(l.getAttachmentType())){
-                videoList.add(dto);
-            }
-        });
-        resultDTO.setDocList(docList);
-        resultDTO.setVoiceList(voiceList);
-        resultDTO.setVideoList(videoList);
-        return resultDTO;
-    }
 
 	/**
 	 * @Description 根据事件枚举发送积分事件