Skip to content

A
amos-boot-biz
Commit 8225f603 authored by tangwei's avatar tangwei
Browse files
Options

修改日月明年发电量

parent 5d6a13f1
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 221 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AllGenerate.java deleted 100644 → 0
View file @ 5d6a13f1
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_all_generate")
public class AllGenerate {
@Id
private Long createdTime;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 年
*/
@TableField("year_time")
private String yearTime;
/**
* 平均功率
*/
@TableField("year")
private String year;
/**
* 平均功率
*/
@TableField("generate")
private Double generate;
public AllGenerate(Long createdTime, String thirdStationId, String yearTime, String year, Double generate) {
this.createdTime = createdTime;
this.thirdStationId = thirdStationId;
this.yearTime = yearTime;
this.year = year;
this.generate = generate;
}
public AllGenerate() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DayGenerate.java
View file @ 8225f603
......@@ -24,19 +24,30 @@ public class DayGenerate {
private String thirdStationId;
/**
* 小时
* 天
*/
@TableField("hour_time")
private String hourTime;
@TableField("day_time")
private String dayTime;
/**
* 月份
*/
@TableField("month_day")
private String monthDay;
@TableField("year_month")
private String yearMonth;
/**
* 发电量
*/
@TableField("generate")
private Double generate;
public DayGenerate(Long createdTime, String thirdStationId, String dayTime, String yearMonth, Double generate) {
this.createdTime = createdTime;
this.thirdStationId = thirdStationId;
this.dayTime = dayTime;
this.yearMonth = yearMonth;
this.generate = generate;
}
public DayGenerate() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthGenerate.java
View file @ 8225f603
......@@ -24,27 +24,28 @@ public class MonthGenerate {
private String thirdStationId;
/**
* 天
* 年
*/
@TableField("day_time")
private String dayTime;
@TableField("month_time")
private String monthTime;
/**
* 月份
* 平均功率
*/
@TableField("year_month")
private String yearMonth;
@TableField("year")
private String year;
/**
* 发电量
* 平均功率
*/
@TableField("generate")
private Double generate;
public MonthGenerate(Long createdTime, String thirdStationId, String dayTime, String yearMonth, Double generate) {
public MonthGenerate(Long createdTime, String thirdStationId, String monthTime, String year, Double generate) {
this.createdTime = createdTime;
this.thirdStationId = thirdStationId;
this.dayTime = dayTime;
this.yearMonth = yearMonth;
this.monthTime = monthTime;
this.year = year;
this.generate = generate;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearGenerate.java
View file @ 8225f603
......@@ -26,25 +26,24 @@ public class YearGenerate {
/**
* 年
*/
@TableField("month_time")
private String monthTime;
@TableField("year_time")
private String yearTime;
/**
* 平均功率
*
*/
@TableField("year")
private String year;
/**
* 平均功率
*
*/
@TableField("generate")
private Double generate;
public YearGenerate(Long createdTime, String thirdStationId, String monthTime, String year, Double generate) {
public YearGenerate(Long createdTime, String thirdStationId, String yearTime, String year, Double generate) {
this.createdTime = createdTime;
this.thirdStationId = thirdStationId;
this.monthTime = monthTime;
this.yearTime = yearTime;
this.year = year;
this.generate = generate;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 8225f603
......@@ -155,8 +155,7 @@
<select id="getJpStation" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.JpStation">
select
`sequence_nbr` sequenceNbr,
third_station_id thirdStationId
*
from hygf_jp_station
<where>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ 8225f603
......@@ -353,7 +353,7 @@ public class JpStationController extends BaseController {
public Object getPowerqx() {
return jpStationMapper.getJpStation();
return jpStationMapper.getJpStation(null);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/scheduled/WindSpeedScheduled.java
View file @ 8225f603
......@@ -24,8 +24,8 @@ public class WindSpeedScheduled {
@Autowired
TdHygfJpInvertorElecHistoryServiceImpl tdHygfJpInvertorElecHistoryServiceImpl;
@Autowired
DayGenerateServiceImpl dayGenerateServiceImpl;
// @Autowired
// DayGenerateServiceImpl dayGenerateServiceImpl;
@Scheduled(cron = "${cheduled.crons}")
private void initData() {
......@@ -38,10 +38,10 @@ public class WindSpeedScheduled {
//发电量
@Scheduled(cron = "${generate.crons}")
private void initGenerateData() {
//发电量
dayGenerateServiceImpl.getGenerate();
}
// @Scheduled(cron = "${generate.crons}")
// private void initGenerateData() {
// //发电量
// dayGenerateServiceImpl.getGenerate();
// }
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DayGenerateServiceImpl.java
View file @ 8225f603
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.module.hygf.api.dto.AllGenerateDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.DayGenerateDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IAllGenerateService;
import com.yeejoin.amos.boot.module.hygf.api.service.IDayGenerateService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.AllGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Service
public class DayGenerateServiceImpl extends BaseService<DayGenerateDto, DayGenerate, DayGenerateMapper> implements IDayGenerateService {
@Autowired
JpStationMapper jpStationMapper;
@Autowired
MonthGenerateMapper monthGenerateMapper;
@Autowired
YearGenerateMapper yearGenerateMapper;
@Autowired
AllGenerateMapper allGenerateMapper;
@Autowired
AllGenerateServiceImpl allGenerateServiceImpl;
@Autowired
MonthGenerateServiceImpl monthGenerateServiceImpl;
@Autowired
YearGenerateServiceImpl yearGenerateServiceImpl;
public void getGenerate() {
LambdaQueryWrapper<JpStation> wrapper = new LambdaQueryWrapper<JpStation>();
Date dayTime=new Date();
SimpleDateFormat simpleDateFormatDay = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat simpleDateFormatMonth = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat simpleDateFormatYear = new SimpleDateFormat("yyyy");
String formattedDateday =simpleDateFormatDay.format(dayTime);
String formattedDateMonth =simpleDateFormatMonth.format(dayTime);
String formattedDateYear =simpleDateFormatYear.format(dayTime);
long utcMillis = dayTime.getTime() ;
// 获取所有场站信息
List<JpStation> list=jpStationMapper.selectList(wrapper);
//查询当日日发电量
LambdaQueryWrapper<MonthGenerate> wrappermonth = new LambdaQueryWrapper<MonthGenerate>();
wrappermonth.eq(MonthGenerate::getDayTime,formattedDateday);
wrappermonth.eq(MonthGenerate::getYearMonth,formattedDateMonth);
List<MonthGenerate> listmonth= monthGenerateMapper.selectList(wrappermonth);
//查询当月月发电量
LambdaQueryWrapper<YearGenerate> wrapperyear = new LambdaQueryWrapper<YearGenerate>();
wrapperyear.eq(YearGenerate::getMonthTime,formattedDateMonth);
wrapperyear.eq(YearGenerate::getYear,formattedDateYear);
List<YearGenerate> listyear= yearGenerateMapper.selectList(wrapperyear);
//查询当年年发电量
LambdaQueryWrapper<AllGenerate> wrapperall = new LambdaQueryWrapper<AllGenerate>();
wrapperall.eq(AllGenerate::getYear,formattedDateYear);
List<AllGenerate> listall= allGenerateMapper.selectList(wrapperall);
List<MonthGenerate> mo=new ArrayList<>();
List<YearGenerate> ye=new ArrayList<>();
List<AllGenerate> al=new ArrayList<>();
//更新数据
if (list!=null&&!list.isEmpty()){
int nu=1;
for (JpStation jpStation : list) {
MonthGenerate monthGenerate=null;
YearGenerate yearGenerate=null;
AllGenerate allGenerate=null;
//更新日发电量
if(listmonth!=null&&!listmonth.isEmpty()){
monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
for (MonthGenerate generate : listmonth) {
if(generate.getYearMonth().equals(formattedDateMonth)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())&&generate.getDayTime().equals(formattedDateday)){
monthGenerate =new MonthGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
break;
}
}
} else{
monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
}
//更新年发电量
if(listyear!=null&&!listyear.isEmpty()){
yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
for (YearGenerate yearGenera : listyear) {
if(yearGenera.getYear().equals(formattedDateYear)&&yearGenera.getThirdStationId().equals(jpStation.getThirdStationId())&&yearGenera.getMonthTime().equals(formattedDateMonth)){
yearGenerate =new YearGenerate(yearGenera.getCreatedTime(), jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
break;
}
}
} else{
yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
}
//更新年发电量
if(listall!=null&&!listall.isEmpty()){
allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
for (AllGenerate generate : listall) {
if(generate.getYear().equals(formattedDateYear)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())){
allGenerate =new AllGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
break;
}
}
} else{
allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
}
mo.add(monthGenerate);
ye.add(yearGenerate);
al.add(allGenerate);
nu=nu+1;
}
//更新保存
allGenerateServiceImpl.saveBatch(al);
monthGenerateServiceImpl.saveBatch(mo);
yearGenerateServiceImpl.saveBatch(ye);
}
}
}
//package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
//
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
//import com.yeejoin.amos.boot.module.hygf.api.dto.AllGenerateDto;
//import com.yeejoin.amos.boot.module.hygf.api.dto.DayGenerateDto;
//import com.yeejoin.amos.boot.module.hygf.api.entity.*;
//import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
//import com.yeejoin.amos.boot.module.hygf.api.service.IAllGenerateService;
//import com.yeejoin.amos.boot.module.hygf.api.service.IDayGenerateService;
//import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.AllGenerateMapper;
//import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
//import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
//import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
//import org.apache.poi.ss.formula.functions.T;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//import org.typroject.tyboot.core.rdbms.service.BaseService;
//
//import java.text.SimpleDateFormat;
//import java.util.ArrayList;
//import java.util.Date;
//import java.util.List;
//import java.util.TimeZone;
//
///**
// * @description:
// * @author: tw
// * @createDate: 2023/11/8
// */
//@Service
//public class DayGenerateServiceImpl extends BaseService<DayGenerateDto, DayGenerate, DayGenerateMapper> implements IDayGenerateService {
// @Autowired
// JpStationMapper jpStationMapper;
//
// @Autowired
// MonthGenerateMapper monthGenerateMapper;
// @Autowired
// YearGenerateMapper yearGenerateMapper;
// @Autowired
// AllGenerateMapper allGenerateMapper;
// @Autowired
// AllGenerateServiceImpl allGenerateServiceImpl;
// @Autowired
// MonthGenerateServiceImpl monthGenerateServiceImpl;
// @Autowired
// YearGenerateServiceImpl yearGenerateServiceImpl;
//
// public void getGenerate() {
// LambdaQueryWrapper<JpStation> wrapper = new LambdaQueryWrapper<JpStation>();
// Date dayTime=new Date();
// SimpleDateFormat simpleDateFormatDay = new SimpleDateFormat("yyyy-MM-dd");
// SimpleDateFormat simpleDateFormatMonth = new SimpleDateFormat("yyyy-MM");
// SimpleDateFormat simpleDateFormatYear = new SimpleDateFormat("yyyy");
// String formattedDateday =simpleDateFormatDay.format(dayTime);
// String formattedDateMonth =simpleDateFormatMonth.format(dayTime);
// String formattedDateYear =simpleDateFormatYear.format(dayTime);
// long utcMillis = dayTime.getTime() ;
// // 获取所有场站信息
// List<JpStation> list=jpStationMapper.selectList(wrapper);
// //查询当日日发电量
// LambdaQueryWrapper<MonthGenerate> wrappermonth = new LambdaQueryWrapper<MonthGenerate>();
// wrappermonth.eq(MonthGenerate::getDayTime,formattedDateday);
// wrappermonth.eq(MonthGenerate::getYearMonth,formattedDateMonth);
// List<MonthGenerate> listmonth= monthGenerateMapper.selectList(wrappermonth);
// //查询当月月发电量
// LambdaQueryWrapper<YearGenerate> wrapperyear = new LambdaQueryWrapper<YearGenerate>();
// wrapperyear.eq(YearGenerate::getMonthTime,formattedDateMonth);
// wrapperyear.eq(YearGenerate::getYear,formattedDateYear);
// List<YearGenerate> listyear= yearGenerateMapper.selectList(wrapperyear);
// //查询当年年发电量
// LambdaQueryWrapper<AllGenerate> wrapperall = new LambdaQueryWrapper<AllGenerate>();
// wrapperall.eq(AllGenerate::getYear,formattedDateYear);
// List<AllGenerate> listall= allGenerateMapper.selectList(wrapperall);
// List<MonthGenerate> mo=new ArrayList<>();
// List<YearGenerate> ye=new ArrayList<>();
// List<AllGenerate> al=new ArrayList<>();
// //更新数据
// if (list!=null&&!list.isEmpty()){
// int nu=1;
// for (JpStation jpStation : list) {
// MonthGenerate monthGenerate=null;
// YearGenerate yearGenerate=null;
// AllGenerate allGenerate=null;
// //更新日发电量
// if(listmonth!=null&&!listmonth.isEmpty()){
// monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
// for (MonthGenerate generate : listmonth) {
// if(generate.getYearMonth().equals(formattedDateMonth)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())&&generate.getDayTime().equals(formattedDateday)){
// monthGenerate =new MonthGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
// break;
// }
// }
// } else{
// monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
// }
// //更新年发电量
// if(listyear!=null&&!listyear.isEmpty()){
// yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
//
// for (YearGenerate yearGenera : listyear) {
// if(yearGenera.getYear().equals(formattedDateYear)&&yearGenera.getThirdStationId().equals(jpStation.getThirdStationId())&&yearGenera.getMonthTime().equals(formattedDateMonth)){
// yearGenerate =new YearGenerate(yearGenera.getCreatedTime(), jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
// break;
// }
// }
// } else{
// yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
// }
// //更新年发电量
// if(listall!=null&&!listall.isEmpty()){
// allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
// for (AllGenerate generate : listall) {
// if(generate.getYear().equals(formattedDateYear)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())){
// allGenerate =new AllGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
// break;
// }
// }
// } else{
// allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
// }
// mo.add(monthGenerate);
// ye.add(yearGenerate);
// al.add(allGenerate);
// nu=nu+1;
// }
// //更新保存
// allGenerateServiceImpl.saveBatch(al);
// monthGenerateServiceImpl.saveBatch(mo);
// yearGenerateServiceImpl.saveBatch(ye);
// }
// }
//
//
//
//}
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