Skip to content

A
amos-boot-biz
Commit 130f3083 authored by tangwei's avatar tangwei
Browse files
Options

修改日，发电量数据

parent 74808415
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PowerGenerationImpl.java
View file @ 130f3083
...@@ -178,6 +178,9 @@ public class PowerGenerationImpl { ...@@ -178,6 +178,9 @@ public class PowerGenerationImpl {
} }
public List<ESMoonPowerGeneration> getESMoonPowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndicatorData> indexDto,String daty,String day,String year,Double flags){ public List<ESMoonPowerGeneration> getESMoonPowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndicatorData> indexDto,String daty,String day,String year,Double flags){
List<ESMoonPowerGeneration> list=new ArrayList<>(); List<ESMoonPowerGeneration> list=new ArrayList<>();
SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
Date now=new Date();
String datynew= myFmt2.format(now);
if(indexDto!=null&&!indexDto.isEmpty()){ if(indexDto!=null&&!indexDto.isEmpty()){
for (IndicatorData dto : indexDto) { for (IndicatorData dto : indexDto) {
double value=dto.getValueF()!=null?(double)dto.getValueF():0.0; double value=dto.getValueF()!=null?(double)dto.getValueF():0.0;
...@@ -185,7 +188,7 @@ public class PowerGenerationImpl { ...@@ -185,7 +188,7 @@ public class PowerGenerationImpl {
value=value*flags; value=value*flags;
} }
ESMoonPowerGeneration moonPowerGeneration=new ESMoonPowerGeneration( ESMoonPowerGeneration moonPowerGeneration=new ESMoonPowerGeneration(
daty+"_"+dto.getAddress(), datynew+"_"+dto.getAddress(),
stationCacheInfoDto.getStationId(), stationCacheInfoDto.getStationId(),
stationCacheInfoDto.getStationName(), stationCacheInfoDto.getStationName(),
stationCacheInfoDto.getStationType(), stationCacheInfoDto.getStationType(),
...@@ -207,6 +210,9 @@ public class PowerGenerationImpl { ...@@ -207,6 +210,9 @@ public class PowerGenerationImpl {
} }
public List<ESYearPowerGeneration> getESYearPowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndicatorData> indexDto,String daty,String day,Double flags){ public List<ESYearPowerGeneration> getESYearPowerGeneration(StationCacheInfoDto stationCacheInfoDto,List<IndicatorData> indexDto,String daty,String day,Double flags){
List<ESYearPowerGeneration> list=new ArrayList<>(); List<ESYearPowerGeneration> list=new ArrayList<>();
SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd");
Date now=new Date();
String datynew= myFmt2.format(now);
if(indexDto!=null&&!indexDto.isEmpty()){ if(indexDto!=null&&!indexDto.isEmpty()){
for (IndicatorData dto : indexDto) { for (IndicatorData dto : indexDto) {
double value=dto.getValueF()!=null?(double)dto.getValueF():0.0; double value=dto.getValueF()!=null?(double)dto.getValueF():0.0;
...@@ -214,7 +220,7 @@ public class PowerGenerationImpl { ...@@ -214,7 +220,7 @@ public class PowerGenerationImpl {
value=value*flags; value=value*flags;
} }
ESYearPowerGeneration yearPowerGeneration=new ESYearPowerGeneration( ESYearPowerGeneration yearPowerGeneration=new ESYearPowerGeneration(
daty+"_"+dto.getAddress(), datynew+"_"+dto.getAddress(),
stationCacheInfoDto.getStationId(), stationCacheInfoDto.getStationId(),
stationCacheInfoDto.getStationName(), stationCacheInfoDto.getStationName(),
stationCacheInfoDto.getStationType(), stationCacheInfoDto.getStationType(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment