逆变器基本信息取值为空25682

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

@@ -27,8 +27,12 @@ public class InverterDetailDto {
     private String nationalStandards;
     private String version;
     private Double fullHour;
-    private Double power;
+    private Double power; // 额定功率
     private Double powerFactor;
+    private String updateShelfEndTimeStr; // 质保到期时间
+    private String fisTimeStr; // 投运时间
+    private String afciTypeStr; // AFCI方案
+    private String afciVer; // AFCI版本
     private Double iAc1;
     private Double iAc2;
     private Double iAc3;

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

@@ -188,4 +188,10 @@ public class    JpInverter implements Serializable {
 
     @TableField("sn_name")
     private String name;
+
+    /**
+     * 搬运时间
+     */
+    @TableField("fis_time_str")
+    private String fisTimeStr;
 }

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

@@ -33,6 +33,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.PostConstruct;
 import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -539,6 +540,13 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 				jpInverter.setCurrentPower(inverterDetailDto.getPac());
 				jpInverter.setDayPowerGeneration(inverterDetailDto.getEToday());
 				jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth());
+				jpInverter.setAfciProgramme(inverterDetailDto.getAfciTypeStr()); // AFCI方案
+				jpInverter.setWarrantyPeriod(inverterDetailDto.getUpdateShelfEndTimeStr()); // 质保到期时间
+				jpInverter.setFisTimeStr(inverterDetailDto.getFisTimeStr()); // 投运时间
+				jpInverter.setAfciVersion(inverterDetailDto.getAfciVer()); // AFCI版本
+				jpInverter.setRatedPower(inverterDetailDto.getPower() != null
+						? Double.valueOf(inverterDetailDto.getPower())
+						: null); // 额定功率
 				if (inverterDetailDto.getEMonthStr().toLowerCase().equals("mwh")) {
 					jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth() * GoLangConstant.mwhTokwh);
 				}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpInverter.java

@@ -175,4 +175,11 @@ public class JpInverter extends BaseEntity {
 
     @TableField("sn_name")
     private String snName;
+
+
+    /**
+     * 搬运时间
+     */
+    @TableField("fis_time_str")
+    private String fisTimeStr;
 }