户用光伏数据采集代码提交

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

@@ -59,7 +59,7 @@ public class HouseholdTestController {
 //        goLangDataAcquisitionService.collectorList();
 ////        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
-//        goLangDataAcquisitionService.inverterDetail();
-        goLangDataAcquisitionService.inverAlramInfo();
+        goLangDataAcquisitionService.inverterDetail();
+//        goLangDataAcquisitionService.inverAlramInfo();
     }
 }

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

@@ -30,4 +30,100 @@ public class InverterDetailDto {
     private Double uAc1;
     private Double uAc2;
     private Double uAc3;
+    private Double iPv1;
+    private Double iPv2;
+    private Double iPv3;
+    private Double iPv4;
+    private Double iPv5;
+    private Double iPv6;
+    private Double iPv7;
+    private Double iPv8;
+    private Double iPv9;
+    private Double iPv10;
+    private Double iPv11;
+    private Double iPv12;
+    private Double iPv13;
+    private Double iPv14;
+    private Double iPv15;
+    private Double iPv16;
+    private Double iPv17;
+    private Double iPv18;
+    private Double iPv19;
+    private Double iPv20;
+    private Double iPv21;
+    private Double iPv22;
+    private Double iPv23;
+    private Double iPv24;
+    private Double iPv25;
+    private Double iPv26;
+    private Double iPv27;
+    private Double iPv28;
+    private Double iPv29;
+    private Double iPv30;
+    private Double iPv31;
+    private Double iPv32;
+    private Double uPv1;
+    private Double uPv2;
+    private Double uPv3;
+    private Double uPv4;
+    private Double uPv5;
+    private Double uPv6;
+    private Double uPv7;
+    private Double uPv8;
+    private Double uPv9;
+    private Double uPv10;
+    private Double uPv11;
+    private Double uPv12;
+    private Double uPv13;
+    private Double uPv14;
+    private Double uPv15;
+    private Double uPv16;
+    private Double uPv17;
+    private Double uPv18;
+    private Double uPv19;
+    private Double uPv20;
+    private Double uPv21;
+    private Double uPv22;
+    private Double uPv23;
+    private Double uPv24;
+    private Double uPv25;
+    private Double uPv26;
+    private Double uPv27;
+    private Double uPv28;
+    private Double uPv29;
+    private Double uPv30;
+    private Double uPv31;
+    private Double uPv32;
+    private Double pow1;
+    private Double pow2;
+    private Double pow3;
+    private Double pow4;
+    private Double pow5;
+    private Double pow6;
+    private Double pow7;
+    private Double pow8;
+    private Double pow9;
+    private Double pow10;
+    private Double pow11;
+    private Double pow12;
+    private Double pow13;
+    private Double pow14;
+    private Double pow15;
+    private Double pow16;
+    private Double pow17;
+    private Double pow18;
+    private Double pow19;
+    private Double pow20;
+    private Double pow21;
+    private Double pow22;
+    private Double pow23;
+    private Double pow24;
+    private Double pow25;
+    private Double pow26;
+    private Double pow27;
+    private Double pow28;
+    private Double pow29;
+    private Double pow30;
+    private Double pow31;
+    private Double pow32;
 }

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

 package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -97,5 +98,4 @@ public class JpInverterElectricity implements Serializable {
      */
 	@TableField("third_code")
     private String thirdCode;
-
 }

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_collector_detail", autoResultMap = true)
 public class GolangCollectorDetail {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String sn;
     private Long stationid;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_collector_list", autoResultMap = true)
 public class GolangCollectorList {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String stationname;
     private Long stationid;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_inveter_detail", autoResultMap = true)
 public class GolangInverterDetail {
-    private Date createdTime;
+    private Long createdTime;
     private String gridSellYearEnergy;
     private String batteryAlarm;
     private String storageBatteryVoltageStr;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_inveter_list", autoResultMap = true)
 public class GolangInverterList {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String sn;
     private Long stationid;

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

@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_station_detail", autoResultMap = true)
 public class GolangStationDetail implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private Long id;
     private String stationname;
     private String addr;

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

@@ -7,7 +7,7 @@ import java.util.Date;
 @Data
 @TableName(value = "golang_station_list" ,autoResultMap = true)
 public class GolangStationList implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private String id;
     private String stationName;
     private String addr;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_collector_history" ,autoResultMap = true)
 public class HYGFJPCollectorHistory implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private String snCode;
     private Long time;
     private Double signalStrength;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_invertor_elec_history" ,autoResultMap = true)
 public class HYGFJPInverterElecHistory implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private String snCode;
     private Double uAcVoltage;
     private Double vAcVoltage;

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

@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_inverter_history" ,autoResultMap = true)
 public class HYGFJPInverterHistory implements Serializable {
-    private Timestamp createdTime;
+    private Long createdTime;
     private String snCode;
     private String date;
     private Double powerGeneration;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_inverter_warn" ,autoResultMap = true)
 public class HYGFJPInverterWarn implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private long time;
     private String snCode;
     private String content;

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

@@ -9,7 +9,7 @@ import java.util.Date;
 @Data
 @TableName(value = "td_hygf_jp_invertor_elec_history" ,autoResultMap = true)
 public class HYGFJPStationPowerHistory implements Serializable {
-    private Date createdTime;
+    private Long createdTime;
     private Double power;
     private long time;
     private String thirdStationId;