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-01-18 18:30:13 +08:00
commit dcf25a88b3
7 changed files with 74 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SolarPower/Controllers/PowerStationController.cs
View File

@ -3256,7 +3256,7 @@ namespace SolarPower.Controllers
var sitecheck = await powerStationRepository.Check4table(powerStation.Code, powerStation.SiteDB);
if(powerStation.Code != sitecheck.Avg && sitecheck.Avg != null)
{
status.Add($"s{powerStation.Code}01_avg SITEID錯誤");
status.Add($"s{powerStation.Code}01_sensoravg SITEID錯誤");
}
if (powerStation.Code != sitecheck.Inv_site && sitecheck.Inv_site != null)
{

2
SolarPower/Quartz/Jobs/CalcInverter15minJob.cs
View File

@ -134,6 +134,8 @@ namespace SolarPower.Quartz.Jobs
try
{
powerStations = await powerStationRepository.GetAllNoStatusAsync();
logger.LogInformation("【CalcInverter15minJob】開始檢測逆變器狀態");
var ps_groupby_SitDB = powerStations.GroupBy(x => x.SiteDB).ToList();

19
SolarPower/Repository/Implement/PowerStationRepository.cs
View File

@ -416,6 +416,25 @@ namespace SolarPower.Repository.Implement
}
}
public async Task<List<PowerStation>> GetAllNoStatusAsync()
{
List<PowerStation> result;
using (IDbConnection conn = this._databaseHelper.GetConnection())
{
try
{
var sql = $"SELECT * FROM {tableName} WHERE Deleted = 0";
result = (await conn.QueryAsync<PowerStation>(sql)).ToList();
}
catch (Exception exception)
{
throw exception;
}
return result;
}
}
/// <summary>
/// 透過電站編號，取得單一電站資訊(覆寫)
/// </summary>

2
SolarPower/Repository/Interface/IPowerStationRepository.cs
View File

@ -612,5 +612,7 @@ namespace SolarPower.Repository.Interface
Task<int> CheckSensorAvgTableColumn(string dbname, string code);
Task AlertColInvTableColumn(string dbname, string code);
Task AlertColSensoravgTableColumn(string dbname, string code);
Task<List<PowerStation>> GetAllNoStatusAsync();
}
}

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

@ -2426,6 +2426,7 @@
function getTable()
{
$('#all').hide();
if (historyRange == "")
{
var today = new Date();
@ -2793,6 +2794,7 @@
'<td>' + tempALL.toFixed(2) + '</td>' +
'</tr>');
}
$('#all').show();
})
}

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

@ -50,48 +50,49 @@
</div>
<div id="all">
<div class="row mb-5">
<div class="card p-3 w-100">
<h5 class="font-weight-bold mb-3 pl-5 pb-3">總結</h5>
<table class="table m-0">
<thead>
<tr>
<th>時間</th>
<th>發電量(kWh)</th>
<th>有效日照時數</th>
<th>日照度(kWh/m2)</th>
<th>PR(%)</th>
<th>溫度(℃)</th>
</tr>
</thead>
<tbody id="HistoryTotalTable">
</tbody>
</table>
</div>
</div>
<div id="history-kWh-convas-div">
<canvas id="history-kWh"></canvas>
</div>
<div class="row mb-5">
<div class="card p-3 w-100">
<h5 class="font-weight-bold mb-3 pl-5 pb-3">總結</h5>
<table class="table m-0">
<thead>
<tr>
<th>時間</th>
<th>發電量(kWh)</th>
<th>有效日照時數</th>
<th>日照度(kWh/m2)</th>
<th>PR(%)</th>
<th>溫度(℃)</th>
</tr>
</thead>
<tbody id="HistoryTotalTable">
</tbody>
</table>
<div class="row mb-5">
<div class="card p-3 w-100">
<h5 class="font-weight-bold mb-3 pl-5 pb-3">詳細資訊</h5>
<table class="table m-0">
<thead>
<tr>
<th>時間</th>
<th>發電量(kWh)</th>
<th>有效發電小時</th>
<th>日照度(W/m2)</th>
<th>PR(%)</th>
<th>溫度(℃)</th>
</tr>
</thead>
<tbody id="HistoryDetailTable">
</tbody>
</table>
</div>
</div>
</div>
<div id="history-kWh-convas-div">
<canvas id="history-kWh"></canvas>
</div>
<div class="row mb-5">
<div class="card p-3 w-100">
<h5 class="font-weight-bold mb-3 pl-5 pb-3">詳細資訊</h5>
<table class="table m-0">
<thead>
<tr>
<th>時間</th>
<th>發電量(kWh)</th>
<th>有效日照時數</th>
<th>日照度(W/m2)</th>
<th>PR(%)</th>
<th>溫度(℃)</th>
</tr>
</thead>
<tbody id="HistoryDetailTable">
</tbody>
</table>
</div>
</div>

12
SolarPower/Views/StationReport/Index.cshtml
View File

@ -1285,11 +1285,11 @@
PowerStation: selecterd_invert
}
var url = "/StationReport/GetMaxForm";
var StrInfoBody;
var StrInfoBody = "";
var CityArray = [];
var CityInfoBody;
var TotalHead;
var TotalBody;
var CityInfoBody = "";
var TotalHead = "";
var TotalBody = "";
var kwhkwp = 0;
var kwp = 0;
$.post(url, send_data, function (rel) {
@ -1365,7 +1365,8 @@
StrInfoBody += "<td>" + data.avgIrradiance.toFixed(2) + "</td>";
StrInfoBody += "<td>" + data.avgPR.toFixed(2) + "</td>";
if (showmoney == 1) {
StrInfoBody += "<td>" + toThousands(main_system_guid) + "</td>";
StrInfoBody += "<td>" + toThousands(Math.round(data.todayMoney)) + "</td>";
StrInfoBody += "<td>" + toThousands(Math.round(data.todayMoney * hirerate * 0.01))+ "</td>";
@ -1426,6 +1427,7 @@
$('#detailtable').show();
nowform = 2;
$('#all').show();
})
}