Skip to content

A
amos-boot-zx-biz
Commit 4bdfe47e authored by wujiang's avatar wujiang
Browse files
Options

修改日统一

parent 0e2eef80
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 136 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java
View file @ 4bdfe47e
...@@ -53,10 +53,9 @@ public class HouseholdTestController { ...@@ -53,10 +53,9 @@ public class HouseholdTestController {
@Autowired @Autowired
private TdHYGFInverterYearGenerateImpl tdHYGFInverterYearGenerateImpl; private TdHYGFInverterYearGenerateImpl tdHYGFInverterYearGenerateImpl;
@Autowired @Autowired
private TdHYGFStationDayGenerateImpl tdHYGFStationDayGenerateImpl; private TdHYGFStationAllGenerateImpl tdHYGFStationAllGenerateImpl;
@Autowired @Autowired
private TdHYGFStationYearGenerateImpl tdHYGFStationMonthGenerateImpl; private TdHYGFStationYearGenerateImpl tdHYGFStationMonthGenerateImpl;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl; private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl;
@Autowired @Autowired
...@@ -221,8 +220,8 @@ public class HouseholdTestController { ...@@ -221,8 +220,8 @@ public class HouseholdTestController {
case "td_hygf_jp_station_power_history": case "td_hygf_jp_station_power_history":
ascriptionService=hygfjpStationPowerHistoryImpl; ascriptionService=hygfjpStationPowerHistoryImpl;
break; break;
case "td_hygf_station_day_generate": case "td_hygf_station_all_generate":
ascriptionService=tdHYGFStationDayGenerateImpl; ascriptionService=tdHYGFStationAllGenerateImpl;
break; break;
case "td_hygf_station_month_generate": case "td_hygf_station_month_generate":
ascriptionService=tdHYGFStationMonthGenerateImpl; ascriptionService=tdHYGFStationMonthGenerateImpl;
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationDayGenerate.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationMonthGenerate.java
View file @ 4bdfe47e
...@@ -10,7 +10,7 @@ import java.io.Serializable; ...@@ -10,7 +10,7 @@ import java.io.Serializable;
*/ */
@Data @Data
@TableName(value = "td_hygf_station_generate_month" ,autoResultMap = true) @TableName(value = "td_hygf_station_generate_month" ,autoResultMap = true)
public class TdHYGFStationDayGenerate implements Serializable { public class TdHYGFStationMonthGenerate implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationDayGenerateMapper.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationMonthGenerateMapper.java
View file @ 4bdfe47e
package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine; package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
public interface TdHYGFStationDayGenerateMapper extends BaseMapper<TdHYGFStationDayGenerate> { public interface TdHYGFStationMonthGenerateMapper extends BaseMapper<TdHYGFStationMonthGenerate> {
} }
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationDayGenerateImpl.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationMonthGenerateImpl.java
View file @ 4bdfe47e
...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPDayPower; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.HYGFJPDayPower;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationDayGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.service.AscriptionService; import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -22,11 +22,11 @@ import java.util.List; ...@@ -22,11 +22,11 @@ import java.util.List;
* @createDate: 2024/4/9 * @createDate: 2024/4/9
*/ */
@Service @Service
public class TdHYGFStationDayGenerateImpl implements AscriptionService { public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
@Autowired @Autowired
private JpStationMapper jpStationMapper; private JpStationMapper jpStationMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Override @Override
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
...@@ -35,8 +35,8 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService { ...@@ -35,8 +35,8 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService {
// //
// Date star = dft.parse(timeNum);//开始时间 // Date star = dft.parse(timeNum);//开始时间
// String yearMonth= dfty.format(star); // String yearMonth= dfty.format(star);
List<TdHYGFStationDayGenerate> hygfjpDayPower = tdHYGFStationDayGenerateMapper.selectList( List<TdHYGFStationMonthGenerate> hygfjpDayPower = TdHYGFStationMonthGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationDayGenerate>(). new QueryWrapper<TdHYGFStationMonthGenerate>().
eq("day_time", timeNum).and(wrapper -> { eq("day_time", timeNum).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
...@@ -49,7 +49,7 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService { ...@@ -49,7 +49,7 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService {
); );
if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){ if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
for (TdHYGFStationDayGenerate dayPower : hygfjpDayPower) { for (TdHYGFStationMonthGenerate dayPower : hygfjpDayPower) {
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>(). JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
eq("third_station_id", dayPower.getThirdStationId())); eq("third_station_id", dayPower.getThirdStationId()));
if(jpStation!=null){ if(jpStation!=null){
...@@ -57,7 +57,7 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService { ...@@ -57,7 +57,7 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService {
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName()); dayPower.setStationName(jpStation.getName());
dayPower.setStationState(jpStation.getState()); dayPower.setStationState(jpStation.getState());
tdHYGFStationDayGenerateMapper.insert(dayPower); TdHYGFStationMonthGenerateMapper.insert(dayPower);
} }
} }
} }
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java
View file @ 4bdfe47e
...@@ -97,7 +97,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -97,7 +97,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
@Autowired @Autowired
private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper; private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper; private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
@Autowired @Autowired
...@@ -283,31 +283,31 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -283,31 +283,31 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
} }
Date today1 = new Date(); Date today1 = new Date();
// 户用场站日发电量 // 户用场站日发电量
TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne( TdHYGFStationMonthGenerate TdHYGFStationMonthGenerate = TdHYGFStationMonthGenerateMapper.selectOne(
new QueryWrapper<TdHYGFStationDayGenerate>().eq("third_station_id", stationIds.get(i)) new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", stationIds.get(i))
.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd")) .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
.eq("year_month", DateUtil.format(today1, "yyyy-MM"))); .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate(); TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
} }
tdHYGFStationDayGenerate.setThirdStationId(stationIds.get(i)); TdHYGFStationMonthGenerate.setThirdStationId(stationIds.get(i));
tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd")); TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM")); TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate()); TdHYGFStationMonthGenerate.setGenerate(jpStation.getDayGenerate());
tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity()); TdHYGFStationMonthGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome()); TdHYGFStationMonthGenerate.setIncome(jpStation.getDayIncome());
// 新加 // 新加
tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationDayGenerate.setStationName(jpStation.getName()); TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
tdHYGFStationDayGenerate.setStationState(jpStation.getState()); TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} else { } else {
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} }
// 户用场站月发电量 // 户用场站月发电量
TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne( TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
View file @ 4bdfe47e
...@@ -84,7 +84,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -84,7 +84,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
@Autowired @Autowired
private HYGFJPDayPowerMapper hygfjpDayPowerMapper; private HYGFJPDayPowerMapper hygfjpDayPowerMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper; private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
@Autowired @Autowired
...@@ -228,31 +228,31 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -228,31 +228,31 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
} }
Date today1 = new Date(); Date today1 = new Date();
// 户用场站日发电量 // 户用场站日发电量
TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper TdHYGFStationMonthGenerate TdHYGFStationMonthGenerate = TdHYGFStationMonthGenerateMapper
.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>() .selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
.eq("third_station_id", jpStation.getThirdStationId()) .eq("third_station_id", jpStation.getThirdStationId())
.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd")) .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
.eq("year_month", DateUtil.format(today1, "yyyy-MM"))); .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) { if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate(); TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
} }
tdHYGFStationDayGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd")); TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM")); TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate()); TdHYGFStationMonthGenerate.setGenerate(jpStation.getDayGenerate());
tdHYGFStationDayGenerate.setFullhour(goodWeStationList.getTo_hour()); TdHYGFStationMonthGenerate.setFullhour(goodWeStationList.getTo_hour());
tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome()); TdHYGFStationMonthGenerate.setIncome(jpStation.getDayIncome());
// 新加 // 新加
tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationDayGenerate.setStationName(jpStation.getName()); TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
tdHYGFStationDayGenerate.setStationState(jpStation.getState()); TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) { if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} else { } else {
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} }
// 户用场站月发电量 // 户用场站月发电量
TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java
View file @ 4bdfe47e
...@@ -111,7 +111,7 @@ public class ImasterDataServiceImpl implements ImasterDataService { ...@@ -111,7 +111,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
@Autowired @Autowired
private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper; private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper; private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
@Autowired @Autowired
...@@ -391,30 +391,30 @@ public class ImasterDataServiceImpl implements ImasterDataService { ...@@ -391,30 +391,30 @@ public class ImasterDataServiceImpl implements ImasterDataService {
} }
Date today1 = new Date(); Date today1 = new Date();
//户用场站日发电量 //户用场站日发电量
TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>() TdHYGFStationMonthGenerate TdHYGFStationMonthGenerate = TdHYGFStationMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
.eq("third_station_id", jpStation.getThirdStationId()) .eq("third_station_id", jpStation.getThirdStationId())
.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd")) .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
.eq("year_month", DateUtil.format(today1, "yyyy-MM"))); .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate(); TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
} }
tdHYGFStationDayGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd")); TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM")); TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate()); TdHYGFStationMonthGenerate.setGenerate(jpStation.getDayGenerate());
tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity()); TdHYGFStationMonthGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome()); TdHYGFStationMonthGenerate.setIncome(jpStation.getDayIncome());
//新加 //新加
tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationDayGenerate.setStationName(jpStation.getName()); TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
tdHYGFStationDayGenerate.setStationState(jpStation.getState()); TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} else { } else {
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} }
//户用场站月发电量 //户用场站月发电量
TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>() TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java
View file @ 4bdfe47e
...@@ -105,7 +105,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -105,7 +105,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
@Autowired @Autowired
private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper; private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper; private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
@Autowired @Autowired
...@@ -313,31 +313,31 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -313,31 +313,31 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
ksolarStationDetailsMapper.insert(ksolarStationDetail); ksolarStationDetailsMapper.insert(ksolarStationDetail);
Date today1 = new Date(); Date today1 = new Date();
// 户用场站日发电量 // 户用场站日发电量
TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper TdHYGFStationMonthGenerate TdHYGFStationMonthGenerate = TdHYGFStationMonthGenerateMapper
.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>().eq("third_station_id", stationId) .selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", stationId)
.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd")) .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
.eq("year_month", DateUtil.format(today1, "yyyy-MM"))); .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate(); TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
} }
tdHYGFStationDayGenerate.setThirdStationId(stationId); TdHYGFStationMonthGenerate.setThirdStationId(stationId);
tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd")); TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM")); TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate()); TdHYGFStationMonthGenerate.setGenerate(jpStation.getDayGenerate());
tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity()); TdHYGFStationMonthGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome()); TdHYGFStationMonthGenerate.setIncome(jpStation.getDayIncome());
// 新加 // 新加
tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationDayGenerate.setStationName(jpStation.getName()); TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
tdHYGFStationDayGenerate.setStationState(jpStation.getState()); TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} else { } else {
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} }
// 户用场站月发电量 // 户用场站月发电量
TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SofarDataAcquisitionServiceImpl.java
View file @ 4bdfe47e
...@@ -41,7 +41,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHY ...@@ -41,7 +41,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHY
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterTotalGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterTotalGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterYearGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterYearGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationDayGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpCollectorMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpCollectorMapper;
...@@ -57,7 +57,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverter ...@@ -57,7 +57,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverter
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterMonthGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterMonthGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterTotalGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterTotalGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterYearGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverterYearGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationDayGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationAllGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationAllGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdJpStationMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdJpStationMapper;
...@@ -84,7 +84,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ ...@@ -84,7 +84,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
@Autowired @Autowired
private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper; private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper; private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
@Autowired @Autowired
...@@ -520,25 +520,25 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ ...@@ -520,25 +520,25 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
// 电站报表 // 电站报表
// 户用场站日发电量 // 户用场站日发电量
Date today1 = new Date(); Date today1 = new Date();
TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne( TdHYGFStationMonthGenerate TdHYGFStationMonthGenerate = TdHYGFStationMonthGenerateMapper.selectOne(
new QueryWrapper<TdHYGFStationDayGenerate>().eq("third_station_id", jpStation.getThirdStationId()) new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", jpStation.getThirdStationId())
.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd")) .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
.eq("year_month", DateUtil.format(today1, "yyyy-MM"))); .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate(); TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
} }
tdHYGFStationDayGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd")); TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM")); TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate()); TdHYGFStationMonthGenerate.setGenerate(jpStation.getDayGenerate());
// 新加 // 新加
tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationDayGenerate.setStationName(jpStation.getName()); TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
tdHYGFStationDayGenerate.setStationState(jpStation.getState()); TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
tdHYGFStationDayGenerate.setFullhour( TdHYGFStationMonthGenerate.setFullhour(
(jpStation.getDayGenerate() == null || jpStation.getCapacity() == null) ? null : (jpStation.getDayGenerate() == null || jpStation.getCapacity() == null) ? null :
...@@ -546,12 +546,12 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ ...@@ -546,12 +546,12 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
: jpStation.getDayGenerate() / jpStation.getCapacity()) : jpStation.getDayGenerate() / jpStation.getCapacity())
); );
tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome()); TdHYGFStationMonthGenerate.setIncome(jpStation.getDayIncome());
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} else { } else {
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} }
// 户用场站月发电量 // 户用场站月发电量
TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne( TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java
View file @ 4bdfe47e
...@@ -77,7 +77,7 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -77,7 +77,7 @@ public class SunlightServiceImpl implements SunlightService {
@Autowired @Autowired
private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper; private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper; private TdHYGFStationYearGenerateMapper TdHYGFStationYearGenerateMapper;
@Autowired @Autowired
...@@ -424,18 +424,18 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -424,18 +424,18 @@ public class SunlightServiceImpl implements SunlightService {
// 电站报表 // 电站报表
// 户用场站日发电量 // 户用场站日发电量
Date today1 = new Date(); Date today1 = new Date();
TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne( TdHYGFStationMonthGenerate TdHYGFStationMonthGenerate = TdHYGFStationMonthGenerateMapper.selectOne(
new QueryWrapper<TdHYGFStationDayGenerate>().eq("third_station_id", jpStation.getThirdStationId()) new QueryWrapper<TdHYGFStationMonthGenerate>().eq("third_station_id", jpStation.getThirdStationId())
.eq("day_time", DateUtil.format(today1, "yyyy-MM-dd")) .eq("day_time", DateUtil.format(today1, "yyyy-MM-dd"))
.eq("year_month", DateUtil.format(today1, "yyyy-MM"))); .eq("year_month", DateUtil.format(today1, "yyyy-MM")));
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate)) {
tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate(); TdHYGFStationMonthGenerate = new TdHYGFStationMonthGenerate();
} }
tdHYGFStationDayGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationMonthGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd")); TdHYGFStationMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM")); TdHYGFStationMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate()); TdHYGFStationMonthGenerate.setGenerate(jpStation.getDayGenerate());
tdHYGFStationDayGenerate.setFullhour( TdHYGFStationMonthGenerate.setFullhour(
(jpStation.getDayGenerate() == null || jpStation.getCapacity() == null) ? null : (jpStation.getDayGenerate() == null || jpStation.getCapacity() == null) ? null :
...@@ -443,19 +443,19 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -443,19 +443,19 @@ public class SunlightServiceImpl implements SunlightService {
: jpStation.getDayGenerate() / jpStation.getCapacity()) : jpStation.getDayGenerate() / jpStation.getCapacity())
); );
tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome()); TdHYGFStationMonthGenerate.setIncome(jpStation.getDayIncome());
// 新加 // 新加
tdHYGFStationDayGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationMonthGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationDayGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationMonthGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationDayGenerate.setStationName(jpStation.getName()); TdHYGFStationMonthGenerate.setStationName(jpStation.getName());
tdHYGFStationDayGenerate.setStationState(jpStation.getState()); TdHYGFStationMonthGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationMonthGenerate.getCreatedTime())) {
tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} else { } else {
tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate); TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
} }
// 户用场站月发电量 // 户用场站月发电量
TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne( TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper.selectOne(
......
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