修改合并错误

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

@@ -1,18 +1,11 @@
 package com.epmet.resi.group.feign;
 
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
-import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
-import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.*;
-import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
 import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO;
@@ -23,38 +16,11 @@ import com.epmet.resi.group.dto.topic.result.MyCreateTopicsResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
-import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
-import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -68,16 +34,6 @@ import java.util.List;
 //@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class,url = "localhost:8095")
 public interface ResiGroupOpenFeignClient {
 
-    /**
-     * @Description 创建群组二维码
-     * @param dto
-     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
-     * @Author liushaowen
-     * @Date 2020/11/13 16:33
-     */
-    @PostMapping(value = "/resi/group/resigroupcode/creategroupcode", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result<String> createGroupCode(@RequestBody CreateGroupCodeFormDTO dto);
-
     /**
      * @Description 查询用户参与的且不是自己发表的话题对应的议题Id集合
      * @author sun

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

@@ -3,24 +3,10 @@ package com.epmet.resi.group.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO;
+import com.epmet.resi.group.dto.group.form.*;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
-import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO;
 import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO;
@@ -28,10 +14,6 @@ import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
@@ -47,17 +29,6 @@ import java.util.List;
  */
 @Component
 public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClient {
-    /**
-     * @param dto
-     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
-     * @Description 创建群组二维码
-     * @Author liushaowen
-     * @Date 2020/11/13 16:33
-     */
-    @Override
-    public Result<String> createGroupCode(CreateGroupCodeFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "createGroupCode", dto);
-    }
 
     @Override
     public Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO) {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -426,20 +426,6 @@ public class ResiGroupController {
         return new Result();
     }
 
-
-    /**
-     * @param formDTO
-     * @author yinzuomei
-     * @description 组长开启/关闭入群审核
-     * @Date 2020/11/17 14:18
-     **/
-    @PostMapping("editauditswitch")
-    public Result editAuditSwitch(@RequestBody EditAuditSwitchFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO,EditAuditSwitchFormDTO.AddUserShowGroup.class);
-        resiGroupService.editAuditSwitch(formDTO);
-        return new Result();
-    }
-
     /**
      * @Description  查询话题所属小组名
      * @Param groupInfoFormDTO

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

@@ -327,15 +327,6 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	*/
 	void auditEdit(GroupEditionAuditFormDTO param);
 
-	/**
-	 * @return void
-	 * @param formDTO
-	 * @author yinzuomei
-	 * @description 组长开启/关闭入群审核
-	 * @Date 2020/11/17 14:18
-	 **/
-    void editAuditSwitch(EditAuditSwitchFormDTO formDTO);
-
 	/**
 	 * @Description  查询话题所属小组名
 	 * @Param groupInfoFormDTO

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

@@ -164,11 +164,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Value("${openapi.scan.method.imgSyncScan}")
 	private String imgSyncScanMethod;
 
-	@Autowired
-	private ResiGroupCodeService resiGroupCodeService;
-	@Autowired
-	private LoginUserUtil loginUserUtil;
-
 	@Autowired
 	private ResiGroupCodeService resiGroupCodeService;