1.数据采集新增场站日、月、年报表。

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/GoLangConstant.java

@@ -53,6 +53,12 @@ public class GoLangConstant {
     public static String inverterListUrl = "/v1/api/inverterList";
     public static String inverterDetailUrl = "/v1/api/inverterDetail";
     public static String alarmListUrl = "/v1/api/alarmList";
+    public  static  String stationDayGenUrl ="/v1/api/stationDayEnergyList";
+    public  static  String stationMonthEnergyList ="/v1/api/stationDayEnergyList";
+    public  static  String stationYearEnergyList ="/v1/api/stationDayEnergyList";
+    public  static  String inverterDayURL ="/v1/api/inverterDay";
+    public  static  String inverterMonthURL ="/v1/api/inverterMonth";
+    public  static  String inverterYearURL ="/v1/api/inverterYear";
     public static String resovleRule_data_page_records = "data,page,records";
     public static String resovleRule_data_records = "data,records";
     public static String resovleRule_data = "data";

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -60,11 +60,11 @@ public class HouseholdTestController {
     @ApiOperation(httpMethod = "POST", value = "锦浪云", notes = "锦浪云")
     public void golangnew() throws IOException {
 //        goLangDataAcquisitionService.stationList();
-//          goLangDataAcquisitionService.stationDetail();
+          goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
 ////        goLangDataAcquisitionService.inverterList();
-        goLangDataAcquisitionService.collectorDetail();
-        goLangDataAcquisitionService.inverterDetail();
+//        goLangDataAcquisitionService.collectorDetail();
+//        goLangDataAcquisitionService.inverterDetail();
 //        goLangDataAcquisitionService.inverAlramInfo();
     }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/dto/InverterDetailDto.java

@@ -23,6 +23,7 @@ public class InverterDetailDto {
     private String version;
     private Double fullHour;
     private Double power;
+    private Double powerFactor;
     private Double eTotal;
     private Double iAc1;
     private Double iAc2;

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterDayGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_inverter_day_generate" ,autoResultMap = true)
+public class TdHYGFInverterDayGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     * sncode
+     */
+    private String snCode;
+    /**
+     * 工作状态
+     */
+    private String workStatus;
+    /**
+     * 交流电压1
+     */
+    private Double dcv1;
+    /**
+     * 交流电压2
+     */
+    private Double dcv2;
+    /**
+     * 交流电压3
+     */
+    private Double dcv3;
+    /**
+     * 交流电压4
+     */
+    private Double dcv4;
+    /**
+     * 交流电流1
+     */
+    private Double dcc1;
+    /**
+     * 交流电流2
+     */
+    private Double dcc2;
+    /**
+     * 交流电流3
+     */
+    private Double dcc3;
+    /**
+     * 交流电流4
+     */
+    private Double dcc4;
+    /**
+     * 直流电压1
+     */
+    private Double acv1;
+    /**
+     * 直流电压2
+     */
+    private Double acv2;
+    /**
+     * 直流电压3
+     */
+    private Double acv3;
+    /**
+     * 直流电压4
+     */
+    private Double acv4;
+    /**
+     * 直流电流1
+     */
+    private Double acc1;
+    /**
+     * 直流电流2
+     */
+    private Double acc2;
+    /**
+     * 直流电流3
+     */
+    private Double acc3;
+    /**
+     * 直流电流4
+     */
+    private Double acc4;
+    /**
+     * 总功率
+     */
+    private Double totalPower;
+    /**
+     * 频率
+     */
+    private String frequency;
+    /**
+     * 功率因数
+     */
+    private Double powerFactor;
+    /**
+     * 日发电量
+     */
+    private Double dayGen;
+    /**
+     * 月发电量
+     */
+    private Double monthGen;
+    /**
+     * 年发电量
+     */
+    private Double yearGen;
+    /**
+     * 累计发电量
+     */
+    private Double totalGen;
+    /**
+     * IGBT温度
+     */
+    private Double igbtTmep;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterMonthGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_inverter_month_generate" ,autoResultMap = true)
+public class TdHYGFInverterMonthGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     * sncode
+     */
+    private String snCode;
+    /**
+     *日  yyyy-MM
+     */
+    private String monthTime;
+    /**
+     *月  yyyy
+     */
+    private String year;
+    /**
+     * 发电量
+     */
+    private Double generate;
+    /**
+     * 满发小时数
+     */
+    private Double fullhour;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterYearGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_inverter_year_generate" ,autoResultMap = true)
+public class TdHYGFInverterYearGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     * sncode
+     */
+    private String snCode;
+    /**
+     *日  yyyy-MM
+     */
+    private String yearTime;
+    /**
+     *月  yyyy
+     */
+    private String year;
+    /**
+     * 发电量
+     */
+    private Double generate;
+    /**
+     * 满发小时数
+     */
+    private Double fullhour;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationDayGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_station_day_generate" ,autoResultMap = true)
+public class TdHYGFStationDayGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     *日  yyyy-MM-dd
+     */
+    private String dayTime;
+    /**
+     *月  yyyy-MM
+     */
+    private String yearMonth;
+    /**
+     * 发电量
+     */
+    private Double generate;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationMonthGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_station_month_generate" ,autoResultMap = true)
+public class TdHYGFStationMonthGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     *日  yyyy-MM
+     */
+    private String monthTime;
+    /**
+     *月  yyyy
+     */
+    private String year;
+    /**
+     * 发电量
+     */
+    private Double generate;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationYearGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_station_year_generate" ,autoResultMap = true)
+public class TdHYGFStationYearGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     *日  yyyy-MM
+     */
+    private String yearTime;
+    /**
+     *月  yyyy
+     */
+    private String year;
+    /**
+     * 发电量
+     */
+    private Double generate;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFInverterDayGenerateMapper.java

+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.TdHYGFInverterDayGenerate;
+
+public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInverterDayGenerate> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFInverterMonthGenerateMapper.java

+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.TdHYGFInverterMonthGenerate;
+
+public interface TdHYGFInverterMonthGenerateMapper extends BaseMapper<TdHYGFInverterMonthGenerate> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFInverterYearGenerateMapper.java

+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.TdHYGFInverterYearGenerate;
+
+public interface TdHYGFInverterYearGenerateMapper extends BaseMapper<TdHYGFInverterYearGenerate> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationDayGenerateMapper.java

+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;
+
+public interface TdHYGFStationDayGenerateMapper extends BaseMapper<TdHYGFStationDayGenerate> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationMonthGenerateMapper.java

+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.TdHYGFStationMonthGenerate;
+
+public interface TdHYGFStationMonthGenerateMapper extends BaseMapper<TdHYGFStationMonthGenerate> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFStationYearGenerateMapper.java

+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.TdHYGFStationYearGenerate;
+
+public interface TdHYGFStationYearGenerateMapper extends BaseMapper<TdHYGFStationYearGenerate> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

 package com.yeejoin.amos.api.householdapi.face.service.impl;
 
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -86,6 +87,19 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
     @Autowired
     private HYGFJPDayPowerMapper hygfjpDayPowerMapper;
 
+    @Autowired
+    private TdHYGFInverterDayGenerateMapper tdHYGFInverterDayGenerateMapper;
+    @Autowired
+    private TdHYGFInverterMonthGenerateMapper tdHYGFInverterMonthGenerateMapper;
+    @Autowired
+    private TdHYGFInverterYearGenerateMapper tdHYGFInverterYearGenerateMapper;
+    @Autowired
+    private TdHYGFStationDayGenerateMapper tdHYGFStationDayGenerateMapper;
+    @Autowired
+    private TdHYGFStationMonthGenerateMapper tdHYGFStationMonthGenerateMapper;
+    @Autowired
+    private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
+
     @Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
     @Override
     public void stationList() {
@@ -201,6 +215,61 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 } else {
                     hygfjpDayPowerMapper.insert(hygfjpDayPower);
                 }
+                Date today1 = new Date();
+                //户用场站日发电量
+                TdHYGFStationDayGenerate tdHYGFStationDayGenerate = tdHYGFStationDayGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationDayGenerate>()
+                        .eq("third_station_id",stationIds.get(i))
+                        .eq("day_time",DateUtil.format(today1, "yyyy-MM-dd"))
+                        .eq("year_month",DateUtil.format(today1, "yyyy-MM")));
+                if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate)){
+                    tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate();
+                }
+                tdHYGFStationDayGenerate.setThirdStationId(stationIds.get(i));
+                tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
+                tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
+                tdHYGFStationDayGenerate.setGenerate(golangStationDetail.getDayenergy());
+                if(ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())){
+                    tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
+                }else {
+                    tdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
+                }
+                //户用场站月发电量
+                TdHYGFStationMonthGenerate tdHYGFStationMonthGenerate = tdHYGFStationMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationMonthGenerate>()
+                        .eq("third_station_id",stationIds.get(i))
+                        .eq("month_time",DateUtil.format(today1, "yyyy-MM"))
+                        .eq("year",DateUtil.format(today1, "yyyy")));
+                if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate)){
+                    tdHYGFStationMonthGenerate=new TdHYGFStationMonthGenerate();
+                }
+                tdHYGFStationMonthGenerate.setThirdStationId(stationIds.get(i));
+                tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+                tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
+                tdHYGFStationMonthGenerate.setGenerate(golangStationDetail.getMonthenergy());
+                if(ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())){
+                    tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+                }else {
+                    tdHYGFStationMonthGenerateMapper.insert(tdHYGFStationMonthGenerate);
+                }
+                //户用场站年发电量
+                TdHYGFStationYearGenerate tdHYGFStationYearGenerate = tdHYGFStationYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
+                        .eq("third_station_id",stationIds.get(i))
+                        .eq("year_time",DateUtil.format(today1, "yyyy"))
+                        .eq("year",DateUtil.format(today1, "yyyy")));
+                if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate)){
+                    tdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
+                }
+                tdHYGFStationYearGenerate.setThirdStationId(stationIds.get(i));
+                tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
+                tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+                tdHYGFStationYearGenerate.setGenerate(golangStationDetail.getYearenergy());
+                if(ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())){
+                    tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
+                }else {
+                    tdHYGFStationYearGenerateMapper.insert(tdHYGFStationYearGenerate);
+                }
             }
         }
     }
@@ -470,6 +539,81 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 } else {
                     hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
                 }
+                //-----------------------户用光伏日报表----------------------
+                TdHYGFInverterDayGenerate tdHYGFInverterDayGenerate = new TdHYGFInverterDayGenerate();
+                tdHYGFInverterDayGenerate.setCreatedTime(System.currentTimeMillis());
+                tdHYGFInverterDayGenerate.setThirdStationId(String.valueOf(jpInverter.getThirdStationId()));
+                tdHYGFInverterDayGenerate.setSnCode(jpInverter.getSnCode());
+                tdHYGFInverterDayGenerate.setWorkStatus(jpInverter.getState());
+                //交流电压
+                tdHYGFInverterDayGenerate.setDcv1(inverterDetailDto.getUAc1());
+                tdHYGFInverterDayGenerate.setDcv2(inverterDetailDto.getUAc2());
+                tdHYGFInverterDayGenerate.setDcv3(inverterDetailDto.getUAc3());
+                //交流电流
+//                tdHYGFInverterDayGenerate.setDcv4(inverterDetailDto.getUAc4());
+                tdHYGFInverterDayGenerate.setDcc1(inverterDetailDto.getIAc1());
+                tdHYGFInverterDayGenerate.setDcc2(inverterDetailDto.getIAc2());
+                tdHYGFInverterDayGenerate.setDcc3(inverterDetailDto.getIAc3());
+//                tdHYGFInverterDayGenerate.setDcc4(inverterDetailDto.getIAc4());
+                //直流电压
+                tdHYGFInverterDayGenerate.setAcv1(inverterDetailDto.getUPv1());
+                tdHYGFInverterDayGenerate.setAcv2(inverterDetailDto.getUPv2());
+                tdHYGFInverterDayGenerate.setAcv3(inverterDetailDto.getUPv3());
+                tdHYGFInverterDayGenerate.setAcv4(inverterDetailDto.getUPv4());
+                //直流电流
+                tdHYGFInverterDayGenerate.setAcc1(inverterDetailDto.getIPv1());
+                tdHYGFInverterDayGenerate.setAcc2(inverterDetailDto.getIPv2());
+                tdHYGFInverterDayGenerate.setAcc3(inverterDetailDto.getIPv3());
+                tdHYGFInverterDayGenerate.setAcc4(inverterDetailDto.getIPv4());
+                tdHYGFInverterDayGenerate.setTotalPower(inverterDetailDto.getPower());
+                tdHYGFInverterDayGenerate.setFrequency(String.valueOf(inverterDetailDto.getPac()));
+                tdHYGFInverterDayGenerate.setPowerFactor(inverterDetailDto.getPowerFactor());
+                tdHYGFInverterDayGenerate.setDayGen(inverterDetailDto.getEToday());
+                tdHYGFInverterDayGenerate.setMonthGen(inverterDetailDto.getEMonth());
+                tdHYGFInverterDayGenerate.setYearGen(inverterDetailDto.getEMonth());
+                tdHYGFInverterDayGenerate.setTotalGen(inverterDetailDto.getETotal());
+                tdHYGFInverterDayGenerateMapper.insert(tdHYGFInverterDayGenerate);
+                //户用场站月发电量
+                Date today1 = new Date();
+                TdHYGFInverterMonthGenerate tdHYGFInverterMonthGenerate  = tdHYGFInverterMonthGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterMonthGenerate>()
+                        .eq("third_station_id",inverterDetailDto.getStationId())
+                        .eq("month_time",DateUtil.format(today1, "yyyy-MM"))
+                        .eq("year",DateUtil.format(today1, "yyyy")));
+                if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate)){
+                    tdHYGFInverterMonthGenerate=new TdHYGFInverterMonthGenerate();
+                }
+                tdHYGFInverterMonthGenerate.setThirdStationId(String.valueOf(inverterDetailDto.getStationId()));
+                tdHYGFInverterMonthGenerate.setSnCode(String.valueOf(inverterDetailDto.getSn()));
+                tdHYGFInverterMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
+                tdHYGFInverterMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
+                tdHYGFInverterMonthGenerate.setGenerate(inverterDetailDto.getEMonth());
+                tdHYGFInverterMonthGenerate.setFullhour(inverterDetailDto.getEMonth()/inverterDetailDto.getPower());
+                if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())){
+                    tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
+                }else {
+                    tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
+                }
+                //户用场站年发电量
+                TdHYGFInverterYearGenerate tdHYGFInverterYearGenerate = tdHYGFInverterYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterYearGenerate>()
+                        .eq("third_station_id",inverterDetailDto.getStationId())
+                        .eq("year_time",DateUtil.format(today1, "yyyy"))
+                        .eq("year",DateUtil.format(today1, "yyyy")));
+                if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate)){
+                    tdHYGFInverterYearGenerate = new TdHYGFInverterYearGenerate();
+                }
+                tdHYGFInverterYearGenerate.setThirdStationId(String.valueOf(inverterDetailDto.getStationId()));
+                tdHYGFInverterYearGenerate.setSnCode(inverterDetailDto.getSn());
+                tdHYGFInverterYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
+                tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
+                tdHYGFInverterYearGenerate.setGenerate(inverterDetailDto.getEYear());
+                tdHYGFInverterYearGenerate.setFullhour(inverterDetailDto.getEYear()/inverterDetailDto.getPower());
+                if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())){
+                    tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
+                }else {
+                    tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
+                }
             }
         }
     }