冲突修改

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

@@ -115,23 +115,6 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/group/gov-audit-edit")
     Result govAuditEdit(@RequestBody GroupEditionAuditFormDTO param);
 
-
-    /**
-     * @Description 查询用户参与的且不是自己发表的话题对应的议题Id集合
-     * @author sun
-     */
-    @PostMapping(value = "/resi/group/comment/topictoissuelist")
-    Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO);
-
-    /**
-     * @Description  查询话题所属小组名
-     * @Param groupInfoFormDTO
-     * @author zxc
-     * @date 2020/11/11 1:36 下午
-     */
-    @PostMapping("resi/group/group/groupinfo")
-    Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO);
-
     /**
      * @Description 个人中心-我参与过的话题
      * @param param

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

@@ -75,10 +75,6 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govAuditEdit", param);
     }
 
-    @Override
-    public Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicToIssueList", formDTO);
-    }
     @Override
     public Result<List<GroupInfoResultDTO>> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectGroupInfo", groupInfoFormDTO);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -358,8 +358,4 @@ public interface ModuleConstant extends Constant {
 	 * 群邀请二维码跳转页面
 	 */
 	String CODE_INVITE_PAGE = "pages/group/group/invitation/invitation";
-
-	String HIDDEN_TOPIC_REASON_PREFIX = "话题已屏蔽：";
-
-	String CREATE_ISSUE_ERROR = "创建议题失败";
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -402,15 +402,6 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
     Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
 
-    /**
-     * @Description 根据角色key查询具有该key的所有角色列表
-     * @return
-     * @author wxz
-     * @date 2020.11.17 16:20
-     */
-    @PostMapping("/epmetuser/govstaffrole/list-roles-by-rolekey/{role-key}")
-    Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(@PathVariable("role-key") String roleKey);
-
     /**
      * @Description 个人中心-我的建议列表
      * @param dto

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -278,11 +278,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
     }
 
-    @Override
-    public Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(String roleKey) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
-    }
-
     @Override
     public Result<List<MyAdviceListResultDTO>> myAdviceList(MyAdviceListFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "myAdviceList", dto);