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:
Kai 2021-07-20 20:33:40 +08:00
commit a9c2afd257
6 changed files with 262 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
SolarPower/Controllers/PowerStationController.cs
View File

@ -2602,5 +2602,61 @@ namespace SolarPower.Controllers
return apiResult;
}
[HttpPost]
public async Task<ApiResult<List<PowerStationImage>>> GetAllPowerStationsALLImage(List<int> powerStationId)
{
ApiResult<List<PowerStationImage>> apiResult = new ApiResult<List<PowerStationImage>>();
List<PowerStationImage> powerStationImages = null;
List<PowerStationImage> ALLpowerStationImages = new List<PowerStationImage>();
try
{
foreach(var ones in powerStationId)
{
var powerStation = await powerStationRepository.GetOneAsync(ones);
if (powerStation == null)
{
apiResult.Code = "9992";
apiResult.Msg = errorCode.GetString(apiResult.Code);
return apiResult;
}
else
{
if (!IsPlatformLayer(myUser.Role.Layer) && powerStation.CompanyId != myUser.CompanyId)
{
apiResult.Code = "9993";
apiResult.Msg = errorCode.GetString(apiResult.Code);
return apiResult;
}
powerStationImages = await powerStationRepository.GetAllPowerStationImageAsync(ones, powerStation.SiteDB);
foreach (var stationImage in powerStationImages)
{
stationImage.Image = Path.Combine(stationImageFilePath, powerStation.Id.ToString()) + "/" + stationImage.Image;
}
ALLpowerStationImages = ALLpowerStationImages.Concat(powerStationImages).ToList();
}
}
apiResult.Code = "0000";
apiResult.Data = ALLpowerStationImages;
}
catch (Exception exception)
{
apiResult.Code = "9999";
Logger.LogError("【" + controllerName + "/" + actionName + "】" + "PowerStationId=" + powerStationId);
Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message);
}
apiResult.Msg = errorCode.GetString(apiResult.Code);
return apiResult;
}
}
}

1
SolarPower/Models/AnalysisStationCombine.cs
View File

@ -22,5 +22,6 @@ namespace SolarPower.Models
{
public List<int> StationIds { get; set; }
public string Timerange { get; set; }
public int SeacrhType { get; set; }
}
}

106
SolarPower/Repository/Implement/AnalysisStationCombineRepository.cs
View File

@ -27,15 +27,113 @@ namespace SolarPower.Repository.Implement
{
try
{
string sql = @"SELECT AVG(KWHKWP),TOTALMONEY,TOTALKWH,TOTALCARBON,PR";
string sql = "";
switch(post.SeacrhType)
{
case 0:
string timerange = Convert.ToDateTime(post.Timerange).ToString("yyyy-MM-dd");
sql = $@"SELECT m.*,n.* FROM
(
SELECT AVG(KWHKWP) AS All_KWH_KWP ,SUM(TOTALMONEY) AS All_money,
SUM(TOTALKWH) AS All_kwh,SUM(TOTALCARBON) AS All_Carbon,
AVG(PR) AS All_PR
from power_station_history_month
WHERE PowerStationId IN @ids
)
AS m,
(
SELECT
SUM(b.TODAYKWH) AS Now_kwh,
SUM(b.TODAYMONEY) AS Now_money,
AVG(b.KWHKWP) AS Now_KWH_KWP ,
AVG(b.PR) AS Now_PR,
SUM(b.TODAYCARBON) AS Now_Carbon
FROM (SELECT MAX(a.`TIMESTAMP`) AS maxTIMESTAMP FROM
(SELECT * FROM power_station_history_hour hr WHERE DATE_FORMAT(hr.`TIMESTAMP`,'%Y-%m-%d') = '{timerange}') a ) c
LEFT JOIN
(SELECT * FROM power_station_history_hour hr WHERE DATE_FORMAT(hr.`TIMESTAMP`,'%Y-%m-%d') = '{timerange}' ) b
ON c.maxTIMESTAMP = b.`TIMESTAMP`
WHERE PowerStationId IN @ids
)
AS n";
break;
case 1:
var time = post.Timerange.Split('-');
sql = $@"SELECT m.*,n.* FROM
(
SELECT AVG(KWHKWP) AS All_KWH_KWP, SUM(TOTALMONEY) AS All_money,
SUM(TOTALKWH) AS All_kwh, SUM(TOTALCARBON) AS All_Carbon,
AVG(PR) AS All_PR
from power_station_history_month
WHERE PowerStationId IN @ids
)
AS m,
(
SELECT
SUM(b.TODAYKWH) AS Now_kwh,
SUM(b.MONEY) AS Now_money,
AVG(b.KWHKWP) AS Now_KWH_KWP,
AVG(b.PR) AS Now_PR,
SUM(b.CARBON) AS Now_Carbon
FROM power_station_history_day b
WHERE PowerStationId IN @ids AND TIMESTAMP BETWEEN '{time[0]}' AND '{time[1]}'
)
AS n";
break;
case 2:
sql = $@"SELECT m.*,n.* FROM
(
SELECT
AVG(KWHKWP) AS All_KWH_KWP,
SUM(TOTALMONEY) AS All_money,
SUM(TOTALKWH) AS All_kwh,
SUM(TOTALCARBON) AS All_Carbon,
AVG(PR) AS All_PR
from power_station_history_month
WHERE PowerStationId IN @ids
)
AS m,
(
SELECT
SUM(b.TODAYKWH) AS Now_kwh,
SUM(b.MONEY) AS Now_money,
AVG(b.KWHKWP) AS Now_KWH_KWP,
AVG(b.PR) AS Now_PR,
SUM(b.CARBON) AS Now_Carbon
FROM power_station_history_day b
WHERE PowerStationId IN @ids AND DATE_FORMAT(TIMESTAMP, '%Y-%m') = '{post.Timerange}'
)
AS n";
break;
case 3:
sql = $@"SELECT m.*,n.* FROM
(
SELECT AVG(KWHKWP) AS All_KWH_KWP, SUM(TOTALMONEY) AS All_money,
SUM(TOTALKWH) AS All_kwh, SUM(TOTALCARBON) AS All_Carbon,
AVG(PR) AS All_PR
from power_station_history_month
WHERE PowerStationId IN @ids
)
AS m,
(
SELECT
a = await conn.QueryFirstOrDefaultAsync<AnalysisStationCombine>(sql);
SUM(b.MONTHKWH) AS Now_kwh,
SUM(b.MONEY) AS Now_money,
AVG(b.KWHKWP) AS Now_KWH_KWP,
AVG(b.PR) AS Now_PR,
SUM(b.CARBON) AS Now_Carbon
FROM power_station_history_month b
WHERE PowerStationId IN @ids AND DATE_FORMAT(TIMESTAMP, '%Y') = '{post.Timerange}'
)
AS n";
break;
}
trans.Commit();
a = await conn.QueryFirstOrDefaultAsync<AnalysisStationCombine>(sql,new { ids = post.StationIds});
}
catch (Exception exception)
{
trans.Rollback();
throw exception;
}
finally

129
SolarPower/Views/AnalysisStationCombine/Index.cshtml
View File

@ -78,28 +78,29 @@
<div class="frame-wrap">
<div class="row mb-5">
<div class="card-columns">
<div class="card">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4>
<div class="ml-auto">kwh</div>
</div>
<div class="card-body" >
<div class="card-body">
<div class="d-flex justify-content-between">
<p>總發電量</p>
<p><span class="color-info-700" id="today_kwh">126,161.72</span></p>
<p><span class="color-info-700" id="total_kwh">126,161.72</span></p>
</div>
<div class="d-flex justify-content-between">
<p>今日發電量</p>
<p><span class="color-info-700" id="total_kwh">4,069.73</span></p>
<p><span class="color-info-700" id="today_kwh">4,069.73</span></p>
</div>
</div>
</div>
<div class="card money-card">
<div class="card">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-dollar-sign mr-1"></span> <span id="money-card-title">發電金額</span></h4>
<div class="ml-auto">NTD</div>
</div>
<div class="card-body" >
<div class="card-body">
<div class="d-flex justify-content-between">
<p id="money-card-subtitle-total">總發金額</p>
<p><span class="color-info-700" id="total_money">126,161.72</span></p>
@ -110,6 +111,7 @@
</div>
</div>
</div>
<div class="card">
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> kWh / kWp</h4>
@ -117,11 +119,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>平均 kWh / kWp</p>
<p><span class="color-info-700" id="today_kwhkwp">140.39</span></p>
<p><span class="color-info-700" id="total_kwhkwp">140.39</span></p>
</div>
<div class="d-flex justify-content-between">
<p>今日 kWh / kWp </p>
<p><span class="color-info-700" id="avg_kwhkwp">4.53</span></p>
<p><span class="color-info-700" id="today_kwhkwp">4.53</span></p>
</div>
</div>
</div>
@ -129,14 +131,14 @@
<div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
<h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4>
</div>
<div class="card-body" >
<div class="card-body">
<div class="d-flex justify-content-between">
<p>平均 PR 值</p>
<p><span class="color-info-700" id="today_PR">119.04</span></p>
<p><span class="color-info-700" id="total_PR">119.04</span></p>
</div>
<div class="d-flex justify-content-between">
<p>今日PR值</p>
<p><span class="color-info-700" id="avg_PR">3.84</span></p>
<p><span class="color-info-700" id="today_PR">3.84</span></p>
</div>
</div>
</div>
@ -146,14 +148,14 @@
<h4 class="mb-0 font-weight-bold"><span class="fal fa-cow mr-1"></span> 減碳量</h4>
<div class="ml-auto">kG</div>
</div>
<div class="card-body" >
<div class="card-body">
<div class="d-flex justify-content-between">
<p>總減碳量</p>
<p><span class="color-info-700" id="today_carbon">6,091.78</span></p>
<p><span class="color-info-700" id="total_carbon">6,091.78</span></p>
</div>
<div class="d-flex justify-content-between">
<p>今日減碳量</p>
<p><span class="color-info-700" id="total_carbon">985.98</span></p>
<p><span class="color-info-700" id="today_carbon">985.98</span></p>
</div>
</div>
</div>
@ -277,21 +279,12 @@
powerids.push(String(val.id));
Allpowerids.push(String(val.id));
});
//GetStationsCard();
//modal 電站 下拉式選單
//$("#power_station_select_modal").empty();
//$.each(rel.data, function (index, val) {
// $("#power_station_select_modal").append($("<option />").val(val.id).text(val.name));
//});
//預設查詢第一個
//$("#power_station_select_modal").val($("#power_station_select_modal option:first").val()).trigger('change');
GetStationsCard();
photoshow();
})
})
//#endregion
})
//#region 更換搜尋條件(日,日區間,月,年)
@ -344,21 +337,21 @@
document.getElementById("DateGettextdiv").style.display = "";//隱藏
document.getElementById("DateGet").style.display = "none";//隱藏
//#endregion
$('#DateGettext').val(dateLimit_format + ' - ' + today_format);
$('#DateGettext').val(dateLimit_format + ' - ' + today_format).trigger('change');
break;
case 2: $('#DateGet').prop({ 'type': 'month' });
$(".btn-change-quickSearch1").html("本月");
$(".btn-change-quickSearch2").html("上個月");
var now_month = new Date().toISOString().substring(0, 7);
$('#DateGet').val(now_month);
$('#DateGet').val(now_month).trigger('change');
break;
case 3:
$(".btn-change-quickSearch1").html("今年");
$(".btn-change-quickSearch2").html("去年");
var now_year = new Date().toISOString().substring(0, 4);
$('#DateGet').prop({ 'type': 'number', 'min': 1900, 'max': now_year, 'step': 1 });
$('#DateGet').val(now_year);
$('#DateGet').val(now_year).trigger('change');
break;
}
if (type == 2) {
@ -379,9 +372,11 @@
if (day == 0) {
var today = new Date().toISOString().substring(0, 10);
$('#DateGet').val(today);
$('#testwww').html('123');
} else {
var dateLimit = new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().substring(0, 10);
$('#DateGet').val(dateLimit);
$('#testwww').html('456');
}
break;
case 1:
@ -394,9 +389,9 @@
datepicker.data('daterangepicker').setStartDate(dateLimit_format);
datepicker.data('daterangepicker').setEndDate(today_format);
//#endregion
$('#DateGettext').val(dateLimit_format + ' - ' + today_format);
$('#DateGettext').val(dateLimit_format + ' - ' + today_format).trigger('change');
} else {
//#region 預設近7天
//#region 預設近30天
var today = new Date();
var dateLimit = new Date(new Date().setDate(today.getDate() - 30));
var today_format = today.toISOString().slice(0, 10).replace(/-/g, "/");
@ -404,46 +399,54 @@
datepicker.data('daterangepicker').setStartDate(dateLimit_format);
datepicker.data('daterangepicker').setEndDate(today_format);
//#endregion
$('#DateGettext').val(dateLimit_format + ' - ' + today_format);
$('#DateGettext').val(dateLimit_format + ' - ' + today_format).trigger('change');
}
break;
case 2:
if (day == 0) {
var now_month = new Date().toISOString().substring(0, 7);
$('#DateGet').val(now_month);
$('#DateGet').val(now_month).trigger('change');
} else {
var dateLimit = new Date(new Date().setMonth(new Date().getMonth() - 1)).toISOString().substring(0, 7);
$('#DateGet').val(dateLimit);
$('#DateGet').val(dateLimit).trigger('change');
}
break;
case 3:
if (day == 0) {
var now_year = new Date().toISOString().substring(0, 4);
$('#DateGet').val(now_year);
$('#DateGet').val(now_year).trigger('change');
} else {
var dateLimit = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).toISOString().substring(0, 4);
$('#DateGet').val(dateLimit);
$('#DateGet').val(dateLimit).trigger('change');
}
break;
}
}
//#endregion
//#region 更換input
$('#DateGet').on('change', function () {
timerange = $('#DateGet').val();
console.log('a');
GetStationsCard();
});
//#endregion
//#region 更換inputtext
$('#DateGettext').on('change', function () {
timerange = $('#DateGettext').val();
console.log('b');
GetStationsCard();
});
//#endregion
//#region 5張卡片值
function GetStationsCard()
{
var send_data = {
stationIds: powerids,
timerange: timerange
timerange: timerange,
seacrhType: searchType
}
var Nurl = "/AnalysisStationCombine/GetStationsCard";
@ -452,8 +455,64 @@
toast_error(rel.msg);
return;
}
$('#total_kwh').html(rel.data.all_kwh.toFixed(2));
$('#total_money').html(rel.data.all_money.toFixed(2));
$('#total_kwhkwp').html(rel.data.all_KWH_KWP.toFixed(2));
$('#total_PR').html(rel.data.all_PR.toFixed(2));
$('#total_carbon').html(rel.data.all_Carbon.toFixed(2));
$('#today_kwh').html(rel.data.now_kwh.toFixed(2));
$('#today_money').html(rel.data.now_money.toFixed(2));
$('#today_kwhkwp').html(rel.data.now_KWH_KWP.toFixed(2));
$('#today_PR').html(rel.data.now_PR.toFixed(2));
$('#today_carbon').html(rel.data.now_Carbon.toFixed(2));
})
}
//#endregion
//#region 圖片輪播
function photoshow()
{
var url_image = "/PowerStation/GetAllPowerStationsALLImage";
var send_data = {
powerStationId: powerids
};
$.post(url_image, send_data, function (rel) {
if (rel.code != "0000") {
toast_error(rel.msg);
return;
}
carouselExampleIndicators = $("#carouselExampleIndicators");
carouselExampleIndicators.find(".carousel-indicators").empty();
carouselExampleIndicators.find(".carousel-inner").empty();
rel.data.forEach(function (value, index) {
CreatePowerStationImagecarousel(carouselExampleIndicators, value, index);
});
carouselExampleIndicators.find(".carousel-indicators > li").first().addClass("active");
carouselExampleIndicators.find(".carousel-inner > .carousel-item").first().addClass("active");
}, 'json');
}
function CreatePowerStationImagecarousel(dom, value, index) {
var indicators = '<li data-target="#carouselExampleIndicators" data-slide-to="' + index + '"></li>'
var carousel_item = '<div class="carousel-item">' +
'<img class="d-block w-100" src="' + value.image + '">' +
'</div>'
dom.find(".carousel-indicators").append(indicators);
dom.find(".carousel-inner").append(carousel_item);
}
//#endregion
</script>
}

16
SolarPower/Views/StationOverview/Index.cshtml
View File

@ -400,8 +400,8 @@
var time = new Date(val.createdAt);
$('#card_' + val.id).find('#editSolarUrl').attr('href', localurl + '/Info?stationId=' + val.id);
$('#card_' + val.id).find('#date').html(time.getMonth() + "/" + time.getDate() + " " + time.getHours() + ":" + time.getMinutes());
$('#card_' + val.id).find('#Capacity').html(val.today_kWh);
$('#card_' + val.id).find('#PowerRate').html(val.today_kWh * val.powerRate);
$('#card_' + val.id).find('#Capacity').html(val.today_kWh.toFixed(2));
$('#card_' + val.id).find('#PowerRate').html((val.today_kWh * val.powerRate).toFixed(2));
$('#card_' + val.id).find('#PR').html(val.today_PR);
$('#card_' + val.id).find('#aria').attr('aria-valuenow', val.today_PR);
$('#card_' + val.id).find('#aria').attr('style', "width:" + val.today_PR + "%;");
@ -424,13 +424,13 @@
'<td>' + val.code + '</td>' +
'<td>' + val.name + '</td>' +
'<td>' + val.generatingCapacity + '</td>' +
'<td>' + val.total_kWh + '</td>' +
'<td>' + val.today_kWh + '</td>' +
'<td>' + val.solarHour + '</td>' +
'<td>' + val.total_kWh.toFixed(2) + '</td>' +
'<td>' + val.today_kWh.toFixed(2) + '</td>' +
'<td>' + val.solarHour.toFixed(2) + '</td>' +
'<td>' + val.today_PR + '</td>' +
'<td>' + val.today_irradiance + '</td>' +
'<td>' + val.avg_irradiance + '</td>' +
'<td>' + val.today_Money + '</td>' +
'<td>' + val.today_irradiance.toFixed(2) + '</td>' +
'<td>' + val.avg_irradiance.toFixed(2) + '</td>' +
'<td>' + val.today_Money.toFixed(2) + '</td>' +
'<td>' + statusName + '</td>' +
'<td><button type="button" class="btn btn-primary btn-pills waves-effect waves-themed" onclick="location.href=\'' + localurl + '/Info?stationId=' + val.id + '\'">選擇</button></td>' +

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

@ -227,7 +227,7 @@
}, 'json');
//#region 載入電站圖片
var url_image = "/PowerStation/GetAllPowerStationImage";
var url_image = "/PowerStation/GetAllPowerStationsALLImage";
var send_data = {
powerStationId: stationId
};