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 c076abf..95a715d 100644 --- a/src/main/java/mjkf/xinke/main/common/api/DataToolApi.java +++ b/src/main/java/mjkf/xinke/main/common/api/DataToolApi.java @@ -11,4 +11,16 @@ public interface DataToolApi { Call> refreshTask( @Path(value = "task_id") String task_id ); + + @GET("/data/calculate") + Call> calculate( + @Query(value = "year") Integer year, + @Query(value = "month") Integer month + ); + + @GET("/data/collect") + Call> collect( + @Query(value = "year") Integer year, + @Query(value = "month") Integer month + ); } 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 6855a09..ffef48b 100644 --- a/src/main/java/mjkf/xinke/main/common/api/DataToolService.java +++ b/src/main/java/mjkf/xinke/main/common/api/DataToolService.java @@ -25,5 +25,17 @@ public class DataToolService implements ApiService { var response = this.getResponse(call).body(); return response; } + + public NcHttpResponse calculate (Integer year, Integer month) throws Exception { + var call = this.api.calculate(year, month); + var response = this.getResponse(call).body(); + return response; + } + + public NcHttpResponse collect (Integer year, Integer month) throws Exception { + var call = this.api.collect(year, month); + 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 946ddfb..86ab731 100644 --- a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java +++ b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import mjkf.xinke.auth.core.util.StpLoginUserUtil; import mjkf.xinke.common.annotation.CommonLog; +import mjkf.xinke.main.common.api.DataToolService; import mjkf.xinke.main.common.http.FuHttpResponse; import mjkf.xinke.main.constant.HttpErrorResponseEnum; import mjkf.xinke.main.constant.PricePublishStatus; @@ -121,4 +122,17 @@ public class PricePublishController { return FuHttpResponse.Builder().dataResponse(result).build(); } + @Resource + DataToolService dataToolService; + + @ApiOperation("计算发布数据") + @CommonLog("计算发布数据") + @GetMapping("/collect") + public HttpResponse collect( + @ApiParam("年份") @RequestParam("year") Integer year, + @ApiParam("月份") @RequestParam(value = "month") Integer month + ) throws Exception { + var result = dataToolService.collect(year, month); + return FuHttpResponse.Builder().dataResponse(result).build(); + } } diff --git a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java index 2ec1d0f..4ddd8bf 100644 --- a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java +++ b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java @@ -11,6 +11,7 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; import mjkf.xinke.common.annotation.CommonLog; +import mjkf.xinke.main.common.api.DataToolService; import mjkf.xinke.main.common.http.FuHttpResponse; import mjkf.xinke.main.constant.HttpErrorResponseEnum; import mjkf.xinke.main.model.db.PriceResult; @@ -129,4 +130,18 @@ public class PriceResultController { return FuHttpResponse.Builder().dataResponse(result).build(); } + + @Resource + DataToolService dataToolService; + + @ApiOperation("计算趋势表数据") + @CommonLog("计算趋势表数据") + @GetMapping("/calculate") + public HttpResponse calculate( + @ApiParam("年份") @RequestParam("year") Integer year, + @ApiParam("月份") @RequestParam(value = "month") Integer month + ) throws Exception { + var result = dataToolService.calculate(year, month); + return FuHttpResponse.Builder().dataResponse(result).build(); + } } diff --git a/src/main/resources/application-huawei.yml b/src/main/resources/application-huawei.yml index 6567626..7895e52 100644 --- a/src/main/resources/application-huawei.yml +++ b/src/main/resources/application-huawei.yml @@ -19,7 +19,7 @@ main: api: host: - data-tool: http://192.168.1.3:50000 + data-tool: http://material_api:7072 path: predict-file-dir: /predict \ No newline at end of file