Commit d76c69e6 authored by hezhuozhi's avatar hezhuozhi

Merge remote-tracking branch 'origin/developer' into developer

parents ac98443f 81228345
...@@ -53,14 +53,13 @@ public class HouseholdTestController { ...@@ -53,14 +53,13 @@ public class HouseholdTestController {
@Autowired @Autowired
private TdHYGFInverterYearGenerateImpl tdHYGFInverterYearGenerateImpl; private TdHYGFInverterYearGenerateImpl tdHYGFInverterYearGenerateImpl;
@Autowired @Autowired
private TdHYGFStationDayGenerateImpl tdHYGFStationDayGenerateImpl; private TdHYGFStationAllGenerateImpl tdHYGFStationAllGenerateImpl;
@Autowired @Autowired
private TdHYGFStationMonthGenerateImpl tdHYGFStationMonthGenerateImpl; private TdHYGFStationYearGenerateImpl tdHYGFStationMonthGenerateImpl;
@Autowired @Autowired
private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl; private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl;
@Autowired @Autowired
TdHYGFStationYearGenerateImpl tdHYGFStationYearGenerateImpl; TdHYGFStationAllGenerateImpl tdHYGFStationYearGenerateImpl;
//户用光伏日发电量 //户用光伏日发电量
@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;
......
...@@ -6,10 +6,14 @@ import lombok.Data; ...@@ -6,10 +6,14 @@ 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 String tationId; *
*/
private static final long serialVersionUID = 1L;
private Long createdTime;
private String thirdStationId;
private String hour; private String hour;
private String yearMonthDay; private String yearMonthDay;
private Double power; private Double power;
...@@ -19,7 +23,4 @@ public class HYGFJPDayPower implements Serializable { ...@@ -19,7 +23,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;//电站状态
} }
...@@ -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_day_generate" ,autoResultMap = true) @TableName(value = "td_hygf_station_generate_all" ,autoResultMap = true)
public class TdHYGFStationDayGenerate implements Serializable { public class TdHYGFStationAllGenerate implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
...@@ -20,13 +20,13 @@ public class TdHYGFStationDayGenerate implements Serializable { ...@@ -20,13 +20,13 @@ public class TdHYGFStationDayGenerate implements Serializable {
*/ */
private String thirdStationId; private String thirdStationId;
/** /**
*日 yyyy-MM-dd *日 yyyy-MM
*/ */
private String dayTime; private String yearTime;
/** /**
*月 yyyy-MM *月 yyyy
*/ */
private String yearMonth; private String year;
/** /**
* 发电量 * 发电量
*/ */
......
...@@ -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_month" ,autoResultMap = true)
public class TdHYGFStationMonthGenerate implements Serializable { public class TdHYGFStationMonthGenerate implements Serializable {
/** /**
* 创建时间 * 创建时间
...@@ -20,13 +20,13 @@ public class TdHYGFStationMonthGenerate implements Serializable { ...@@ -20,13 +20,13 @@ public class TdHYGFStationMonthGenerate implements Serializable {
*/ */
private String thirdStationId; private String thirdStationId;
/** /**
*日 yyyy-MM *日 yyyy-MM-dd
*/ */
private String monthTime; private String dayTime;
/** /**
*月 yyyy *月 yyyy-MM
*/ */
private String year; private String yearMonth;
/** /**
* 发电量 * 发电量
*/ */
......
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine; package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import lombok.Data;
/** /**
* @author DELL * @author DELL
*/ */
@Data @Data
@TableName(value = "td_hygf_station_year_generate" ,autoResultMap = true) @TableName(value = "td_hygf_station_generate_year" ,autoResultMap = true)
public class TdHYGFStationYearGenerate implements Serializable { public class TdHYGFStationYearGenerate implements Serializable {
/** /**
* 创建时间 * 创建时间
...@@ -22,7 +23,7 @@ public class TdHYGFStationYearGenerate implements Serializable { ...@@ -22,7 +23,7 @@ public class TdHYGFStationYearGenerate implements Serializable {
/** /**
*日 yyyy-MM *日 yyyy-MM
*/ */
private String yearTime; private String monthTime;
/** /**
*月 yyyy *月 yyyy
*/ */
......
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.TdHYGFStationAllGenerate;
public interface TdHYGFStationDayGenerateMapper extends BaseMapper<TdHYGFStationDayGenerate> { public interface TdHYGFStationAllGenerateMapper extends BaseMapper<TdHYGFStationAllGenerate> {
} }
...@@ -44,7 +44,7 @@ public class HYGFJPDayPowerImpl implements AscriptionService { ...@@ -44,7 +44,7 @@ public class HYGFJPDayPowerImpl implements AscriptionService {
if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){ if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
for (HYGFJPDayPower dayPower : hygfjpDayPower) { for (HYGFJPDayPower dayPower : hygfjpDayPower) {
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>(). JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
eq("third_station_id", dayPower.getTationId())); eq("third_station_id", dayPower.getThirdStationId()));
if(jpStation!=null) { if(jpStation!=null) {
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode()); dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
......
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.HYGFJPDayPower;
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.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationDayGenerateMapper;
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 TdHYGFStationDayGenerateImpl implements AscriptionService { public class TdHYGFStationAllGenerateImpl implements AscriptionService {
@Autowired @Autowired
private JpStationMapper jpStationMapper; private JpStationMapper jpStationMapper;
@Autowired @Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper; private TdHYGFStationAllGenerateMapper tdHYGFStationAllGenerateMapper;
@Override @Override
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
// DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
// DateFormat dfty = new SimpleDateFormat("yyyy-MM"); DateFormat dfty = new SimpleDateFormat("yyyy");
//
// 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<TdHYGFStationAllGenerate> hygfjpDayPower = tdHYGFStationAllGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationDayGenerate>(). new QueryWrapper<TdHYGFStationAllGenerate>().
eq("day_time", timeNum).and(wrapper -> { eq("year", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
.isNull("amos_company_code") .isNull("amos_company_code")
...@@ -49,15 +48,15 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService { ...@@ -49,15 +48,15 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService {
); );
if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){ if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
for (TdHYGFStationDayGenerate 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) {
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode()); dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
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); tdHYGFStationAllGenerateMapper.insert(dayPower);
} }
} }
} }
......
...@@ -2,7 +2,8 @@ package com.yeejoin.amos.api.householdapi.face.service.business; ...@@ -2,7 +2,8 @@ package com.yeejoin.amos.api.householdapi.face.service.business;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.TdHYGFInverterYearGenerate; 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.TdHYGFStationMonthGenerate; 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.TdHYGFStationMonthGenerateMapper; import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
...@@ -25,18 +26,18 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService { ...@@ -25,18 +26,18 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
@Autowired @Autowired
private JpStationMapper jpStationMapper; private JpStationMapper jpStationMapper;
@Autowired @Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper; private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Override @Override
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); // DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy-MM"); // DateFormat dfty = new SimpleDateFormat("yyyy-MM");
//
Date star = dft.parse(timeNum);//开始时间 // Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star); // String yearMonth= dfty.format(star);
List<TdHYGFStationMonthGenerate> hygfjpDayPower = tdHYGFStationMonthGenerateMapper.selectList( List<TdHYGFStationMonthGenerate> hygfjpDayPower = TdHYGFStationMonthGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationMonthGenerate>(). new QueryWrapper<TdHYGFStationMonthGenerate>().
eq("month_time", yearMonth).and(wrapper -> { eq("day_time", timeNum).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
.isNull("amos_company_code") .isNull("amos_company_code")
...@@ -56,7 +57,7 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService { ...@@ -56,7 +57,7 @@ public class TdHYGFStationMonthGenerateImpl 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());
tdHYGFStationMonthGenerateMapper.insert(dayPower); TdHYGFStationMonthGenerateMapper.insert(dayPower);
} }
} }
} }
...@@ -64,4 +65,4 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService { ...@@ -64,4 +65,4 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
\ No newline at end of file
package com.yeejoin.amos.api.householdapi.face.service.business; package com.yeejoin.amos.api.householdapi.face.service.business;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
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.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.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.mapper.hygf.JpStationMapper; 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.orm.mapper.tdengine.TdHYGFStationYearGenerateMapper;
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.stereotype.Service;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/** /**
* @description: * @description:
...@@ -30,13 +30,13 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService { ...@@ -30,13 +30,13 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy"); DateFormat dfty = new SimpleDateFormat("yyyy-MM");
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<TdHYGFStationYearGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationYearGenerate>(). new QueryWrapper<TdHYGFStationYearGenerate>().
eq("year", yearMonth).and(wrapper -> { eq("month_time", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
.isNull("amos_company_code") .isNull("amos_company_code")
...@@ -51,12 +51,12 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService { ...@@ -51,12 +51,12 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
for (TdHYGFStationYearGenerate dayPower : hygfjpDayPower) { for (TdHYGFStationYearGenerate 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){
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode()); dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode()); dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName()); dayPower.setStationName(jpStation.getName());
dayPower.setStationState(jpStation.getState()); dayPower.setStationState(jpStation.getState());
tdHYGFStationYearGenerateMapper.insert(dayPower); tdHYGFStationYearGenerateMapper.insert(dayPower);
} }
} }
} }
...@@ -64,4 +64,4 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService { ...@@ -64,4 +64,4 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
\ No newline at end of file
...@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter; ...@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("td_hygf_all_power") @TableName("td_hygf_station_power_all")
public class AllPower { public class AllPower {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,7 +26,7 @@ public class AllPower { ...@@ -26,7 +26,7 @@ public class AllPower {
/** /**
* 第三方电站id * 第三方电站id
*/ */
@TableField("tation_id") @TableField("third_station_id")
private String thirdStationId; private String thirdStationId;
/** /**
......
...@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id; ...@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("td_hygf_station_day_generate") @TableName("td_hygf_station_generate_month")
public class DayGenerate { public class DayGenerate {
@Id @Id
private Long createdTime; private Long createdTime;
......
...@@ -14,7 +14,7 @@ import lombok.experimental.Accessors; ...@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("td_hygf_day_power") @TableName("td_hygf_station_power_day")
public class DayPower { public class DayPower {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,7 +24,7 @@ public class DayPower { ...@@ -24,7 +24,7 @@ public class DayPower {
/** /**
* 第三方电站id * 第三方电站id
*/ */
@TableField("tation_id") @TableField("third_station_id")
private String thirdStationId; private String thirdStationId;
/** /**
......
...@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id; ...@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("td_hygf_station_month_generate") @TableName("td_hygf_station_generate_year")
public class MonthGenerate { public class MonthGenerate {
@Id @Id
private Long createdTime; private Long createdTime;
......
...@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter; ...@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("td_hygf_month_power") @TableName("td_hygf_station_power_month")
public class MonthPower { public class MonthPower {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -32,7 +32,7 @@ public class MonthPower { ...@@ -32,7 +32,7 @@ public class MonthPower {
/** /**
* 第三方电站id * 第三方电站id
*/ */
@TableField("tation_id") @TableField("third_station_id")
private String thirdStationId; private String thirdStationId;
/** /**
......
...@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id; ...@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("td_hygf_station_year_generate") @TableName("td_hygf_station_generate_all")
public class YearGenerate { public class YearGenerate {
@Id @Id
private Long createdTime; private Long createdTime;
......
...@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter; ...@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("td_hygf_year_power") @TableName("td_hygf_station_power_year")
public class YearPower { public class YearPower {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,7 +26,7 @@ public class YearPower { ...@@ -26,7 +26,7 @@ public class YearPower {
/** /**
* 第三方电站id * 第三方电站id
*/ */
@TableField("tation_id") @TableField("third_station_id")
private String thirdStationId; private String thirdStationId;
/** /**
......
...@@ -96,6 +96,28 @@ ...@@ -96,6 +96,28 @@
<artifactId>seata-spring-boot-starter</artifactId> <artifactId>seata-spring-boot-starter</artifactId>
<version>1.8.0</version> <version>1.8.0</version>
</dependency> </dependency>
<!-- ICBC工行支付 -->
<dependency>
<groupId>com.icbc.sdk</groupId>
<artifactId>hsm-software-share</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>com.icbc.sdk</groupId>
<artifactId>icbc-api-sdk-cop</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.icbc.sdk</groupId>
<artifactId>icbc-api-sdk-cop-io</artifactId>
<version>1.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
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