From 42a2d95df6a47b0d2ac0121ce2feabd3b308be2e Mon Sep 17 00:00:00 2001 From: JiaHao Liu Date: Tue, 15 Feb 2022 17:41:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?debug=20=E9=87=8D=E8=A4=87=E8=A8=88?= =?UTF-8?q?=E7=AE=97=20=E5=B7=B2=E5=88=AA=E9=99=A4=E7=9A=84=20inv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- solarApp/Service/procInvSvc.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/solarApp/Service/procInvSvc.cs b/solarApp/Service/procInvSvc.cs index b96a29a..c75b243 100644 --- a/solarApp/Service/procInvSvc.cs +++ b/solarApp/Service/procInvSvc.cs @@ -455,7 +455,8 @@ namespace solarApp.Service select DATE_FORMAT(a.TIMESTAMP, '%Y-%m-%d') AS reportDate, Irradiance from sensor_history_day a where powerstationID = @powerstationID and DATE_FORMAT(a.TIMESTAMP, '%Y-%m-%d') = @date1 and Irradiance <> 0 limit 1 - )irr on a.reportDate = irr.reportDate ;"; + )irr on a.reportDate = irr.reportDate + where i.enabled = 1;"; // conn.Execute(sql, new { date1 = _date1, PowerStationID = _powerStationID }); MySqlCommand cmd = new MySqlCommand(); cmd.Connection = conn; From d2160201ea6c96935efa2db0a6aa5163dacb4825 Mon Sep 17 00:00:00 2001 From: Kai Date: Tue, 15 Feb 2022 18:14:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E9=9B=BB=E7=AB=99=E6=AD=B8=E6=AA=94bu?= =?UTF-8?q?g=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Quartz/Jobs/CalcPowerStationJob.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs b/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs index 85d8213..b99779e 100644 --- a/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs +++ b/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs @@ -727,7 +727,9 @@ namespace SolarPower.Quartz.Jobs "EnvTemperature", "Humidity", "Vane", - "Dust" + "Dust", + "WingDirection", + "IrrDay", }; await powerStationRepository.AddSensorHistoryHour(sensorHistoriesHour, sensor_history_properties);