对接 碳银电站接口

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

@@ -282,29 +282,31 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             hygfjpStationPowerHistory.setStationState(jpStation.getState());
 
             hygfjpStationPowerHistoryMapper.insert(hygfjpStationPowerHistory);
-// ------ 这里要重写
-//             HYGFJPDayPower hygfjpDayPower = hygfjpDayPowerMapper.selectOne(new QueryWrapper<HYGFJPDayPower>().eq("tation_id", stationId).eq("year_month_day", today).eq("hour", hour));
-//             if (ObjectUtils.isEmpty(hygfjpDayPower)) {
-//                 hygfjpDayPower = new HYGFJPDayPower();
-//             }
-//             hygfjpDayPower.setTationId(stationId);
-//
-//              hygfjpDayPower.setHour(hour);
-//            hygfjpDayPower.setYearMonthDay(today);
-//              hygfjpDayPower.setPower(in.getPower());
-//
-//             // 新加
-//             hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
-//             hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
-//             hygfjpDayPower.setStationName(jpStation.getName());
-//             hygfjpDayPower.setStationState(jpStation.getState());
-//
-//             if (ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
-//                 hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
-//                 hygfjpDayPowerMapper.insert(hygfjpDayPower);
-//             } else {
-//                 hygfjpDayPowerMapper.insert(hygfjpDayPower);
-//             }
+
+            String today = DateUtil.today();
+            String hour = new Date().getHours() + ":00";
+            HYGFJPDayPower hygfjpDayPower = hygfjpDayPowerMapper.selectOne(
+                    new QueryWrapper<HYGFJPDayPower>().eq("third_station_id", stationId)
+                                                      .eq("year_month_day", today).eq("hour", hour));
+            if (ObjectUtils.isEmpty(hygfjpDayPower)) {
+                hygfjpDayPower = new HYGFJPDayPower();
+            }
+            hygfjpDayPower.setThirdStationId(stationId);
+            hygfjpDayPower.setHour(hour);
+            hygfjpDayPower.setYearMonthDay(today);
+            hygfjpDayPower.setPower(jpStation.getRealTimePower());
+            // 新加
+            hygfjpDayPower.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+            hygfjpDayPower.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+            hygfjpDayPower.setStationName(jpStation.getName());
+            hygfjpDayPower.setStationState(jpStation.getState());
+
+            if (ObjectUtils.isEmpty(hygfjpDayPower.getCreatedTime())) {
+                hygfjpDayPower.setCreatedTime(System.currentTimeMillis());
+                hygfjpDayPowerMapper.insert(hygfjpDayPower);
+            } else {
+                hygfjpDayPowerMapper.insert(hygfjpDayPower);
+            }
 
             Date today1 = new Date();
             // 户用场站日发电量
@@ -397,6 +399,11 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
         List<String> snList = tanYinInveterInfos.stream().map(TanYinInveterInfo::getSn).distinct().collect(Collectors.toList());
         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));
+        Map<String, JpStation> jpStationMap = jpStations.stream().collect(Collectors.toMap(JpStation::getThirdStationId, Function.identity()));
+
+
         Map<String, Object> params = MapBuilder.<String, Object>create().put("snList", snList).build();
         JSONObject tanYinInveterInfoResultMap = tanYinApiUtils.post("电站逆变器信息", apiUrl + TanYinConstant.inverterListUrl, params, null, JSONObject.class);
         if (CollectionUtils.isEmpty(tanYinInveterInfoMap)) {
@@ -413,31 +420,40 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             if (org.springframework.util.ObjectUtils.isEmpty(jpInverter)) {
                 jpInverter = new JpInverter();
             }
-            // jpInverter.setName(goodWeINverterDetailDto.getIt_name());
+            jpInverter.setBrand(tanYinInveterInfoDTO.getSupplier().toString());
             jpInverter.setSnCode(tanYinInveterInfo.getSn());
             // jpInverter.setId(String.valueOf(goodWeINverterDetailDto.getId()));
-            // jpInverter.setCapacity(goodWeINverterDetailDto.getIt_capacity());
             jpInverter.setThirdStationId(tanYinInveterInfo.getProjectNo());
             jpInverter.setThirdCode(PVProducerInfoEnum.TANYIN.getCode());
-            // if (ObjectUtil.isNotEmpty(jpStation) && StringUtils.isNotEmpty(jpStation.getName())) {
-            //     jpInverter.setStationName(jpStation.getName());
-            // }
+            // 0、离线 1、在线 2、异常
+            if ("1".equals(tanYinInveterInfoDTO.getStatus())) {
+                jpInverter.setState("离线");
+            } else if ("2".equals(tanYinInveterInfoDTO.getStatus())) {
+                jpInverter.setState("异常");
+            } else {
+                jpInverter.setState("在线");
+            }
             jpInverter.setRecDate(new Date());
             if (tanYinInveterInfoDTO.getGmtCreate() != null) {
-                // jpInverter.setUpdateTime(new Date(tanYinInveterInfoDTO.getGmtCreate()));
+                jpInverter.setUpdateTime(new Date(Long.parseLong(tanYinInveterInfoDTO.getGmtCreate())));
+            } else {
+                jpInverter.setUpdateTime(new Date());
+            }
+            JpStation jpStation = jpStationMap.get(tanYinInveterInfo.getProjectNo());
+            if (jpStation != null) {
+                jpInverter.setDayPowerGeneration(jpStation.getDayGenerate());
+                jpInverter.setMonthPowerGeneration(jpStation.getMonthGenerate());
+                jpInverter.setYearPowerGeneration(jpStation.getYearGenerate());
+                jpInverter.setTotalPowerGeneration(jpStation.getAccumulatedPower());
+                jpInverter.setStationName(jpStation.getName());
+                jpInverter.setAddr(jpStation.getAddress());
+                jpInverter.setCapacity(jpStation.getCapacity());
             }
-            //
-            // jpInverter.setRatedPower(inverterDetailDto.getPower() != null
-            //         ? Double.valueOf(inverterDetailDto.getPower())
-            //         : null); // 额定功率
-
             jpInverter.setCurrentPower(Double.parseDouble(tanYinInveterInfoDTO.getWatt()));
             jpInverter.setDayPowerGeneration(Double.parseDouble(tanYinInveterInfoDTO.getDailyEnergy()));
-            // jpInverter.setMonthPowerGeneration(inverterDetailDto.getEMonth());
-            // jpInverter.setYearPowerGeneration(inverterDetailDto.getEYear());
             jpInverter.setTotalPowerGeneration(Double.parseDouble(tanYinInveterInfoDTO.getTotalEnergy()));
-            jpInverter.setBrand(tanYinInveterInfoDTO.getSupplier().toString());
             jpInverter.setModel(tanYinInveterInfoDTO.getDeviceName());
+            jpInverter.setName(tanYinInveterInfoDTO.getDeviceName());
             if (!ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
                 jpInverterMapper.updateById(jpInverter);
             } else {
@@ -445,7 +461,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             }
         }
 
-
     }
 
+
 }