1、BUG15584、15579、15570问题修改处理。

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/GolangRequestUtil.java

 package com.yeejoin.amos.api.householdapi.Utils;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -150,4 +152,11 @@ public class GolangRequestUtil {
         pageSize = (Integer) jsonObject.get(rules[rules.length - 1]);
         return pageSize;
     }
+
+    public Long convertDate(Long input){
+        Long result = 0L;
+        Date date = DateUtil.date(input);
+        result = DateUtil.parse( DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN)).getTime();
+        return result;
+    }
 }

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

@@ -26,4 +26,6 @@ public interface KSolarDataAcquisitionService {
      */
     void inverterDetail();
 
+    void inverAlramInfo();
+
 }

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

@@ -231,7 +231,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                 tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
-                tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
+                tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getRatedPower());
                 tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
                 if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                     tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
@@ -251,7 +251,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-                tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
+                tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getRatedPower());
                 tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
                 if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                     tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
@@ -271,7 +271,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
-                tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
+                tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getRatedPower());
                 tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
                 if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                     tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
@@ -593,7 +593,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterDayGenerate.setTotalGen(inverterDetailDto.getETotal()*GoLangConstant.mwhTokwh);
                 tdHYGFInverterDayGenerate.setIgbtTemp(inverterDetailDto.getInverterTemperature());
                 tdHYGFInverterDayGenerate.setIncome(null);
-                tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+                tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getRatedPower());
                 tdHYGFInverterDayGenerateMapper.insert(tdHYGFInverterDayGenerate);
                 //户用场站月发电量
                 Date today1 = new Date();
@@ -610,7 +610,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
                 tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
-                tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getCapacity());
+                tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration() / jpInverter.getRatedPower());
                 if (ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())) {
                     tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
@@ -631,7 +631,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
                 tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
-                tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getCapacity());
+                tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration() / jpInverter.getRatedPower());
                 if (ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())) {
                     tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
@@ -652,7 +652,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
-                tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getCapacity());
+                tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration() / jpInverter.getRatedPower());
                 if (ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())) {
                     tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
                     tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
@@ -663,7 +663,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
         }
     }
 
-    @Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
+//    @Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
     @Override
     public void inverAlramInfo() {
         List<String> inverterIds = golangInverterListMapper.getInverterSns();
@@ -698,7 +698,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                         hygfjpInverterWarn = new HYGFJPInverterWarn();
                     }
                     hygfjpInverterWarn.setTime(System.currentTimeMillis());
-                    hygfjpInverterWarn.setSnCode(alarmDto.getAlarmDeviceSn());
+                    hygfjpInverterWarn.setSnCode(inverterIds.get(i));
                     hygfjpInverterWarn.setThirdStationId(String.valueOf(alarmDto.getStationId()));
                     hygfjpInverterWarn.setLevel(GoLangConstant.alarmLevel.get(alarmDto.getAlarmLevel()));
                     hygfjpInverterWarn.setContent(alarmDto.getAlarmMsg());
@@ -711,7 +711,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     }
                     hygfjpInverterWarn.setTimeLong(null);
                     if ((!ObjectUtils.isEmpty(alarmDto.getAlarmBeginTime())) && (!ObjectUtils.isEmpty(alarmDto.getAlarmEndTime()))) {
-                        hygfjpInverterWarn.setTimeLong(alarmDto.getAlarmEndTime() - alarmDto.getAlarmBeginTime());
+                        hygfjpInverterWarn.setTimeLong(golangRequestUtil.convertDate(alarmDto.getAlarmEndTime())-golangRequestUtil.convertDate(alarmDto.getAlarmBeginTime()));
                     }
                     hygfjpInverterWarn.setState(GoLangConstant.alarmstatus.get(alarmDto.getState()));
                     if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {

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

@@ -336,7 +336,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationDayGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
             tdHYGFStationDayGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFStationDayGenerate.setGenerate(jpStation.getDayGenerate());
-            tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getCapacity());
+            tdHYGFStationDayGenerate.setFullhour(jpStation.getDayGenerate() / jpStation.getRatedPower());
             tdHYGFStationDayGenerate.setIncome(jpStation.getDayIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate.getCreatedTime())) {
                 tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
@@ -356,7 +356,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationMonthGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFStationMonthGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFStationMonthGenerate.setGenerate(jpStation.getMonthGenerate());
-            tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getCapacity());
+            tdHYGFStationMonthGenerate.setFullhour(jpStation.getMonthGenerate() / jpStation.getRatedPower());
             tdHYGFStationMonthGenerate.setIncome(jpStation.getMonthIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationMonthGenerate.getCreatedTime())) {
                 tdHYGFStationMonthGenerate.setCreatedTime(System.currentTimeMillis());
@@ -376,7 +376,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFStationYearGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
             tdHYGFStationYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFStationYearGenerate.setGenerate(jpStation.getYearGenerate());
-            tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getCapacity());
+            tdHYGFStationYearGenerate.setFullhour(jpStation.getYearGenerate() / jpStation.getRatedPower());
             tdHYGFStationYearGenerate.setIncome(jpStation.getYearIncome());
             if (ObjectUtils.isEmpty(tdHYGFStationYearGenerate.getCreatedTime())) {
                 tdHYGFStationYearGenerate.setCreatedTime(System.currentTimeMillis());
@@ -822,7 +822,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterDayGenerate.setTotalGen(jpInverter.getTotalPowerGeneration());
             tdHYGFInverterDayGenerate.setIgbtTemp(inverterDetailDto.getTemperature());
             tdHYGFInverterDayGenerate.setIncome(null);
-            tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getCapacity());
+            tdHYGFInverterDayGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getRatedPower());
             tdHYGFInverterDayGenerateMapper.insert(tdHYGFInverterDayGenerate);
             //户用场站月发电量
             Date today1 = new Date();
@@ -839,7 +839,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterMonthGenerate.setDayTime(DateUtil.format(today1, "yyyy-MM-dd"));
             tdHYGFInverterMonthGenerate.setYearMonth(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFInverterMonthGenerate.setGenerate(jpInverter.getDayPowerGeneration());
-            tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getCapacity());
+            tdHYGFInverterMonthGenerate.setFullhour(jpInverter.getDayPowerGeneration()/jpInverter.getRatedPower());
             if(ObjectUtils.isEmpty(tdHYGFInverterMonthGenerate.getCreatedTime())){
                 tdHYGFInverterMonthGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterMonthGenerateMapper.insert(tdHYGFInverterMonthGenerate);
@@ -860,7 +860,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterYearGenerate.setMonthTime(DateUtil.format(today1, "yyyy-MM"));
             tdHYGFInverterYearGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterYearGenerate.setGenerate(jpInverter.getMonthPowerGeneration());
-            tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration()/jpInverter.getCapacity());
+            tdHYGFInverterYearGenerate.setFullhour(jpInverter.getMonthPowerGeneration()/jpInverter.getRatedPower());
             if(ObjectUtils.isEmpty(tdHYGFInverterYearGenerate.getCreatedTime())){
                 tdHYGFInverterYearGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterYearGenerateMapper.insert(tdHYGFInverterYearGenerate);
@@ -881,7 +881,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
             tdHYGFInverterTotalGenerate.setGenerate(jpInverter.getYearPowerGeneration());
-            tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration()/jpInverter.getCapacity());
+            tdHYGFInverterTotalGenerate.setFullhour(jpInverter.getYearPowerGeneration()/jpInverter.getRatedPower());
             if(ObjectUtils.isEmpty(tdHYGFInverterTotalGenerate.getCreatedTime())){
                 tdHYGFInverterTotalGenerate.setCreatedTime(System.currentTimeMillis());
                 tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);