diff --git a/src/main/java/mjkf/xinke/main/common/api/DataToolApi.java b/src/main/java/mjkf/xinke/main/common/api/DataToolApi.java index 95a715d..faf4ba8 100644 --- a/src/main/java/mjkf/xinke/main/common/api/DataToolApi.java +++ b/src/main/java/mjkf/xinke/main/common/api/DataToolApi.java @@ -21,6 +21,7 @@ public interface DataToolApi { @GET("/data/collect") Call> collect( @Query(value = "year") Integer year, - @Query(value = "month") Integer month + @Query(value = "month") Integer month, + @Query(value = "only_avg") Integer onlyAvg ); } diff --git a/src/main/java/mjkf/xinke/main/common/api/DataToolService.java b/src/main/java/mjkf/xinke/main/common/api/DataToolService.java index ffef48b..edde155 100644 --- a/src/main/java/mjkf/xinke/main/common/api/DataToolService.java +++ b/src/main/java/mjkf/xinke/main/common/api/DataToolService.java @@ -32,8 +32,8 @@ public class DataToolService implements ApiService { return response; } - public NcHttpResponse collect (Integer year, Integer month) throws Exception { - var call = this.api.collect(year, month); + public NcHttpResponse collect (Integer year, Integer month, Integer onlyAvg) throws Exception { + var call = this.api.collect(year, month, onlyAvg); var response = this.getResponse(call).body(); return response; } diff --git a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java index 3fded61..d5800d2 100644 --- a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java +++ b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java @@ -158,9 +158,10 @@ public class PricePublishController { @GetMapping("/collect") public HttpResponse collect( @ApiParam("年份") @RequestParam("year") Integer year, - @ApiParam("月份") @RequestParam(value = "month") Integer month + @ApiParam("月份") @RequestParam(value = "month") Integer month, + @ApiParam("仅计算半年均价") @RequestParam(value = "onlyAvg") Integer onlyAvg ) throws Exception { - var result = dataToolService.collect(year, month); + var result = dataToolService.collect(year, month, onlyAvg); return FuHttpResponse.Builder().dataResponse(result).build(); } }