锦浪云逆变器状态与第三方显示不一致问题处理。

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

@@ -159,4 +159,15 @@ public class GolangRequestUtil {
         result = DateUtil.parse( DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN)).getTime();
         return result;
     }
+
+    public String getInverterState(String currentState,Long updateTime){
+      String state = "在线";
+      if(Integer.valueOf(currentState)>1004){
+        state = "报警";
+      }
+      if((System.currentTimeMillis()-updateTime)>1800000 ){
+          state="离线";
+      }
+      return state;
+    }
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -60,11 +60,11 @@ public class HouseholdTestController {
     @ApiOperation(httpMethod = "POST", value = "锦浪云", notes = "锦浪云")
     public void golangnew() throws IOException {
 //        goLangDataAcquisitionService.stationList();
-          goLangDataAcquisitionService.stationDetail();
+//          goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
-////        goLangDataAcquisitionService.inverterList();
+//        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
-//        goLangDataAcquisitionService.inverterDetail();
+        goLangDataAcquisitionService.inverterDetail();
 //        goLangDataAcquisitionService.inverAlramInfo();
     }
 
@@ -80,7 +80,7 @@ public class HouseholdTestController {
 //        goLangDataAcquisitionService.stationList();
 //          goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
-////        goLangDataAcquisitionService.inverterList();
+//        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
 //        goLangDataAcquisitionService.inverterDetail();
 //        goLangDataAcquisitionService.inverAlramInfo();
@@ -117,10 +117,10 @@ public class HouseholdTestController {
 //        kSolarDataAcquisitionService.stationList();
 //        kSolarDataAcquisitionService.stationDetail();
 //        kSolarDataAcquisitionService.collectorList();
-        kSolarDataAcquisitionService.collectorDetail();
+//        kSolarDataAcquisitionService.collectorDetail();
 ////        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
-//        goLangDataAcquisitionService.inverterDetail();
+        goLangDataAcquisitionService.inverterDetail();
 //        goLangDataAcquisitionService.inverAlramInfo();
 
     }

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

@@ -129,4 +129,5 @@ public class InverterDetailDto {
     private Double pow32;
     private Double inverterTemperature;
     private Double fac;
+    private Long dataTimestamp;
 }

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

@@ -456,7 +456,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     jpInverter = new JpInverter();
                 }
                 jpInverter.setSnCode(inverterDetailDto.getSn().trim());
-                jpInverter.setState(GoLangConstant.stationStaus.get(inverterDetailDto.getCurrentState()));
+                jpInverter.setState(golangRequestUtil.getInverterState(inverterDetailDto.getCurrentState(),inverterDetailDto.getDataTimestamp()));
                 jpInverter.setCollectorId(String.valueOf(inverterDetailDto.getCollectorId()));
                 jpInverter.setCollectorSnCode(inverterDetailDto.getCollectorsn());
                 jpInverter.setUpdateTime(new Date());