1.户用光伏数据数据采集表结构调整及数据新增。

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

@@ -127,4 +127,5 @@ public class InverterDetailDto {
     private Double pow30;
     private Double pow31;
     private Double pow32;
+    private Double inverterTemperature;
 }

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

@@ -92,6 +92,22 @@ public class TdHYGFInverterDayGenerate implements Serializable {
      */
     private Double acc4;
     /**
+     * 直流电流1
+     */
+    private Double pv1;
+    /**
+     * 直流电流2
+     */
+    private Double pv2;
+    /**
+     * 直流电流3
+     */
+    private Double pv3;
+    /**
+     * 直流电流4
+     */
+    private Double pv4;
+    /**
      * 总功率
      */
     private Double totalPower;
@@ -122,6 +138,9 @@ public class TdHYGFInverterDayGenerate implements Serializable {
     /**
      * IGBT温度
      */
-    private Double igbtTmep;
+    private Double igbtTemp;
+
+    private Double income;
+    private Double fullhour;
 }
 

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

@@ -24,13 +24,13 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
      */
     private String snCode;
     /**
-     *日  yyyy-MM
+     *日  yyyy-MM-dd
      */
-    private String monthTime;
+    private String dayTime;
     /**
      *月  yyyy
      */
-    private String year;
+    private String yearMonth;
     /**
      * 发电量
      */
@@ -39,5 +39,6 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
      * 满发小时数
      */
     private Double fullhour;
+    private Double income;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterTotalGenerate.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_total_generate" ,autoResultMap = true)
+public class TdHYGFInverterTotalGenerate 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;
+    private Double income;
+}
+

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

@@ -26,7 +26,7 @@ public class TdHYGFInverterYearGenerate implements Serializable {
     /**
      *日  yyyy-MM
      */
-    private String yearTime;
+    private String monthTime;
     /**
      *月  yyyy
      */
@@ -39,5 +39,6 @@ public class TdHYGFInverterYearGenerate implements Serializable {
      * 满发小时数
      */
     private Double fullhour;
+    private Double income;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFInverterTotalGenerateMapper.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.TdHYGFInverterTotalGenerate;
+
+public interface TdHYGFInverterTotalGenerateMapper extends BaseMapper<TdHYGFInverterTotalGenerate> {
+}

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

@@ -100,6 +100,9 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
     @Autowired
     private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
 
+    @Autowired
+    private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
+
     @Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
     @Override
     public void stationList() {
@@ -525,7 +528,9 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 hygfjpInverterElecHistoryMapper.insert(hygfjpInverterElecHistory);
                 // 逆变器历史
                 String today = DateUtil.today();
-                HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper.selectOne(new QueryWrapper<HYGFJPInverterHistory>().eq("sn_code", inverterDetailDto.getSn()).eq("date", today));
+                HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper.selectOne(new QueryWrapper<HYGFJPInverterHistory>()
+                        .eq("sn_code", inverterDetailDto.getSn())
+                        .eq("date", today));
                 if (ObjectUtils.isEmpty(hygfjpInverterHistory)) {
                     hygfjpInverterHistory = new HYGFJPInverterHistory();
                 }
@@ -568,6 +573,12 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterDayGenerate.setAcc2(inverterDetailDto.getIPv2());
                 tdHYGFInverterDayGenerate.setAcc3(inverterDetailDto.getIPv3());
                 tdHYGFInverterDayGenerate.setAcc4(inverterDetailDto.getIPv4());
+                //功率
+                tdHYGFInverterDayGenerate.setPv1(inverterDetailDto.getPow1());
+                tdHYGFInverterDayGenerate.setPv2(inverterDetailDto.getPow2());
+                tdHYGFInverterDayGenerate.setPv3(inverterDetailDto.getPow3());
+                tdHYGFInverterDayGenerate.setPv4(inverterDetailDto.getPow4());
+
                 tdHYGFInverterDayGenerate.setTotalPower(inverterDetailDto.getPower());
                 tdHYGFInverterDayGenerate.setFrequency(String.valueOf(inverterDetailDto.getPac()));
                 tdHYGFInverterDayGenerate.setPowerFactor(inverterDetailDto.getPowerFactor());
@@ -575,22 +586,26 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterDayGenerate.setMonthGen(inverterDetailDto.getEMonth());
                 tdHYGFInverterDayGenerate.setYearGen(inverterDetailDto.getEMonth());
                 tdHYGFInverterDayGenerate.setTotalGen(inverterDetailDto.getETotal());
+                tdHYGFInverterDayGenerate.setIgbtTemp(inverterDetailDto.getInverterTemperature());
+                tdHYGFInverterDayGenerate.setIncome(null);
+                tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getCapacity());
                 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")));
+                        .eq("third_station_id",jpInverter.getThirdStationId())
+                        .eq("sn_code",jpInverter.getSnCode())
+                        .eq("day_time",DateUtil.format(today1, "yyyy-MM-dd"))
+                        .eq("year_month",DateUtil.format(today1, "yyyy-MM")));
                 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());
+                tdHYGFInverterMonthGenerate.setThirdStationId(jpInverter.getThirdStationId());
+                tdHYGFInverterMonthGenerate.setSnCode(String.valueOf(jpInverter.getSnCode()));
+                tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
+                tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
+                tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
+                tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getCapacity());
                 if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())){
                     tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
@@ -599,24 +614,46 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 }
                 //户用场站年发电量
                 TdHYGFInverterYearGenerate tdHYGFInverterYearGenerate = tdHYGFInverterYearGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterYearGenerate>()
-                        .eq("third_station_id",inverterDetailDto.getStationId())
-                        .eq("year_time",DateUtil.format(today1, "yyyy"))
+                        .eq("third_station_id",jpInverter.getThirdStationId())
+                        .eq("sn_code",jpInverter.getSnCode())
+                        .eq("month_time",DateUtil.format(today1, "yyyy-MM"))
                         .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.setThirdStationId(jpInverter.getThirdStationId());
+                tdHYGFInverterYearGenerate.setSnCode(jpInverter.getSnCode());
+                tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
-                tdHYGFInverterYearGenerate.setGenerate(inverterDetailDto.getEYear());
-                tdHYGFInverterYearGenerate.setFullhour(inverterDetailDto.getEYear()/inverterDetailDto.getPower());
+                tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
+                tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration()/jpInverter.getCapacity());
                 if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())){
                     tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
                 }else {
                     tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
                 }
+                //户用场站年发电量
+                TdHYGFInverterTotalGenerate tdHYGFInverterTotalGenerate = tdHYGFInverterTotalGenerateMapper.selectOne(new QueryWrapper<TdHYGFInverterTotalGenerate>()
+                        .eq("third_station_id",jpInverter.getThirdStationId())
+                        .eq("sn_code",jpInverter.getSnCode())
+                        .eq("year_time",DateUtil.format(today1, "yyyy"))
+                        .eq("year",DateUtil.format(today1, "yyyy")));
+                if(ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate)){
+                    tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
+                }
+                tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
+                tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode());
+                tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
+                tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
+                tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
+                tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration()/jpInverter.getCapacity());
+                if(ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())){
+                    tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
+                    tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
+                }else {
+                    tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
+                }
             }
         }
     }