diff --git a/hzims-service-api/hzims-operational-api/pom.xml b/hzims-service-api/hzims-operational-api/pom.xml index 89215f6..3bbc8d9 100644 --- a/hzims-service-api/hzims-operational-api/pom.xml +++ b/hzims-service-api/hzims-operational-api/pom.xml @@ -57,14 +57,6 @@ org.springblade blade-system-api - - - - com.hnac.hzims - hzims-model - 4.0.0-SNAPSHOT - provided - com.hnac.hzims hzims-biz-common diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ecology/vo/WaterVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ecology/vo/WaterVo.java index 106cbb4..f112b59 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ecology/vo/WaterVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/ecology/vo/WaterVo.java @@ -15,8 +15,4 @@ public class WaterVo { @ApiModelProperty(value = "水位") private Double water; - - @ApiModelProperty(value = "发电流量") - private Double generate; - -} +} \ No newline at end of file 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 06827fe..2ead351 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 @@ -202,7 +202,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl validTargetList = targetList.stream().filter(o-> null != station.getRefDept() && station.getRefDept().equals(o.getDeptId())).collect(Collectors.toList()); List list = new ArrayList<>(); - Random random = new Random(); for(HydropowerUnitRealVo real : validRealList){ DeviceVo device= new DeviceVo(); // 设备编号 @@ -231,10 +230,10 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl levelList = (List) redisTemplate.opsForValue().get(loadwater_level_key); if(CollectionUtil.isEmpty(levelList)){ return; @@ -277,16 +275,7 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl records = analyseDataService.periodTargetData(start,end,3,3,code,HomePageConstant.FRONT_WATER_LEVEL); Random random = new Random(); if(CollectionUtil.isEmpty(records)){ - List waters = new ArrayList<>(); - while (calendar.getTime().compareTo(new Date()) <= 0){ - WaterVo water = new WaterVo(); - water.setTime(DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE)); - water.setWater(random.nextDouble() * 100); - water.setGenerate(random.nextDouble() * 50000); - waters.add(water); - calendar.add(Calendar.DAY_OF_MONTH,1); - } - return waters; + return new ArrayList<>(); } return records.stream().map(record -> { WaterVo water = new WaterVo(); @@ -294,9 +283,8 @@ public class EcologyFlowStationServiceImpl extends BaseServiceImpl