修改电站监控BUG

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

@@ -128,6 +128,7 @@ public class SofarRequestUtil {
             } while (true);
         } catch (Exception exception) {
             exception.printStackTrace();
+            return result;
         }
         return result;
     }
@@ -157,6 +158,7 @@ public class SofarRequestUtil {
             }
         } catch (Exception exception) {
             exception.printStackTrace();
+            return result;
         }
         return result;
     }

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

@@ -260,9 +260,8 @@ public class SunlightUtil {
                 }
             } while (true);
         } catch (Exception e) {
-            log.error("失败,msg={}", e.getMessage());
-            e.printStackTrace();
-            throw new RuntimeException(e.getMessage());
+            log.error("失败,msg["+e.getMessage()+"]", e);
+            return resultData;
         }
         return resultData;
 
@@ -299,9 +298,8 @@ public class SunlightUtil {
 
             return resultData;
         } catch (Exception e) {
-            log.error("失败,msg={}", e.getMessage());
-            e.printStackTrace();
-            throw new RuntimeException(e.getMessage());
+            log.error("失败,msg["+e.getMessage()+"]", e);
+            return new JSONObject();
         }
 
 

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

@@ -465,7 +465,7 @@ public class SunlightServiceImpl implements SunlightService {
 			}
 
 			if (listd != null) {
-				this.collectorDetail(listd, jpStation);
+				this.collectorDetail(listdtx, jpStation);
 			}
 
 			// 电站报表
@@ -625,6 +625,8 @@ public class SunlightServiceImpl implements SunlightService {
 							jpInverter.setModel(device.getDevice_model_code());
 							jpInverter.setCapacity(jpStation.getCapacity());
 							jpInverter.setCurrentPower(jpStation.getRealTimePower());
+							jpInverter.setRatedPower(jpStation.getRatedPower());
+							jpInverter.setFisTimeStr(device.getGrid_connection_date());
 
 							if (devicestx != null) {
 
@@ -999,7 +1001,7 @@ public class SunlightServiceImpl implements SunlightService {
 			// 出场日期
 //                jpCollector.setDischargeDate(new Date(collectorDetailDto.getFactoryTime()));
 //                //生产日期
-//                jpCollector.setProductDate(new Date(collectorDetailDto.getFactoryTime()));
+//                jpCollector.setProductDate(new Date(collectorDetailDto.getFactordyTime()));
 //                //数据上传间隔
 //                jpCollector.setDataPeriod(collectorDetailDto.getDataUploadCycle());
 //                //本次上电时间