优化电站监控

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

@@ -262,11 +262,15 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 					TdHYGFStationMonthGenerateMapper.insert(TdHYGFStationMonthGenerate);
 				}
 				// 户用场站月发电量
-				TdHYGFStationYearGenerate TdHYGFStationYearGenerate = TdHYGFStationYearGenerateMapper
-						.selectOne(new QueryWrapper<TdHYGFStationYearGenerate>()
+				List<TdHYGFStationYearGenerate> tdHYGFStationYearGenerateList = TdHYGFStationYearGenerateMapper
+						.selectList(new QueryWrapper<TdHYGFStationYearGenerate>()
 								.eq("third_station_id", jpStation.getThirdStationId())
 								.eq("month_time", DateUtil.format(today1, "yyyy-MM"))
 								.eq("year", DateUtil.format(today1, "yyyy")));
+				TdHYGFStationYearGenerate TdHYGFStationYearGenerate=null;
+				if(CollectionUtil.isNotEmpty(tdHYGFStationYearGenerateList)){
+					TdHYGFStationYearGenerate=tdHYGFStationYearGenerateList.get(0);
+				}
 				if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationYearGenerate)) {
 					TdHYGFStationYearGenerate = new TdHYGFStationYearGenerate();
 				}
@@ -291,11 +295,16 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 					TdHYGFStationYearGenerateMapper.insert(TdHYGFStationYearGenerate);
 				}
 				// 户用场站年发电量
-				TdHYGFStationAllGenerate TdHYGFStationAllGenerate = TdHYGFStationAllGenerateMapper
-						.selectOne(new QueryWrapper<TdHYGFStationAllGenerate>()
+				List<TdHYGFStationAllGenerate> tdHYGFStationAllGenerateList = TdHYGFStationAllGenerateMapper
+						.selectList(new QueryWrapper<TdHYGFStationAllGenerate>()
 								.eq("third_station_id", jpStation.getThirdStationId())
 								.eq("year_time", DateUtil.format(today1, "yyyy"))
 								.eq("year", DateUtil.format(today1, "yyyy")));
+
+				TdHYGFStationAllGenerate TdHYGFStationAllGenerate=null;
+				if(CollectionUtil.isNotEmpty(tdHYGFStationAllGenerateList)){
+					TdHYGFStationAllGenerate=tdHYGFStationAllGenerateList.get(0);
+				}
 				if (org.springframework.util.ObjectUtils.isEmpty(TdHYGFStationAllGenerate)) {
 					TdHYGFStationAllGenerate = new TdHYGFStationAllGenerate();
 				}