1.h华为北向逆变器容量字段值缺失问题修改。

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

@@ -40,36 +40,20 @@ public class ImasterConstant {
 
     public static final HashMap<String, Double> Capacity = new HashMap<String, Double>() {
         {
-            put("NB1",125440D/1000);
-            put("NB2",123200D/1000);
-            put("NB3",123200D/1000);
-            put("NB4",131040D/1000);
-            put("NB5",115360D/1000);
-            put("NB6",123200D/1000);
-            put("NB7",123200D/1000);
-            put("NB8",122080D/1000);
-            put("NB9",116480D/1000);
+            put("NB01",125440D/1000);
+            put("NB02",123200D/1000);
+            put("NB03",123200D/1000);
+            put("NB04",131040D/1000);
+            put("NB05",115360D/1000);
+            put("NB06",123200D/1000);
+            put("NB07",123200D/1000);
+            put("NB08",122080D/1000);
+            put("NB09",116480D/1000);
             put("NB10",125440D/1000);
             put("NB11",119840D/1000);
             put("NB12",123200D/1000);
             put("NB13",136080D/1000);
             put("NB14",127680D/1000);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         }
     };
 

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

@@ -145,7 +145,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
         String today = DateUtil.today();
         String hour = new Date().getHours() + ":00";
             try {
-                TimeUnit.MINUTES.sleep(5);
+                TimeUnit.SECONDS.sleep(1);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
@@ -453,12 +453,12 @@ public class ImasterDataServiceImpl implements ImasterDataService {
     }
 
 
-    @Scheduled(cron = "${dataRequstScheduled.huawei}")
+    @Scheduled(cron = "0 0/1 * * * *")
     @Override
     public void inverterDetail() {
         List<String> inverterSns = imasterInverterListMapper.getCollectIds();
             try {
-                TimeUnit.MINUTES.sleep(5);
+                TimeUnit.SECONDS.sleep(1);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
@@ -511,7 +511,6 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 queryWrapper1.orderByDesc("created_time");
                 List<ImasterCollectorList> collectorLists = imasterCollectorListMapper.selectList(queryWrapper1);
                 ImasterCollectorList collectorList = collectorLists.get(0);
-
                 JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
                         eq("third_station_id", imasterInverterList.getStationCode()).
                         eq("third_code", PVProducerInfoEnum.HUAWEI.getCode()).
@@ -519,6 +518,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                 if (ObjectUtils.isEmpty(jpInverter)) {
                     jpInverter = new JpInverter();
                 }
+                jpInverter.setCapacity(ImasterConstant.Capacity.get(imasterInverterList.getDevName()));
                 jpInverter.setSnCode(imasterInverterList.getEsnCode());
                 jpInverter.setAddr(imasterInverterList.getAddr());
                 jpInverter.setCollectorSnCode(collectorList.getEsnCode());
@@ -720,7 +720,7 @@ public class ImasterDataServiceImpl implements ImasterDataService {
         List<String> inverterSns = imasterInverterListMapper.getCollectIds();
         for (int i = 0; i < inverterSns.size(); i++) {
             try {
-                TimeUnit.MINUTES.sleep(5);
+                TimeUnit.MINUTES.sleep(3);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }