Skip to content

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

统一户用光伏名采集名称

parent 9eb74b69
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 148 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java
View file @ 4796f712
...@@ -60,7 +60,7 @@ public class HouseholdTestController { ...@@ -60,7 +60,7 @@ public class HouseholdTestController {
@Autowired @Autowired
private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl; private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl;
@Autowired @Autowired
TdHYGFStationYearGenerateImpl tdHYGFStationYearGenerateImpl; TdHYGFStationAllGenerateImpl tdHYGFStationYearGenerateImpl;
//户用光伏日发电量 //户用光伏日发电量
@Autowired @Autowired
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/HYGFJPDayPower.java
View file @ 4796f712
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
@TableName(value = "td_hygf_day_power",autoResultMap = true) @TableName(value = "td_hygf_station_power_day",autoResultMap = true)
public class HYGFJPDayPower implements Serializable { public class HYGFJPDayPower implements Serializable {
private Long createdTime; private Long createdTime;
private String tationId; private String tationId;
...@@ -19,7 +19,4 @@ public class HYGFJPDayPower implements Serializable { ...@@ -19,7 +19,4 @@ public class HYGFJPDayPower implements Serializable {
private String regionalCompaniesCode; //区域公司code private String regionalCompaniesCode; //区域公司code
private String amosCompanyCode; //经销商code private String amosCompanyCode; //经销商code
private String stationState;//电站状态 private String stationState;//电站状态
} }
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationYearGenerate.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationAllGenerate.java
View file @ 4796f712
...@@ -9,8 +9,8 @@ import java.io.Serializable; ...@@ -9,8 +9,8 @@ import java.io.Serializable;
* @author DELL * @author DELL
*/ */
@Data @Data
@TableName(value = "td_hygf_station_year_generate" ,autoResultMap = true) @TableName(value = "td_hygf_station_generate_all" ,autoResultMap = true)
public class TdHYGFStationYearGenerate implements Serializable { public class TdHYGFStationAllGenerate implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationDayGenerate.java
View file @ 4796f712
...@@ -9,7 +9,7 @@ import java.io.Serializable; ...@@ -9,7 +9,7 @@ import java.io.Serializable;
* @author DELL * @author DELL
*/ */
@Data @Data
@TableName(value = "td_hygf_station_day_generate" ,autoResultMap = true) @TableName(value = "td_hygf_station_generate_month" ,autoResultMap = true)
public class TdHYGFStationDayGenerate implements Serializable { public class TdHYGFStationDayGenerate implements Serializable {
/** /**
* 创建时间 * 创建时间
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationMonthGenerate.java
View file @ 4796f712
...@@ -9,7 +9,7 @@ import java.io.Serializable; ...@@ -9,7 +9,7 @@ import java.io.Serializable;
* @author DELL * @author DELL
*/ */
@Data @Data
@TableName(value = "td_hygf_station_month_generate" ,autoResultMap = true) @TableName(value = "td_hygf_station_generate_year" ,autoResultMap = true)
public class TdHYGFStationMonthGenerate 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/TdHYGFStationYearGenerateMapper.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationAllGenerateMapper.java
View file @ 4796f712
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.TdHYGFStationYearGenerate; import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationAllGenerate;
public interface TdHYGFStationYearGenerateMapper extends BaseMapper<TdHYGFStationYearGenerate> { public interface TdHYGFStationAllGenerateMapper extends BaseMapper<TdHYGFStationAllGenerate> {
} }
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationYearGenerateImpl.java → amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationAllGenerateImpl.java
View file @ 4796f712
package com.yeejoin.amos.api.householdapi.face.service.business; package com.yeejoin.amos.api.householdapi.face.service.business;
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.tdeingine.TdHYGFStationMonthGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationYearGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.tdeingine.TdHYGFStationAllGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationAllGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.service.AscriptionService;
/** /**
* @description: * @description:
* @author: tw * @author: tw
* @createDate: 2024/4/9 * @createDate: 2024/4/9
*/ */
@Service @Service
public class TdHYGFStationYearGenerateImpl implements AscriptionService { public class TdHYGFStationAllGenerateImpl implements AscriptionService {
@Autowired @Autowired
private JpStationMapper jpStationMapper; private JpStationMapper jpStationMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper; private TdHYGFStationAllGenerateMapper tdHYGFStationYearGenerateMapper;
@Override @Override
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
...@@ -34,8 +34,8 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService { ...@@ -34,8 +34,8 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
Date star = dft.parse(timeNum);//开始时间 Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star); String yearMonth= dfty.format(star);
List<TdHYGFStationYearGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList( List<TdHYGFStationAllGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationYearGenerate>(). new QueryWrapper<TdHYGFStationAllGenerate>().
eq("year", yearMonth).and(wrapper -> { eq("year", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
...@@ -48,7 +48,7 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService { ...@@ -48,7 +48,7 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
); );
if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){ if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
for (TdHYGFStationYearGenerate dayPower : hygfjpDayPower) { for (TdHYGFStationAllGenerate 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) {
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java
View file @ 4796f712
...@@ -101,7 +101,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -101,7 +101,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
@Autowired @Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper; private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper; private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper; private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
...@@ -336,31 +336,31 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -336,31 +336,31 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate); tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
} }
// 户用场站年发电量 // 户用场站年发电量
TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne( TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(
new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", stationIds.get(i)) new QueryWrapper<TdHYGFStationAllGenerate>().eq("third_station_id", stationIds.get(i))
.eq("year_time", DateUtil.format(today1, "yyyy")) .eq("year_time", DateUtil.format(today1, "yyyy"))
.eq("year", DateUtil.format(today1, "yyyy"))); .eq("year", DateUtil.format(today1, "yyyy")));
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate)) {
tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate(); TdHYGFStationAllGenerate = new TdHYGFStationAllGenerate();
} }
tdHYGFStationYearGenerate.setThirdStationId(stationIds.get(i)); TdHYGFStationAllGenerate.setThirdStationId(stationIds.get(i));
tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYear(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate()); TdHYGFStationAllGenerate.setGenerate(jpStation.getYearGenerate());
tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity()); TdHYGFStationAllGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome()); TdHYGFStationAllGenerate.setIncome(jpStation.getYearIncome());
// 新加 // 新加
tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationAllGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationAllGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationYearGenerate.setStationName(jpStation.getName()); TdHYGFStationAllGenerate.setStationName(jpStation.getName());
tdHYGFStationYearGenerate.setStationState(jpStation.getState()); TdHYGFStationAllGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate.getCreatedTime())) {
tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationAllGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} else { } else {
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} }
} }
} }
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java
View file @ 4796f712
...@@ -88,7 +88,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -88,7 +88,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
@Autowired @Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper; private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper; private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper; private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
...@@ -284,31 +284,31 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe ...@@ -284,31 +284,31 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate); tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
} }
// 户用场站年发电量 // 户用场站年发电量
TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper
.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>() .selectOne(new QueryWrapper<TdHYGFStationAllGenerate>()
.eq("third_station_id", jpStation.getThirdStationId()) .eq("third_station_id", jpStation.getThirdStationId())
.eq("year_time", DateUtil.format(today1, "yyyy")) .eq("year_time", DateUtil.format(today1, "yyyy"))
.eq("year", DateUtil.format(today1, "yyyy"))); .eq("year", DateUtil.format(today1, "yyyy")));
if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationYearGenerate)) { if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationAllGenerate)) {
tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate(); TdHYGFStationAllGenerate = new TdHYGFStationAllGenerate();
} }
tdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationAllGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYear(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate()); TdHYGFStationAllGenerate.setGenerate(jpStation.getYearGenerate());
tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity()); TdHYGFStationAllGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome()); TdHYGFStationAllGenerate.setIncome(jpStation.getYearIncome());
// 新加 // 新加
tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationAllGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationAllGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationYearGenerate.setStationName(jpStation.getName()); TdHYGFStationAllGenerate.setStationName(jpStation.getName());
tdHYGFStationYearGenerate.setStationState(jpStation.getState()); TdHYGFStationAllGenerate.setStationState(jpStation.getState());
if (org.springframework.util.ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) { if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationAllGenerate.getCreatedTime())) {
tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationAllGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} else { } else {
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} }
}); });
} }
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java
View file @ 4796f712
...@@ -115,7 +115,7 @@ public class ImasterDataServiceImpl implements ImasterDataService { ...@@ -115,7 +115,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
@Autowired @Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper; private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper; private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper; private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
@Autowired @Autowired
...@@ -443,30 +443,30 @@ public class ImasterDataServiceImpl implements ImasterDataService { ...@@ -443,30 +443,30 @@ public class ImasterDataServiceImpl implements ImasterDataService {
tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate); tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
} }
//户用场站年发电量 //户用场站年发电量
TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>() TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationAllGenerate>()
.eq("third_station_id", jpStation.getThirdStationId()) .eq("third_station_id", jpStation.getThirdStationId())
.eq("year_time", DateUtil.format(today1, "yyyy")) .eq("year_time", DateUtil.format(today1, "yyyy"))
.eq("year", DateUtil.format(today1, "yyyy"))); .eq("year", DateUtil.format(today1, "yyyy")));
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate)) {
tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate(); TdHYGFStationAllGenerate = new TdHYGFStationAllGenerate();
} }
tdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationAllGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYear(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate()); TdHYGFStationAllGenerate.setGenerate(jpStation.getYearGenerate());
tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity()); TdHYGFStationAllGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome()); TdHYGFStationAllGenerate.setIncome(jpStation.getYearIncome());
//新加 //新加
tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationAllGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationAllGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationYearGenerate.setStationName(jpStation.getName()); TdHYGFStationAllGenerate.setStationName(jpStation.getName());
tdHYGFStationYearGenerate.setStationState(jpStation.getState()); TdHYGFStationAllGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate.getCreatedTime())) {
tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationAllGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} else { } else {
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} }
} }
this.inverterDetail(result4); this.inverterDetail(result4);
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java
View file @ 4796f712
...@@ -109,7 +109,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -109,7 +109,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
@Autowired @Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper; private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper; private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper; private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
@Autowired @Autowired
...@@ -367,30 +367,30 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -367,30 +367,30 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate); tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
} }
// 户用场站年发电量 // 户用场站年发电量
TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper
.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", stationId) .selectOne(new QueryWrapper<TdHYGFStationAllGenerate>().eq("third_station_id", stationId)
.eq("year_time", DateUtil.format(today1, "yyyy")) .eq("year_time", DateUtil.format(today1, "yyyy"))
.eq("year", DateUtil.format(today1, "yyyy"))); .eq("year", DateUtil.format(today1, "yyyy")));
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate)) {
tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate(); TdHYGFStationAllGenerate = new TdHYGFStationAllGenerate();
} }
tdHYGFStationYearGenerate.setThirdStationId(stationId); TdHYGFStationAllGenerate.setThirdStationId(stationId);
tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYear(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate()); TdHYGFStationAllGenerate.setGenerate(jpStation.getYearGenerate());
tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity()); TdHYGFStationAllGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome()); TdHYGFStationAllGenerate.setIncome(jpStation.getYearIncome());
// 新加 // 新加
tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationAllGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationAllGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationYearGenerate.setStationName(jpStation.getName()); TdHYGFStationAllGenerate.setStationName(jpStation.getName());
tdHYGFStationYearGenerate.setStationState(jpStation.getState()); TdHYGFStationAllGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate.getCreatedTime())) {
tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationAllGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} else { } else {
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} }
} }
} }
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SofarDataAcquisitionServiceImpl.java
View file @ 4796f712
...@@ -43,7 +43,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHY ...@@ -43,7 +43,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHY
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.TdHYGFStationDayGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFStationMonthGenerate; 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.TdHYGFStationAllGenerate;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpCollectorMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpCollectorMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpInverterElectricityMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpInverterElectricityMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpInverterMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpInverterMapper;
...@@ -59,7 +59,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverter ...@@ -59,7 +59,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFInverter
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.TdHYGFStationDayGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper; 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.TdHYGFStationAllGenerateMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdJpStationMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdJpStationMapper;
import com.yeejoin.amos.api.householdapi.face.service.SofarDataAcquisitionService; import com.yeejoin.amos.api.householdapi.face.service.SofarDataAcquisitionService;
import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum; import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
...@@ -88,7 +88,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ ...@@ -88,7 +88,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
@Autowired @Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper; private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper; private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper; private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
@Autowired @Autowired
...@@ -585,34 +585,34 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ ...@@ -585,34 +585,34 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate); tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
} }
// 户用场站年发电量 // 户用场站年发电量
TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne( TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(
new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", jpStation.getThirdStationId()) new QueryWrapper<TdHYGFStationAllGenerate>().eq("third_station_id", jpStation.getThirdStationId())
.eq("year_time", DateUtil.format(today1, "yyyy")) .eq("year_time", DateUtil.format(today1, "yyyy"))
.eq("year", DateUtil.format(today1, "yyyy"))); .eq("year", DateUtil.format(today1, "yyyy")));
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate)) {
tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate(); TdHYGFStationAllGenerate = new TdHYGFStationAllGenerate();
} }
tdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationAllGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYear(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate()); TdHYGFStationAllGenerate.setGenerate(jpStation.getYearGenerate());
tdHYGFStationYearGenerate.setFullhour( TdHYGFStationAllGenerate.setFullhour(
// jpStation.getYearGenerate() / jpStation.getCapacity() // jpStation.getYearGenerate() / jpStation.getCapacity()
(jpStation.getYearGenerate() == null || jpStation.getCapacity() == null) ? null (jpStation.getYearGenerate() == null || jpStation.getCapacity() == null) ? null
: (jpStation.getCapacity() <= 0.0 ? null : (jpStation.getCapacity() <= 0.0 ? null
: jpStation.getYearGenerate() / jpStation.getCapacity())); : jpStation.getYearGenerate() / jpStation.getCapacity()));
tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome()); TdHYGFStationAllGenerate.setIncome(jpStation.getYearIncome());
// 新加 // 新加
tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationAllGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationAllGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationYearGenerate.setStationName(jpStation.getName()); TdHYGFStationAllGenerate.setStationName(jpStation.getName());
tdHYGFStationYearGenerate.setStationState(jpStation.getState()); TdHYGFStationAllGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate.getCreatedTime())) {
tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationAllGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} else { } else {
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} }
} }
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java
View file @ 4796f712
...@@ -81,7 +81,7 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -81,7 +81,7 @@ public class SunlightServiceImpl implements SunlightService {
@Autowired @Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper; private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
@Autowired @Autowired
private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper; private TdHYGFStationAllGenerateMapper TdHYGFStationAllGenerateMapper;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper; private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
@Autowired @Autowired
...@@ -494,34 +494,34 @@ public class SunlightServiceImpl implements SunlightService { ...@@ -494,34 +494,34 @@ public class SunlightServiceImpl implements SunlightService {
tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate); tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
} }
// 户用场站年发电量 // 户用场站年发电量
TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne( TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper.selectOne(
new QueryWrapper<TdHYGFStationYearGenerate>().eq("third_station_id", jpStation.getThirdStationId()) new QueryWrapper<TdHYGFStationAllGenerate>().eq("third_station_id", jpStation.getThirdStationId())
.eq("year_time", DateUtil.format(today1, "yyyy")) .eq("year_time", DateUtil.format(today1, "yyyy"))
.eq("year", DateUtil.format(today1, "yyyy"))); .eq("year", DateUtil.format(today1, "yyyy")));
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate)) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate)) {
tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate(); TdHYGFStationAllGenerate = new TdHYGFStationAllGenerate();
} }
tdHYGFStationYearGenerate.setThirdStationId(jpStation.getThirdStationId()); TdHYGFStationAllGenerate.setThirdStationId(jpStation.getThirdStationId());
tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy")); TdHYGFStationAllGenerate.setYear(DateUtil.format(today1, "yyyy"));
tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate()); TdHYGFStationAllGenerate.setGenerate(jpStation.getYearGenerate());
tdHYGFStationYearGenerate.setFullhour( TdHYGFStationAllGenerate.setFullhour(
// jpStation.getYearGenerate() / jpStation.getCapacity() // jpStation.getYearGenerate() / jpStation.getCapacity()
(jpStation.getYearGenerate() == null || jpStation.getCapacity() == null) ? null (jpStation.getYearGenerate() == null || jpStation.getCapacity() == null) ? null
: (jpStation.getCapacity() <= 0.0 ? null : (jpStation.getCapacity() <= 0.0 ? null
: jpStation.getYearGenerate() / jpStation.getCapacity())); : jpStation.getYearGenerate() / jpStation.getCapacity()));
tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome()); TdHYGFStationAllGenerate.setIncome(jpStation.getYearIncome());
// 新加 // 新加
tdHYGFStationYearGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode()); TdHYGFStationAllGenerate.setAmosCompanyCode(jpStation.getAmosCompanyCode());
tdHYGFStationYearGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); TdHYGFStationAllGenerate.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
tdHYGFStationYearGenerate.setStationName(jpStation.getName()); TdHYGFStationAllGenerate.setStationName(jpStation.getName());
tdHYGFStationYearGenerate.setStationState(jpStation.getState()); TdHYGFStationAllGenerate.setStationState(jpStation.getState());
if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) { if (ObjectUtils.isEmpty(TdHYGFStationAllGenerate.getCreatedTime())) {
tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis()); TdHYGFStationAllGenerate.setCreatedTime(System.currentTimeMillis());
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} else { } else {
tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate); TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
} }
} }
......
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