From 61cbd2adcf24fcc1f593ab3443a29a712932d587 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Mon, 14 Aug 2023 14:38:54 +0800 Subject: [PATCH] =?UTF-8?q?#=E9=BB=94=E4=B8=9C=E5=8D=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/ecology/controller/EcologyController.java | 6 +++--- .../operational/ecology/service/EcologyFlowStationService.java | 2 +- .../ecology/service/impl/EcologyFlowStationServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java index 597e154..8fcf2aa 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java @@ -54,8 +54,8 @@ public class EcologyController extends BladeController { @PostMapping("/station_top") @ApiOperationSupport(order = 1) @ApiOperation(value = "站点数据及达标率排行", notes = "站点数据及达标率排行") - public R station_top(@RequestParam Long deptId) { - return R.data(stationService.station_top(deptId)); + public R station_top() { + return R.data(stationService.station_top()); } /** @@ -65,7 +65,7 @@ public class EcologyController extends BladeController { @PostMapping("/trend_chart") @ApiOperationSupport(order = 1) @ApiOperation(value = "指标趋势图", notes = "指标趋势图") - public R trend_chart(@RequestParam Long deptId,@RequestParam String type) { + public R trend_chart(@RequestParam String type) { return R.data(stationService.trend_chart(type)); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java index 1d3d990..ba6ba2a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java @@ -14,7 +14,7 @@ import java.util.List; */ public interface EcologyFlowStationService extends BaseService { - EcologFlowStationVo station_top(Long deptId); + EcologFlowStationVo station_top(); Boolean generate(Long mon,String year); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java index d296266..30f9969 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java @@ -96,7 +96,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl stations = this.list(); if(CollectionUtil.isEmpty(stations)){ return new EcologFlowStationVo();