固德威逆变器数据采集

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

@@ -174,7 +174,8 @@ public class GoodWeConstant {
     public static String stationDetailUrl = "/api/OpenApi/GetPowerStationMonitorDetail";
     public static String collectorListUrl = "/v1/api/collectorList";
     public static String collectorDetailUrl = "/v1/api/collectorDetail";
-    public static String inverterListUrl = "/v1/api/inverterList";
+    public static String queryInventerUrl = "/api/OpenApi/QueryInventers";
+    public static String getInventersDatas = "/api/OpenApi/GetInventersDatas";
     public static String inverterDetailUrl = "/v1/api/inverterDetail";
     public static String alarmListUrl = "/api/OpenApi/GetPowerStationWariningInfoByMultiCondition";
     public  static  String stationDayGenUrl ="/v1/api/stationDayEnergyList";
@@ -193,4 +194,5 @@ public class GoodWeConstant {
     public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern(datePattern);
     public static Double kwhToMwh = 0.0001;
     public static Double mwhTokwh = 1000.0;
+    public static Double wToKw = 0.001;
 }

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+// 固德威实时数据
+public class D {
+    public double vpv3;
+    public double vpv2;
+    public double vpv1;
+    public double fac3;
+    public double fac2;
+    public double fac1;
+    public double vpv4;
+    public double ipv2;
+    public double pac;
+    public double ipv1;
+    public double ipv4;
+    public double ipv3;
+    public double eDay;
+    public double vac3;
+    public String creationDate;
+    public double istr9;
+    public double vac2;
+    public double istr8;
+    public double vac1;
+    public double istr5;
+    public double istr10;
+    public double istr4;
+    public double eTotal;
+    public double istr7;
+    public double istr6;
+    public double istr1;
+    public double iac2;
+    public double istr3;
+    public double iac1;
+    public double hTotal;
+    public double istr2;
+    public double iac3;
+    public double istr16;
+    public double istr15;
+    public double istr14;
+    public double istr13;
+    public double istr12;
+    public double istr11;
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import lombok.Data;
+
+@Data
+public class GoodWeINverterDetailDto {
+    private String id;
+    private String pw_id;
+    private String it_name;
+    private String it_sn;
+    private String it_type;
+    private Double it_capacity;
+    private Double it_checkcode;
+    private String conn_date;
+    private Boolean it_change_flag;
+}

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

+package com.yeejoin.amos.api.householdapi.face.dto;
+
+import lombok.Data;
+
+@Data
+public class GoodWeInverterCurrentDataDto {
+    public int error_original;
+    public D d;
+    public double out_pac;
+    public String type;
+    public double etotal;
+    public double capacity;
+    public double tempperature;
+    public String turnon_time;
+    public String check_code;
+    public String name;
+    public double eday;
+    public boolean it_change_flag;
+    public String sn;
+    public double in_pac;
+    public int status;
+}

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

@@ -4,7 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverter;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 public interface JpInverterMapper extends BaseMapper<JpInverter> {
     @Select("SELECT sum(current_power) FROM hygf_jp_inverter WHERE third_code='HW'")
     Double getHuaWeiStationCurrentPower();
+
+    @Select("select sn_code from hygf_jp_inverter where third_code='GOODWE'")
+    List<String> getGoodWeSnCodes();
 }

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

@@ -4,16 +4,18 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.api.householdapi.Utils.GoodWeRequestUtil;
 import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
 import com.yeejoin.amos.api.householdapi.constant.GoodWeConstant;
-import com.yeejoin.amos.api.householdapi.face.dto.AlarmDto;
-import com.yeejoin.amos.api.householdapi.face.dto.GoodWeAlarmDto;
-import com.yeejoin.amos.api.householdapi.face.dto.GoodWeStationMonitorDto;
+import com.yeejoin.amos.api.householdapi.face.dto.*;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverter;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.*;
+import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpInverterMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf.JpStationMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine.*;
 import com.yeejoin.amos.api.householdapi.face.service.GoodWeDataAcquisitionService;
@@ -25,6 +27,8 @@ import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionService {
     @Autowired
@@ -35,6 +39,9 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
     GoodWeStationDetailMapper goodWeStationDetailMapper;
     @Autowired
     JpStationMapper jpStationMapper;
+
+    @Autowired
+    private JpInverterMapper jpInverterMapper;
     @Autowired
     private HYGFJPStationPowerHistoryMapper hygfjpStationPowerHistoryMapper;
     //户用光伏逆变器历史mapper
@@ -93,7 +100,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
                 jpStation.setUserPhone(goodWeStationList.getOwner_phone());
                 jpStation.setStationContact(goodWeStationList.getOwner_name());
                 jpStation.setModuleCount(0);
-                jpStation.setRealTimePower(goodWeStationList.getYield_rate());
+                jpStation.setRealTimePower(goodWeStationList.getPac()*GoodWeConstant.wToKw);
                 jpStation.setState(GoodWeConstant.stationStaus.get(goodWeStationList.getStatus()));
                 jpStation.setDayGenerate(goodWeStationList.getEday());
                 jpStation.setDayIncome(goodWeStationList.getEday_income());
@@ -250,13 +257,56 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 
     @Override
     public void inverterList() {
-
+        List<String> stationIds = goodWeStationMonitorListMapper.getStationIds();
+        stationIds.stream().forEach(stationId ->{
+            HashMap<String, Object> requestInfo = new HashMap<>();
+            requestInfo.put("page_index", 1);
+            requestInfo.put("page_size", 100);
+            requestInfo.put("pw_id", stationId);
+            String requstParam = JSON.toJSONString(requestInfo);
+            List<GoodWeINverterDetailDto> inverterDetailDtoList = goodWeRequestUtil.getResPonse(GoodWeConstant.queryInventerUrl
+                    ,GoodWeConstant.requestPost,requstParam,GoodWeConstant.resovleRule_data_list,GoodWeINverterDetailDto.class);
+            inverterDetailDtoList.forEach(goodWeINverterDetailDto ->{
+//                System.out.println(goodWeINverterDetailDto.getIt_sn());
+                JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
+                        eq("third_station_id", goodWeINverterDetailDto.getPw_id()).
+                        eq("third_code", PVProducerInfoEnum.GDW.getCode()).
+                        eq("sn_code", goodWeINverterDetailDto.getIt_sn()));
+                if (org.springframework.util.ObjectUtils.isEmpty(jpInverter)) {
+                    jpInverter = new JpInverter();
+                }
+                jpInverter.setName(goodWeINverterDetailDto.getIt_name());
+                jpInverter.setSnCode(goodWeINverterDetailDto.getIt_sn());
+                jpInverter.setUpdateTime(new Date());
+                jpInverter.setId(String.valueOf(goodWeINverterDetailDto.getId()));
+                jpInverter.setCapacity(goodWeINverterDetailDto.getIt_capacity());
+                jpInverter.setThirdStationId(goodWeINverterDetailDto.getPw_id());
+                jpInverter.setThirdCode(PVProducerInfoEnum.GDW.getCode());
+                jpInverter.setStationName(goodWeINverterDetailDto.getIt_name());
+                jpInverter.setRecDate(new Date());
+                if (!org.springframework.util.ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
+                    jpInverterMapper.updateById(jpInverter);
+                } else {
+                    jpInverterMapper.insert(jpInverter);
+                }
+            });
+        });
     }
 
     @Override
     public void inverterDetail() {
+       List<String> goodweSnList = jpInverterMapper.getGoodWeSnCodes();;
+       List<List<String>> splitList = Lists.partition(goodweSnList, 50);
+        HashMap<String, Object> requestInfo = new HashMap<>();
+        String requstParam = JSON.toJSONString(requestInfo);
+        for (int i = 0; i < splitList.size(); i++) {
+            String requestSns = splitList.get(i).stream().map(s-> "sns="+s).collect(Collectors.joining("&"));
+            String apiUrl = GoodWeConstant.getInventersDatas+"?"+requestSns;
+        List<GoodWeInverterCurrentDataDto> list = goodWeRequestUtil.getResPonse(apiUrl,GoodWeConstant.requestGet,requstParam,GoodWeConstant.resovleRule_data_list, GoodWeInverterCurrentDataDto.class);
+        list.forEach(goodWeInverterCurrentDataDto -> goodWeInverterCurrentDataDto.getD());
 
         }
+    }
 
     @Override
     public void inverAlramInfo() {