修改容量

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

@@ -38,6 +38,44 @@ 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("NB10",125440D/1000);
+            put("NB11",119840D/1000);
+            put("NB12",123200D/1000);
+            put("NB13",136080D/1000);
+            put("NB14",127680D/1000);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        }
+    };
+
+
+
+
     public static String baseurl ="https://cn.fusionsolar.huawei.com";
     public static String account ="ahsjmg-API";
     public static String password ="huawei123";

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

@@ -56,4 +56,46 @@ public class KSolarConstant {
             put("1", "已恢复");
         }
     };
+
+
+    public static final HashMap<String, Double> Capacity = new HashMap<String, Double>() {
+        {
+            put("nb1",141120D/1000);
+            put("nb2",141120D/1000);
+            put("nb3",143920D/1000);
+            put("nb4",141120D/1000);
+            put("nb5",140000D/1000);
+            put("nb6",147840D/1000);
+            put("nb7",144480D/1000);
+            put("nb8",132160D/1000);
+            put("nb9",142240D/1000);
+            put("nb10",143360D/1000);
+            put("nb11",143360D/1000);
+            put("nb12",140000D/1000);
+            put("nb13",147840D/1000);
+            put("nb14",145600D/1000);
+            put("nb15",147840D/1000);
+            put("nb16",143360D/1000);
+            put("nb17",145040D/1000);
+            put("nb18",147840D/1000);
+            put("nb19",147840D/1000);
+            put("nb20",147840D/1000);
+            put("nb21",146720D/1000);
+            put("nb22",147840D/1000);
+            put("nb23",147840D/1000);
+            put("nb24",143360D/1000);
+            put("nb25",143360D/1000);
+            put("nb26",147840D/1000);
+            put("nb27",142240D/1000);
+            put("nb28",138880D/1000);
+            put("nb29",129920D/1000);
+            put("nb30",144480D/1000);
+
+        }
+    };
+
+
+
+
+
 }

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

@@ -171,7 +171,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     // 业主姓名
                     jpStation.setUserName(ksolarStation.getUserName());
                     jpStation.setState(KSolarConstant.collectStaus.get(String.valueOf(ksolarStation.getStatus())));
-                    jpStation.setRealTimePower(ksolarStation.getPowerInter()!=null?ksolarStation.getPowerInter()/1000000:0.0);
+                    jpStation.setRealTimePower(ksolarStation.getPowerInter()!=null?ksolarStation.getPowerInter()/1000:0.0);
 
                     jpStation.setDayGenerate(ksolarStation.getDayGeneration());
                     jpStation.setAccumulatedPower(ksolarStation.getTotalGeneration());
@@ -458,7 +458,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             // 满发小时数
 //                        jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour()));
                             // 装机容量
-//                        jpInverter.setCapacity(inverterDetailDto.getPower().intValue());
+                            // jpInverter.setCapacity();
+
 
                             jpInverter.setSnCode(ksolarStationCollectData.getInverterId());
                             jpInverter.setId(ksolarStationCollectData.getInverterId());
@@ -467,7 +468,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                             jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId());
                             jpInverter.setUpdateTime(new Date());
 
-                            jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent());
+                            jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent()!=null?ksolarStationCollectData.getPowerApparent()/1000:0.0);
                             jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration());
                             jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration());
                             jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration());