修改逆变器容量

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

@@ -167,7 +167,7 @@ public class    JpInverter implements Serializable {
      * 装机容量
      */
     @TableField("capacity")
-    private Integer capacity;
+    private Double capacity;
 
     /**
      * 累计发电量

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

@@ -380,7 +380,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 jpInverter.setVersion(inverterDetailDto.getVersion());
                 jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour()));
                 jpInverter.setId(String.valueOf(inverterDetailDto.getId()));
-                jpInverter.setCapacity(inverterDetailDto.getPower().intValue());
+                jpInverter.setCapacity(inverterDetailDto.getPower());
                 jpInverter.setThirdStationId(String.valueOf(inverterDetailDto.getStationId()));
                 jpInverter.setThirdCode(PVProducerInfoEnum.JLY.getCode());
                 jpInverter.setStationName(inverterDetailDto.getStationName());

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

@@ -24,6 +24,7 @@ import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.*;
 import com.yeejoin.amos.api.householdapi.face.service.KSolarDataAcquisitionService;
 import com.yeejoin.amos.openapi.enums.PVProducerInfoEnum;
 import fastjson.JSON;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -416,6 +417,11 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
     @Scheduled(cron = "${dataRequstScheduled.keshida}")
     @Override
     public void collectorDetail() {
+
+        List<JpCollector> jpCollectorlist = jpCollectorMapper.selectList(new QueryWrapper<JpCollector>().
+                eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
+
+
         List<String> collectIds = ksolarStationCollectListMapper.getCollectIds();
         if (!CollectionUtils.isEmpty(collectIds)) {
             collectIds.forEach(collectId -> {
@@ -459,7 +465,15 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 //                        jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour()));
                             // 装机容量
                             // jpInverter.setCapacity();
+                            if(jpCollectorlist!=null&&jpCollectorlist.size()>0){
+                                for (JpCollector jpCollector : jpCollectorlist) {
+                                    if(jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId())){
 
+                                        jpInverter.setCapacity( KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollector.getName())));
+                                    }
+
+                                }
+                            }
 
                             jpInverter.setSnCode(ksolarStationCollectData.getInverterId());
                             jpInverter.setId(ksolarStationCollectData.getInverterId());

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInverterDto.java

@@ -87,7 +87,7 @@ public class JpInverterDto  extends BaseDto {
     private String thirdStationId;
 
     @ApiModelProperty(value = "装机容量")
-    private Integer capacity;
+    private Double capacity;
 
     @ApiModelProperty(value = "累计发电量")
     private Double totalPowerGeneration;

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

@@ -152,7 +152,7 @@ public class JpInverter extends BaseEntity {
      * 装机容量
      */
 	@TableField("capacity")
-    private Integer capacity;
+    private Double capacity;
 
     /**
      * 累计发电量