对接 碳银电站接口

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/exception/BusinessException.java

@@ -12,7 +12,7 @@ import org.typroject.tyboot.core.foundation.exception.BaseException;
  */
 public class BusinessException extends BaseException {
 
-    private String code = "";
+    private String code;
 
     public BusinessException(String message) {
         super(message, BusinessException.class.getSimpleName(), "错误的请求.");

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

@@ -38,7 +38,7 @@ public class TanYinInveterInfo {
     private String gmtCreate;
 
     @ApiModelProperty ("ID")
-    @TableField ("idString")
+    @TableField ("id_string")
     private String idString;
 
     @ApiModelProperty ("功率")

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

@@ -238,6 +238,8 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
         List<JpStation> jpStations = jpStationMapper.selectList(new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.TANYIN.getCode()).in("third_station_id", stationIds));
         Map<String, JpStation> jpStationMap = jpStations.stream().collect(Collectors.toMap(JpStation::getThirdStationId, Function.identity()));
 
+        List<TanYinInveterInfo> tanYinInveterInfos = new ArrayList();
+
         for (TanYinStationInfo tanYinStationInfo : tanYinStationInfos) {
             tanYinStationInfo.setCreateTime(System.currentTimeMillis());
             tanYinStationInfoMapper.insert(tanYinStationInfo);
@@ -250,7 +252,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
                 tanYinInveterInfo.setSn(inverterListDTO.getSn());
                 tanYinInveterInfo.setSupplier(inverterListDTO.getSupplier());
                 tanYinInveterInfo.setCreateTime(System.currentTimeMillis());
-                tanYinInveterInfoMapper.insert(tanYinInveterInfo);
+                tanYinInveterInfos.add(tanYinInveterInfo);
             }
 
             String stationId = tanYinStationInfo.getProjectNo();
@@ -408,31 +410,23 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             } else {
                 TdHYGFStationAllGenerateMapper.insert(TdHYGFStationAllGenerate);
             }
-
         }
 
         log.info("-------碳银同步电站结束: {} ------- " + ts + "------- " + sdf.format(new Date()));
+
+        log.info("-------碳银同步逆变器开始: {} ------- " + ts + "------- " + sdf.format(new Date()));
+        inverterList(tanYinInveterInfos);
     }
 
-    /**
-     * 每隔 10分钟同步碳银电站逆变器信息
-     *
-     * @param
-     * @return {@link }
-     * @throws
-     * @author yangyang
-     * @date 2024/7/17 13:58
-     */
-    @Scheduled (cron = "${dataRequestScheduled.tanYin}")
     @Override
     public void inverterList() {
-        long ts = System.currentTimeMillis();
-        log.info("-------碳银同步逆变器开始: {} ------- ", ts);
-        List<TanYinInveterInfo> tanYinInveterInfos = tanYinInveterInfoMapper.selectList(new QueryWrapper<>());
+
+    }
+
+    public void inverterList(List<TanYinInveterInfo> tanYinInveterInfos) {
         if (CollectionUtils.isEmpty(tanYinInveterInfos)) {
             return;
         }
-
         Map<String, TanYinInveterInfo> tanYinInveterInfoMap = tanYinInveterInfos.stream().collect(Collectors.toMap(TanYinInveterInfo::getSn, v -> v, (k1, k2) -> k1));
         List<String> stationIds = tanYinInveterInfos.stream().map(TanYinInveterInfo::getProjectNo).collect(Collectors.toList());
         List<JpStation> jpStations = jpStationMapper.selectList(new QueryWrapper<JpStation>().eq("third_code", PVProducerInfoEnum.TANYIN.getCode()).in("third_station_id", stationIds));
@@ -452,6 +446,12 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
         for (TanYinInveterInfo tanYinInveterInfo : tanYinInveterInfos) {
             JSONObject tanYinInveterInfoResultJson = tanYinInveterInfoResultMap.getJSONObject(tanYinInveterInfo.getSn());
             TanYinInveterInfo tanYinInveterInfoDTO = tanYinInveterInfoResultJson.toJavaObject(TanYinInveterInfo.class);
+            tanYinInveterInfoDTO.setProjectNo(tanYinInveterInfo.getProjectNo());
+            tanYinInveterInfoDTO.setDeviceName(tanYinInveterInfo.getDeviceName());
+            tanYinInveterInfoDTO.setSn(tanYinInveterInfo.getSn());
+            tanYinInveterInfoDTO.setSupplier(tanYinInveterInfo.getSupplier());
+            tanYinInveterInfoDTO.setCreateTime(System.currentTimeMillis());
+            tanYinInveterInfoMapper.insert(tanYinInveterInfoDTO);
 
             JpInverter jpInverter = jpInverterMapper.selectOne(
                     new QueryWrapper<JpInverter>().eq("third_station_id", tanYinInveterInfo.getProjectNo())
@@ -506,6 +506,8 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
                 jpInverterElectricity.setThirdCode(PVProducerInfoEnum.TANYIN.getCode());
                 jpInverterElectricity.setThirdStationId(jpInverter.getThirdStationId());
                 // jpInverterElectricity.setType("交流");
+                // jpInverterElectricity.setFrequency();// 频率
+                // jpInverterElectricity.setPower();// 功率
                 jpInverterElectricity.setName(name);
                 if (tanYinInveterInfoResultJson.get(name) != null && !"".equals(tanYinInveterInfoResultJson.get(name))) {
                     jpInverterElectricity.setVoltage(Double.valueOf(tanYinInveterInfoResultJson.get(name).toString())); // 电压