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:
JiaHao Liu 2022-02-15 17:42:25 +08:00
commit a9b49a3bfb
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SolarPower/Models/Overview.cs
View File

@ -186,6 +186,7 @@ namespace SolarPower.Models
public double DiffSOLARHOUR { get; set; }
public string TOTALTIME { get; set; }
public double KWHKWP { get; set; }
public double IrrDay { get; set; }
}
public class ExceptionEmailInfo

6
SolarPower/Repository/Implement/OverviewRepository.cs
View File

@ -403,8 +403,8 @@ namespace SolarPower.Repository.Implement
{
post.StartTime = post.Range.Split('-')[0] + " 00:00:00";
post.EndTime = post.Range.Split('-')[1] + " 23:59:59";
start = Convert.ToDateTime(post.StartTime);
end = Convert.ToDateTime(post.EndTime).AddDays(-1);
start = Convert.ToDateTime(post.StartTime).AddHours(-8);
end = Convert.ToDateTime(post.EndTime).AddHours(-8);
var startime = (Int64)(start.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
var endtime = (Int64)(end.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
sql += @$" AND `timestamp` BETWEEN {startime*1000} AND {endtime*1000}";
@ -670,7 +670,7 @@ namespace SolarPower.Repository.Implement
(
SELECT DENSE_RANK() OVER(ORDER BY C.TIMESTAMP) AS ROWID
, (DENSE_RANK() OVER(ORDER BY C.TIMESTAMP)) - 1 AS PreROWID,
C.TIMESTAMP,{kwh} AS KWH,C.SOLARHOUR,C.PR,P.Irradiance,P.Temperature AS Temp ,C.KWHKWP
C.TIMESTAMP,{kwh} AS KWH,C.SOLARHOUR,C.PR,P.Irradiance,P.Temperature AS Temp ,C.KWHKWP,P.IrrDay
FROM {usedb} C
LEFT JOIN {pyrdb} P ON DATE_FORMAT(P.TIMESTAMP,'{timeGroup}') = DATE_FORMAT(C.TIMESTAMP,'{timeGroup}') AND P.PowerStationId = C.PowerStationId
WHERE C.PowerStationId = {post.PowerstationId}{range2} GROUP BY C.TIMESTAMP ORDER BY C.TIMESTAMP

3
SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
View File

@ -2505,12 +2505,13 @@
kwhkwp = (ALLkwhkwp / times).toFixed(2);
times++;
}
console.log(val);
diffSOLARHOURALL = val.solarhour;
$('#HistoryDetailTable').append('<tr>' +
'<td>' + val.timestamp + '</td>' +
'<td>' + val.kwh.toFixed(2) + '</td>' +
'<td>' + val.kwhkwp.toFixed(2) + '</td>' +
'<td>' + val.irrDay.toFixed(2) + '</td>' +
'<td>' + val.irradiance.toFixed(2) + '</td>' +
'<td>' + val.pr.toFixed(2) + '</td>' +
'<td>' + val.temp.toFixed(2) + '</td>' +

3
SolarPower/Views/StationOverview/_History.cshtml
View File

@ -84,7 +84,8 @@
<th>時間</th>
<th>發電量(kWh)</th>
<th>有效發電小時</th>
<th>日照度(W/m2)</th>
<th>累積日照量(W/m2)</th>
<th>日照量(W/m2)</th>
<th>PR(%)</th>
<th>溫度(℃)</th>
</tr>