Skip to content

A
amos-boot-zx-biz
Commit d76c69e6 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

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

parents ac98443f 81228345
Expand all Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 85 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java
View file @ d76c69e6
......@@ -53,14 +53,13 @@ public class HouseholdTestController {
@Autowired
private TdHYGFInverterYearGenerateImpl tdHYGFInverterYearGenerateImpl;
@Autowired
private TdHYGFStationDayGenerateImpl tdHYGFStationDayGenerateImpl;
private TdHYGFStationAllGenerateImpl tdHYGFStationAllGenerateImpl;
@Autowired
private TdHYGFStationMonthGenerateImpl tdHYGFStationMonthGenerateImpl;
private TdHYGFStationYearGenerateImpl tdHYGFStationMonthGenerateImpl;
@Autowired
private TdHYGFInverterTotalGenerateImpl tdHYGFInverterTotalGenerateImpl;
@Autowired
TdHYGFStationYearGenerateImpl tdHYGFStationYearGenerateImpl;
TdHYGFStationAllGenerateImpl tdHYGFStationYearGenerateImpl;
//户用光伏日发电量
@Autowired
......@@ -221,8 +220,8 @@ public class HouseholdTestController {
case "td_hygf_jp_station_power_history":
ascriptionService=hygfjpStationPowerHistoryImpl;
break;
case "td_hygf_station_day_generate":
ascriptionService=tdHYGFStationDayGenerateImpl;
case "td_hygf_station_all_generate":
ascriptionService=tdHYGFStationAllGenerateImpl;
break;
case "td_hygf_station_month_generate":
ascriptionService=tdHYGFStationMonthGenerateImpl;
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/HYGFJPDayPower.java
View file @ d76c69e6
......@@ -6,10 +6,14 @@ import lombok.Data;
import java.io.Serializable;
@Data
@TableName(value = "td_hygf_day_power",autoResultMap = true)
@TableName(value = "td_hygf_station_power_day",autoResultMap = true)
public class HYGFJPDayPower implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
private Long createdTime;
private String tationId;
private String thirdStationId;
private String hour;
private String yearMonthDay;
private Double power;
......@@ -19,7 +23,4 @@ public class HYGFJPDayPower implements Serializable {
private String regionalCompaniesCode; //区域公司code
private String amosCompanyCode; //经销商code
private String stationState;//电站状态
}
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/TdHYGFStationAllGenerate.java
View file @ d76c69e6
......@@ -9,8 +9,8 @@ import java.io.Serializable;
* @author DELL
*/
@Data
@TableName(value = "td_hygf_station_day_generate" ,autoResultMap = true)
public class TdHYGFStationDayGenerate implements Serializable {
@TableName(value = "td_hygf_station_generate_all" ,autoResultMap = true)
public class TdHYGFStationAllGenerate implements Serializable {
/**
* 创建时间
*/
......@@ -20,13 +20,13 @@ public class TdHYGFStationDayGenerate implements Serializable {
*/
private String thirdStationId;
/**
*日 yyyy-MM-dd
*日 yyyy-MM
*/
private String dayTime;
private String yearTime;
/**
*月 yyyy-MM
*月 yyyy
*/
private String yearMonth;
private String year;
/**
* 发电量
*/
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationMonthGenerate.java
View file @ d76c69e6
......@@ -9,7 +9,7 @@ import java.io.Serializable;
* @author DELL
*/
@Data
@TableName(value = "td_hygf_station_month_generate" ,autoResultMap = true)
@TableName(value = "td_hygf_station_generate_month" ,autoResultMap = true)
public class TdHYGFStationMonthGenerate implements Serializable {
/**
* 创建时间
......@@ -20,13 +20,13 @@ public class TdHYGFStationMonthGenerate implements Serializable {
*/
private String thirdStationId;
/**
*日 yyyy-MM
*日 yyyy-MM-dd
*/
private String monthTime;
private String dayTime;
/**
*月 yyyy
*月 yyyy-MM
*/
private String year;
private String yearMonth;
/**
* 发电量
*/
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationYearGenerate.java
View file @ d76c69e6
package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import lombok.Data;
/**
* @author DELL
*/
@Data
@TableName(value = "td_hygf_station_year_generate" ,autoResultMap = true)
@TableName(value = "td_hygf_station_generate_year" ,autoResultMap = true)
public class TdHYGFStationYearGenerate implements Serializable {
/**
* 创建时间
......@@ -22,7 +23,7 @@ public class TdHYGFStationYearGenerate implements Serializable {
/**
*日 yyyy-MM
*/
private String yearTime;
private String monthTime;
/**
*月 yyyy
*/
......
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/TdHYGFStationAllGenerateMapper.java
View file @ d76c69e6
package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
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> {
}
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/HYGFJPDayPowerImpl.java
View file @ d76c69e6
......@@ -44,7 +44,7 @@ public class HYGFJPDayPowerImpl implements AscriptionService {
if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
for (HYGFJPDayPower dayPower : hygfjpDayPower) {
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
eq("third_station_id", dayPower.getTationId()));
eq("third_station_id", dayPower.getThirdStationId()));
if(jpStation!=null) {
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
......
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/TdHYGFStationAllGenerateImpl.java
View file @ d76c69e6
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.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.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:
* @author: tw
* @createDate: 2024/4/9
*/
@Service
public class TdHYGFStationDayGenerateImpl implements AscriptionService {
public class TdHYGFStationAllGenerateImpl implements AscriptionService {
@Autowired
private JpStationMapper jpStationMapper;
@Autowired
private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
private TdHYGFStationAllGenerateMapper tdHYGFStationAllGenerateMapper;
@Override
public void updateAscription(String timeNum) {
try {
// DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
// DateFormat dfty = new SimpleDateFormat("yyyy-MM");
//
// Date star = dft.parse(timeNum);//开始时间
// String yearMonth= dfty.format(star);
List<TdHYGFStationDayGenerate> hygfjpDayPower = tdHYGFStationDayGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationDayGenerate>().
eq("day_time", timeNum).and(wrapper -> {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy");
Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star);
List<TdHYGFStationAllGenerate> hygfjpDayPower = tdHYGFStationAllGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationAllGenerate>().
eq("year", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code")
.or()
.isNull("amos_company_code")
......@@ -49,15 +48,15 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService {
);
if(hygfjpDayPower!=null&&!hygfjpDayPower.isEmpty()){
for (TdHYGFStationDayGenerate dayPower : hygfjpDayPower) {
for (TdHYGFStationAllGenerate dayPower : hygfjpDayPower) {
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
eq("third_station_id", dayPower.getThirdStationId()));
if(jpStation!=null){
if(jpStation!=null) {
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName());
dayPower.setStationState(jpStation.getState());
tdHYGFStationDayGenerateMapper.insert(dayPower);
tdHYGFStationAllGenerateMapper.insert(dayPower);
}
}
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationMonthGenerateImpl.java
View file @ d76c69e6
......@@ -2,7 +2,8 @@ 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.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.mapper.hygf.JpStationMapper;
import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.TdHYGFStationMonthGenerateMapper;
......@@ -25,18 +26,18 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
@Autowired
private JpStationMapper jpStationMapper;
@Autowired
private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
private TdHYGFStationMonthGenerateMapper TdHYGFStationMonthGenerateMapper;
@Override
public void updateAscription(String timeNum) {
try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy-MM");
Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star);
List<TdHYGFStationMonthGenerate> hygfjpDayPower = tdHYGFStationMonthGenerateMapper.selectList(
// DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
// DateFormat dfty = new SimpleDateFormat("yyyy-MM");
//
// Date star = dft.parse(timeNum);//开始时间
// String yearMonth= dfty.format(star);
List<TdHYGFStationMonthGenerate> hygfjpDayPower = TdHYGFStationMonthGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationMonthGenerate>().
eq("month_time", yearMonth).and(wrapper -> {
eq("day_time", timeNum).and(wrapper -> {
wrapper.isNull("regional_companies_code")
.or()
.isNull("amos_company_code")
......@@ -56,7 +57,7 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName());
dayPower.setStationState(jpStation.getState());
tdHYGFStationMonthGenerateMapper.insert(dayPower);
TdHYGFStationMonthGenerateMapper.insert(dayPower);
}
}
}
......
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/business/TdHYGFStationYearGenerateImpl.java
View file @ d76c69e6
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.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.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* @description:
......@@ -30,13 +30,13 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
public void updateAscription(String timeNum) {
try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy");
DateFormat dfty = new SimpleDateFormat("yyyy-MM");
Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star);
List<TdHYGFStationYearGenerate> hygfjpDayPower = tdHYGFStationYearGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationYearGenerate>().
eq("year", yearMonth).and(wrapper -> {
eq("month_time", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code")
.or()
.isNull("amos_company_code")
......@@ -51,7 +51,7 @@ public class TdHYGFStationYearGenerateImpl implements AscriptionService {
for (TdHYGFStationYearGenerate dayPower : hygfjpDayPower) {
JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().
eq("third_station_id", dayPower.getThirdStationId()));
if(jpStation!=null) {
if(jpStation!=null){
dayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
dayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
dayPower.setStationName(jpStation.getName());
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AllPower.java
View file @ d76c69e6
......@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter;
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_all_power")
@TableName("td_hygf_station_power_all")
public class AllPower {
private static final long serialVersionUID = 1L;
......@@ -26,7 +26,7 @@ public class AllPower {
/**
* 第三方电站id
*/
@TableField("tation_id")
@TableField("third_station_id")
private String thirdStationId;
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DayGenerate.java
View file @ d76c69e6
......@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id;
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_station_day_generate")
@TableName("td_hygf_station_generate_month")
public class DayGenerate {
@Id
private Long createdTime;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DayPower.java
View file @ d76c69e6
......@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_day_power")
@TableName("td_hygf_station_power_day")
public class DayPower {
private static final long serialVersionUID = 1L;
......@@ -24,7 +24,7 @@ public class DayPower {
/**
* 第三方电站id
*/
@TableField("tation_id")
@TableField("third_station_id")
private String thirdStationId;
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthGenerate.java
View file @ d76c69e6
......@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id;
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_station_month_generate")
@TableName("td_hygf_station_generate_year")
public class MonthGenerate {
@Id
private Long createdTime;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthPower.java
View file @ d76c69e6
......@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter;
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_month_power")
@TableName("td_hygf_station_power_month")
public class MonthPower {
private static final long serialVersionUID = 1L;
......@@ -32,7 +32,7 @@ public class MonthPower {
/**
* 第三方电站id
*/
@TableField("tation_id")
@TableField("third_station_id")
private String thirdStationId;
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearGenerate.java
View file @ d76c69e6
......@@ -13,7 +13,7 @@ import org.springframework.data.annotation.Id;
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_station_year_generate")
@TableName("td_hygf_station_generate_all")
public class YearGenerate {
@Id
private Long createdTime;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearPower.java
View file @ d76c69e6
......@@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter;
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_year_power")
@TableName("td_hygf_station_power_year")
public class YearPower {
private static final long serialVersionUID = 1L;
......@@ -26,7 +26,7 @@ public class YearPower {
/**
* 第三方电站id
*/
@TableField("tation_id")
@TableField("third_station_id")
private String thirdStationId;
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml
View file @ d76c69e6
......@@ -96,6 +96,28 @@
<artifactId>seata-spring-boot-starter</artifactId>
<version>1.8.0</version>
</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>
<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