hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

Browse Source
This commit is contained in:
b110212000 2022-02-16 18:37:06 +08:00
commit c7651dcd56
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SolarPower/Quartz/Jobs/CalcPowerStationJob.cs
View File

@ -727,7 +727,9 @@ namespace SolarPower.Quartz.Jobs
"EnvTemperature", "EnvTemperature",
"Humidity", "Humidity",
"Vane", "Vane",
"Dust" "Dust",
"WingDirection",
"IrrDay",
}; };
await powerStationRepository.AddSensorHistoryHour(sensorHistoriesHour, sensor_history_properties); await powerStationRepository.AddSensorHistoryHour(sensorHistoriesHour, sensor_history_properties);

3
solarApp/Service/procInvSvc.cs
View File

@ -455,7 +455,8 @@ namespace solarApp.Service
select DATE_FORMAT(a.TIMESTAMP, '%Y-%m-%d') AS reportDate, Irradiance select DATE_FORMAT(a.TIMESTAMP, '%Y-%m-%d') AS reportDate, Irradiance
from sensor_history_day a from sensor_history_day a
where powerstationID = @powerstationID and DATE_FORMAT(a.TIMESTAMP, '%Y-%m-%d') = @date1 and Irradiance <> 0 limit 1 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 }); // conn.Execute(sql, new { date1 = _date1, PowerStationID = _powerStationID });
MySqlCommand cmd = new MySqlCommand(); MySqlCommand cmd = new MySqlCommand();
cmd.Connection = conn; cmd.Connection = conn;