From 9c5d4a894b92bc8b84a490f2fded5184ea457954 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 20 Jun 2023 10:23:17 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8A=BD?= =?UTF-8?q?=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/ecology/controller/EcologyController.java | 8 ++++---- .../operational/ecology/service/EcologyFlowStationService.java | 4 ++-- .../ecology/service/impl/EcologyFlowStationServiceImpl.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 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 f9f2e35..cbe4991 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 String city) { - return R.data(stationService.station_top(city)); + public R station_top(@RequestParam Long deptId) { + return R.data(stationService.station_top(deptId)); } /** @@ -65,8 +65,8 @@ public class EcologyController extends BladeController { @PostMapping("/trend_chart") @ApiOperationSupport(order = 1) @ApiOperation(value = "指标趋势图", notes = "指标趋势图") - public R trend_chart(@RequestParam String city,@RequestParam String type) { - return R.data(stationService.trend_chart(city,type)); + public R trend_chart(@RequestParam Long deptId,@RequestParam String type) { + return R.data(stationService.trend_chart(deptId,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 d129ab9..5dc89da 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,12 +14,12 @@ import java.util.List; */ public interface EcologyFlowStationService extends BaseService { - EcologFlowStationVo station_top(String city); + EcologFlowStationVo station_top(Long deptId); Boolean generate(Long mon,String year); - List trend_chart(String city,String type); + List trend_chart(Long deptId,String type); List station(); } 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 fbbcda1..820a9fd 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 @@ -98,9 +98,9 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl stations = this.list(Wrappers.lambdaQuery() - .eq(EcologyFlowStationEntity::getCity,city)); + .eq(EcologyFlowStationEntity::getCreateDept,deptId)); if(CollectionUtil.isEmpty(stations)){ return new EcologFlowStationVo(); } @@ -134,9 +134,9 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl trend_chart(String city,String type) { + public List trend_chart(Long deptId,String type) { List stations = this.list(Wrappers.lambdaQuery() - .eq(EcologyFlowStationEntity::getCity,city)); + .eq(EcologyFlowStationEntity::getCreateDept,deptId)); if(CollectionUtil.isEmpty(stations)){ return new ArrayList<>(); }