电站整体发电历史问题修复

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

@@ -51,15 +51,23 @@ public class HouseholdPvApiServiceImpl extends BaseService<HouseholdPvApiDto, Ho
                         .eq("day_time", DateUtil.format(new Date(), "yyyy-MM-dd"))
                         .eq("hour", currentTime)
                         .eq("year_month", DateUtil.format(new Date(), "yyyy-MM")));
+        Long createdTime = tdHYGFStationDayGenerate.getCreatedTime();
+        boolean flag= false;
         if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) {
             tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate();
+
+             flag= true;
         }
         BeanUtils.copyProperties(tdHYGFStationMonthGenerate,tdHYGFStationDayGenerate);
         tdHYGFStationDayGenerate.setHour(currentTime);
         if (tdHYGFStationDayGenerate.getStationState().equals("离线")){
             tdHYGFStationDayGenerate.setGenerate(null);
         }
-        tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+        if (flag){
+            tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+        }else {
+            tdHYGFStationDayGenerate.setCreatedTime(createdTime);
+        }
         TdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
     }
 

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

@@ -282,8 +282,13 @@ public class SunlightServiceImpl implements SunlightService {
 				Map<String, String> map5 = sunlightDto.getTotal_income();
 				if (map5 != null && map5.get("unit") != null && !map5.get("unit").isEmpty()
 						&& !"--".equals(map5.get("value"))) {
-					jpStation.setCumulativeIncome(SunlightUtil.sy.get(String.valueOf(map5.get("unit")))
-							* Double.valueOf(String.valueOf(map5.get("value"))));// 累计收益
+					if (!map5.get("unit").equals("")){
+						jpStation.setCumulativeIncome(SunlightUtil.sy.get(String.valueOf(map5.get("unit")))
+								* Double.valueOf(String.valueOf(map5.get("value"))));// 累计收益
+					}else {
+						jpStation.setCumulativeIncome(0.0);
+					}
+
 				}
 
 			} catch (Exception e) {