Browse Source

工作端,分类选择接口修改

feature/dangjian
wanggongfeng 3 years ago
parent
commit
b93545c373
  1. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java
  2. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java
  3. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java
  4. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java
  5. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
  6. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@ -148,8 +148,8 @@ public class ApiIssueController {
* 分类列表 * 分类列表
*/ */
@GetMapping("category/list") @GetMapping("category/list")
public Result<List<CategoryDTO>> categorylist(){ public Result<List<CategoryDTO>> categorylist(@RequestParam Map<String, Object> params){
return issueService.categorylist(); return issueService.categorylist(params);
} }
} }

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java

@ -13,8 +13,10 @@ import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 议题模块调用 * 议题模块调用
@ -118,5 +120,5 @@ public interface IssueFeignClient {
* @return * @return
*/ */
@GetMapping(value = "events/epdc-app/issue/categorylist", consumes = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "events/epdc-app/issue/categorylist", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<CategoryDTO>> categorylist(); Result<List<CategoryDTO>> categorylist(@RequestParam Map<String, Object> params);
} }

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java

@ -10,8 +10,10 @@ import com.elink.esua.epdc.dto.issue.form.*;
import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.dto.issue.result.*;
import com.elink.esua.epdc.feign.IssueFeignClient; import com.elink.esua.epdc.feign.IssueFeignClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @Author LC * @Author LC
@ -66,7 +68,7 @@ public class IssueFeignClientFallback implements IssueFeignClient {
} }
@Override @Override
public Result<List<CategoryDTO>> categorylist() { public Result<List<CategoryDTO>> categorylist(Map<String, Object> params) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "categorylist", null); return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "categorylist", params);
} }
} }

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java

@ -103,5 +103,5 @@ public interface IssueService {
* 分类列表 * 分类列表
* @return * @return
*/ */
Result<List<CategoryDTO>> categorylist(); Result<List<CategoryDTO>> categorylist(Map<String, Object> params);
} }

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@ -32,6 +32,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Base64; import java.util.Base64;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -247,7 +248,7 @@ public class IssueServiceImpl implements IssueService {
} }
@Override @Override
public Result<List<CategoryDTO>> categorylist() { public Result<List<CategoryDTO>> categorylist(Map<String, Object> params) {
return issueFeignClient.categorylist(); return issueFeignClient.categorylist(params);
} }
} }

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java

@ -136,8 +136,8 @@ public class EpdcAppIssueController {
} }
@GetMapping("categorylist") @GetMapping("categorylist")
public Result<List<CategoryDTO>> categorylist(){ public Result<List<CategoryDTO>> categorylist(@RequestParam Map<String, Object> params){
List<CategoryDTO> list = categoryService.list(new HashMap<>(1)); List<CategoryDTO> list = categoryService.list(params);
return new Result<List<CategoryDTO>>().ok(list); return new Result<List<CategoryDTO>>().ok(list);
} }

Loading…
Cancel
Save