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

電站資訊-歷史紀錄: 修改歷年的日均發電度數、累積日照量

Browse Source
This commit is contained in:
wanling040@gmail.com 2022-08-11 17:50:41 +08:00
parent eea5486df1
commit bc33b47ce1
3 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SolarPower/Models/Overview.cs
View File

@ -204,6 +204,8 @@ namespace SolarPower.Models
/// </summary> /// </summary>
public double IrrDay { get; set; } public double IrrDay { get; set; }
public double IrrDayHour { get; set; } public double IrrDayHour { get; set; }
public double GeneratingCapacity { get; set; }
public int days { get; set; }
} }
public class ExceptionEmailInfo public class ExceptionEmailInfo

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

@ -731,12 +731,18 @@ namespace SolarPower.Repository.Implement
// LEFT JOIN sensor_history_month P ON P.`TIMESTAMP` = C.`TIMESTAMP` AND P.PowerStationId = C.PowerStationId // LEFT JOIN sensor_history_month P ON P.`TIMESTAMP` = C.`TIMESTAMP` AND P.PowerStationId = C.PowerStationId
// WHERE C.PowerStationId = {post.PowerstationId} // WHERE C.PowerStationId = {post.PowerstationId}
// GROUP BY left(c.`TIMESTAMP`, 4) ORDER BY C.`TIMESTAMP` "; // GROUP BY left(c.`TIMESTAMP`, 4) ORDER BY C.`TIMESTAMP` ";
sql = $@" select left(c.`TIMESTAMP`, 4) AS `TIMESTAMP`, sum(monthKWH) AS KWH, round(AVG(PR), 2) AS PR , round(AVG(PR), 2) AS avgPR , sql = $@"select * from (
ifnull(avg( P.IrrDay), 0) irrDay, avg(P.Temperature) AS Temp select left(c.`TIMESTAMP`, 4) AS `TIMESTAMP`, sum(monthKWH) AS KWH, round(AVG(PR), 2) AS PR , round(AVG(PR), 2) AS avgPR ,
FROM power_station_history_month C ifnull(avg( P.IrrDay), 0) irrDay, avg(P.Temperature) AS Temp, ps.GeneratingCapacity AS GeneratingCapacity
LEFT JOIN sensor_history_month P ON DATE_FORMAT(P.TIMESTAMP, '%Y-%M') = DATE_FORMAT(C.TIMESTAMP, '%Y-%M') AND P.PowerStationId = C.PowerStationId FROM power_station_history_month C
WHERE C.PowerStationId = {post.PowerstationId} LEFT JOIN sensor_history_month P ON DATE_FORMAT(P.TIMESTAMP, '%Y-%M') = DATE_FORMAT(C.TIMESTAMP, '%Y-%M') AND P.PowerStationId = C.PowerStationId
group by left(c.`TIMESTAMP`, 4) "; LEFT JOIN power_station ps ON ps.id = C.PowerStationId
WHERE C.PowerStationId = {post.PowerstationId}
group by left(c.`TIMESTAMP`, 4)
)x join
(
select year(timestamp) yyyy, count(*) days from sensor_history_day where PowerStationId = {post.PowerstationId} group by year(timestamp)
)y on x.`TIMESTAMP` = y.yyyy";
break; break;
} }

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

@ -2648,6 +2648,8 @@
var times = 1; var times = 1;
var ALLkwhkwp = 0; var ALLkwhkwp = 0;
var kwhkwp = 0; var kwhkwp = 0;
var ALLDays = 0;
var ALLavgdaykwh = 0;
$.each(rel.data, function (index, val) { $.each(rel.data, function (index, val) {
@ -2675,6 +2677,7 @@
//暫時先執行到這--->取kwhkwp //暫時先執行到這--->取kwhkwp
var nowDisplayIrrDay = 0; var nowDisplayIrrDay = 0;
var avgdaykwh = 0;
if (val.length != 0) { if (val.length != 0) {
if (groupType != 6) { if (groupType != 6) {
@ -2682,7 +2685,7 @@
if (groupType == 0 && kwhkwp < val.kwhkwp.toFixed(2)) { if (groupType == 0 && kwhkwp < val.kwhkwp.toFixed(2)) {
kwhkwp = val.kwhkwp.toFixed(2); kwhkwp = val.kwhkwp.toFixed(2);
} }
if (groupType != 0) { if (groupType != 0 && groupType != 3) {
ALLkwhkwp += val.kwhkwp; ALLkwhkwp += val.kwhkwp;
kwhkwp = (ALLkwhkwp / times).toFixed(2); kwhkwp = (ALLkwhkwp / times).toFixed(2);
times++; times++;
@ -2691,16 +2694,25 @@
nowDisplayIrrDay = val.irrDayHour.toFixed(2); nowDisplayIrrDay = val.irrDayHour.toFixed(2);
} }
else { else {
nowDisplayIrrDay = val.irradiance.toFixed(2); nowDisplayIrrDay = val.irrDay.toFixed(2);
}
if (groupType == 3)
{
ALLDays += val.days;
avgdaykwh = (val.kwh / val.generatingCapacity / val.days);
ALLavgdaykwh += avgdaykwh;
}
else
{
avgdaykwh = val.kwhkwp;
} }
// console.log(val); // console.log(val);
diffSOLARHOURALL = val.solarhour; diffSOLARHOURALL = val.solarhour;
$('#HistoryDetailTable').append('<tr>' + $('#HistoryDetailTable').append('<tr>' +
'<td>' + val.timestamp + '</td>' + '<td>' + val.timestamp + '</td>' +
'<td>' + (toThousands(val.kwh.toFixed(2))) + '</td>' + '<td>' + (toThousands(val.kwh.toFixed(2))) + '</td>' +
'<td>' + (toThousands(val.kwhkwp.toFixed(2))) + '</td>' + '<td>' + (toThousands(avgdaykwh.toFixed(2))) + '</td>' +//val.kwhkwp
'<td>' + (toThousands(nowDisplayIrrDay)) + '</td>' + //irrDay '<td>' + (toThousands(nowDisplayIrrDay)) + '</td>' +
//'<td>' + val.irradiance.toFixed(2) + '</td>' +
'<td>' + (toThousands(val.pr.toFixed(2))) + '</td>' + '<td>' + (toThousands(val.pr.toFixed(2))) + '</td>' +
'<td>' + (toThousands(val.temp.toFixed(2))) + '</td>' + '<td>' + (toThousands(val.temp.toFixed(2))) + '</td>' +
'</tr>'); '</tr>');
@ -2713,25 +2725,33 @@
listtemperature.push(parseFloat(val.temp.toFixed(2))); listtemperature.push(parseFloat(val.temp.toFixed(2)));
listsolarhour.push(parseFloat(val.solarhour.toFixed(2))); listsolarhour.push(parseFloat(val.solarhour.toFixed(2)));
listpr.push(parseFloat(val.pr.toFixed(2))); listpr.push(parseFloat(val.pr.toFixed(2)));
listkwhkwp.push(parseFloat(val.kwhkwp.toFixed(2))); listkwhkwp.push(parseFloat(avgdaykwh));//val.kwhkwp
} }
else else
{ {
if (groupType == 0 && kwhkwp < val.kwhkwp.toFixed(2)) { if (groupType == 0 && kwhkwp < val.kwhkwp.toFixed(2)) {
kwhkwp = val.kwhkwp.toFixed(2); kwhkwp = val.kwhkwp.toFixed(2);
} }
if (groupType != 0) { if (groupType != 0 && groupType != 3) {
ALLkwhkwp += val.kwhkwp; ALLkwhkwp += val.kwhkwp;
kwhkwp = (ALLkwhkwp / times).toFixed(2); kwhkwp = (ALLkwhkwp / times).toFixed(2);
times++; times++;
} }
if (groupType == 3) {
ALLDays += val.days;
avgdaykwh = (val.kwh / val.generatingCapacity / val.days);
ALLavgdaykwh += avgdaykwh;
}
else {
avgdaykwh = val.kwhkwp;
}
diffSOLARHOURALL += val.diffSOLARHOUR; diffSOLARHOURALL += val.diffSOLARHOUR;
$('#HistoryDetailTable').append('<tr>' + $('#HistoryDetailTable').append('<tr>' +
'<td>' + val.timestamp + '</td>' + '<td>' + val.timestamp + '</td>' +
'<td>' + (toThousands(val.kwh.toFixed(2))) + '</td>' + '<td>' + (toThousands(val.kwh.toFixed(2))) + '</td>' +
'<td>' + (toThousands(val.kwhkwp.toFixed(2))) + '</td>' + '<td>' + (toThousands(avgdaykwh.toFixed(2))) + '</td>' +//val.kwhkwp
'<td>' + (toThousands(val.irrDay.toFixed(2))) + '</td>' +
//'<td>' + val.irradiance.toFixed(2) + '</td>' +
'<td>' + (toThousands(val.pr.toFixed(2))) + '</td>' + '<td>' + (toThousands(val.pr.toFixed(2))) + '</td>' +
'<td>' + (toThousands(val.temp.toFixed(2))) + '</td>' + '<td>' + (toThousands(val.temp.toFixed(2))) + '</td>' +
'</tr>'); '</tr>');
@ -2744,7 +2764,7 @@
listtemperature.push(parseFloat(val.temp.toFixed(2))); listtemperature.push(parseFloat(val.temp.toFixed(2)));
listsolarhour.push(parseFloat(val.solarhour.toFixed(2))); listsolarhour.push(parseFloat(val.solarhour.toFixed(2)));
listpr.push(parseFloat(val.pr.toFixed(2))); listpr.push(parseFloat(val.pr.toFixed(2)));
listkwhkwp.push(parseFloat(val.kwhkwp.toFixed(2))); listkwhkwp.push(parseFloat(avgdaykwh));//val.kwhkwp
} }
} }
}) })
@ -2866,10 +2886,18 @@
} }
else else
{ {
var avgK = 0;
if (groupType == 3) {
avgK = ALLavgdaykwh / rel.data.length;//(kwhALL / rel.data[0].generatingCapacity / ALLDays).toFixed(2);
}
else {
avgdaykwh = kwhkwp;
}
$('#HistoryTotalTable').append('<tr>' + $('#HistoryTotalTable').append('<tr>' +
'<td>' + TimestampALL + '</td>' + '<td>' + TimestampALL + '</td>' +
'<td>' + (toThousands(kwhALL.toFixed(2))) + '</td>' + '<td>' + (toThousands(kwhALL.toFixed(2))) + '</td>' +
'<td>' + (toThousands(kwhkwp)) + '</td>' + '<td>' + (toThousands(avgK.toFixed(2))) + '</td>' +
//'<td>' + irradianceALL.toFixed(2) + '</td>' + // 改成累積日照 by jiahao 2022-04-30 00:444 //'<td>' + irradianceALL.toFixed(2) + '</td>' + // 改成累積日照 by jiahao 2022-04-30 00:444
'<td>' + (toThousands(avgIrr_day.toFixed(2))) + '</td>' + '<td>' + (toThousands(avgIrr_day.toFixed(2))) + '</td>' +
'<td>' + (toThousands(avgPR.toFixed(2))) + '</td>' + '<td>' + (toThousands(avgPR.toFixed(2))) + '</td>' +