#代码同步

hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java

@@ -66,7 +66,7 @@ public class EcologyController extends BladeController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "指标趋势图", notes = "指标趋势图")
     public R trend_chart(@RequestParam Long deptId,@RequestParam String type) {
-        return R.data(stationService.trend_chart(deptId,type));
+        return R.data(stationService.trend_chart(type));
     }
 
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java

@@ -19,7 +19,7 @@ public interface EcologyFlowStationService extends BaseService<EcologyFlowStatio
 
     Boolean generate(Long mon,String year);
 
-    List<TrendChartVo> trend_chart(Long deptId,String type);
+    List<TrendChartVo> trend_chart(String type);
 
     List<StationVo> station();
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.operational.ecology.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hnac.hzims.EquipmentConstants;
 import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo;
 import com.hnac.hzims.operational.ecology.entity.EcologyFlowDataEntity;
 import com.hnac.hzims.operational.ecology.entity.EcologyFlowStationEntity;
@@ -13,7 +12,6 @@ import com.hnac.hzims.operational.ecology.vo.*;
 import com.hnac.hzims.operational.main.constant.HomePageConstant;
 import com.hnac.hzims.operational.main.service.IAnalyseDataService;
 import com.hnac.hzims.operational.main.service.IMainSystemMonitoringService;
-import com.hnac.hzims.operational.main.vo.GenerationPowerVo;
 import com.hnac.hzims.operational.main.vo.HydropowerUnitRealVo;
 import com.hnac.hzims.operational.main.vo.HydropowerUnitTargetVo;
 import com.hnac.hzims.operational.main.vo.WaterLevelVo;
@@ -98,7 +96,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl<EcologyFlowSt
      * @return
      */
     @Override
-    public EcologFlowStationVo station_top() {
+    public EcologFlowStationVo station_top(Long deptId) {
         List<EcologyFlowStationEntity> stations = this.list();
         if(CollectionUtil.isEmpty(stations)){
             return new EcologFlowStationVo();