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

1. 修改逆變器分析 bug fix

Browse Source 
2. 背景執行 bug fix
3. 電站總覽 底板字體修改
This commit is contained in:
Kai 2021-09-29 14:56:38 +08:00
parent c93680eba3
commit dc9023cf85
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,8 @@ namespace SolarPower.Quartz.Jobs
#region 發電金額 #region 發電金額
history.MONEY = history.KWH * powerStation.PowerRate; history.MONEY = history.KWH * powerStation.PowerRate;
history.TODAYMONEY = history.TodayKWh * powerStation.PowerRate;
history.TOTALMONEY = history.TotalKWH * powerStation.PowerRate;
//即時發電金額 //即時發電金額
switch (powerStation.SolarType) switch (powerStation.SolarType)
@ -229,6 +231,8 @@ namespace SolarPower.Quartz.Jobs
carbonRate = Convert.ToDouble(await powerStationRepository.GetOneVariableByName("CarbonRate")); carbonRate = Convert.ToDouble(await powerStationRepository.GetOneVariableByName("CarbonRate"));
history.CARBON = history.KWH * carbonRate; history.CARBON = history.KWH * carbonRate;
history.TODAYCARBON = history.TodayKWh * carbonRate;
history.TOTALCARBON = history.TotalKWH * carbonRate;
//if (lastmoneyhistorybyhour != null) //if (lastmoneyhistorybyhour != null)
//{ //{
// history.TODAYCARBON = lastmoneyhistorybyhour.TODAYCARBON + history.KWH * carbonRate; // history.TODAYCARBON = lastmoneyhistorybyhour.TODAYCARBON + history.KWH * carbonRate;

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

@ -4473,7 +4473,7 @@ namespace SolarPower.Repository.Implement
sql_perSiteDB.Add(temp_sql); sql_perSiteDB.Add(temp_sql);
} }
sql = string.Join(" UNION ", sql_perSiteDB); sql = "SELECT * FROM (" + string.Join(" UNION ", sql_perSiteDB) + ") a ORDER BY a.TIMESTAMP ASC";
result = (await conn.QueryAsync<InverterHistory>(sql, new { NowDay = nowDay })).ToList(); result = (await conn.QueryAsync<InverterHistory>(sql, new { NowDay = nowDay })).ToList();
} }
@ -4504,7 +4504,7 @@ namespace SolarPower.Repository.Implement
var temp_sql = $@"SELECT var temp_sql = $@"SELECT
DATE_FORMAT(inv.TIMESTAMP, '%Y-%m-%d') AS TIMESTAMP, DATE_FORMAT(inv.TIMESTAMP, '%Y-%m-%d') AS TIMESTAMP,
INVERTERID, inv.INVERTERID,
i.InverterName AS INVERTERName, i.InverterName AS INVERTERName,
inv.Irradiance, inv.Irradiance,
inv.KWH, inv.KWH,
@ -4523,7 +4523,7 @@ namespace SolarPower.Repository.Implement
sql_perSiteDB.Add(temp_sql); sql_perSiteDB.Add(temp_sql);
} }
sql = string.Join(" UNION ", sql_perSiteDB); sql = "SELECT * FROM (" + string.Join(" UNION ", sql_perSiteDB) + ") a ORDER BY a.TIMESTAMP ASC";
result = (await conn.QueryAsync<InverterHistory>(sql, new { StartDay = startDay, EndDay = endDay })).ToList(); result = (await conn.QueryAsync<InverterHistory>(sql, new { StartDay = startDay, EndDay = endDay })).ToList();
} }
@ -4554,7 +4554,7 @@ namespace SolarPower.Repository.Implement
var temp_sql = $@"SELECT var temp_sql = $@"SELECT
DATE_FORMAT(inv.TIMESTAMP, '%Y-%m-%d') AS TIMESTAMP, DATE_FORMAT(inv.TIMESTAMP, '%Y-%m-%d') AS TIMESTAMP,
INVERTERID, inv.INVERTERID,
i.InverterName AS INVERTERName, i.InverterName AS INVERTERName,
inv.KWH, inv.KWH,
inv.TODAYKWH, inv.TODAYKWH,

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

@ -22,12 +22,12 @@
<div class="col-xl-2"> <div class="col-xl-2">
<h1 class="subheader-title"> <h1 class="subheader-title">
<span id="power-station-healthStatus"></span> <span id="power-station-healthStatus"></span>
<span id="power-station-title">新竹巨城站</span> <span id="power-station-title">電站名稱</span>
</h1> </h1>
</div> </div>
<div class="col-xl-3 d-flex justify-content-start"> <div class="col-xl-3 d-flex justify-content-start">
<p class="card-text px-3"><i class="fal fa-cloud-sun-rain fa-3x" id="weather-icon"></i></p> <p class="card-text px-3"><i class="fal fa-cloud-sun-rain fa-3x" id="weather-icon"></i></p>
<p class="font-weight-bold" id="weather-temp">27°C<br>降雨幾率: 15%</p> <p class="font-weight-bold" id="weather-temp">27°C<br>降雨幾率: 0%</p>
</div> </div>
</div> </div>
<ul class="nav nav-tabs mb-5" role="tablist"> <ul class="nav nav-tabs mb-5" role="tablist">