-
-
-
+
+
+
+
+
+
+
+
+ | 出租人 |
+ 租金比例 |
+ 租金金額(未稅) |
+ 租金金額(含稅) |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 縣市 |
+ 平均發電量(kWp) |
+ 有效發電小時 |
+
+
+
+
+
+
+
+
+
+
+
@@ -785,7 +789,7 @@
str += "
日照小時(hr) | ";
str += "
有效發電小時 | ";
str += "
PR% | ";
- str += "
日
平均
日照度
(W/㎡) | ";
+ str += "
累積日照量(W/㎡) | ";
str += "
日
平均
模組溫度
(°C) | ";
if (rel.data.showMoney == 1) {
str += "
日
售電金額
(NTD) | ";
@@ -840,9 +844,11 @@
$(e).removeClass("btn-primary").addClass("btn-success");
button = e;
+ $('#all').hide();
$('#hiretable').hide();
$('#maxtable').hide();
+
tablehand(form);
}
@@ -913,6 +919,7 @@
var ntd = 0;
var ntdone = 0;
var sta = "";
+ var GeneratingCapacity = 0;
$.each(rel.data, function (index, inverter) {
sta += "
";
sta += "| " + inverter.report_date + " | ";
@@ -928,7 +935,7 @@
sta += "" + Number(inverter.irradiance) + " | ";
sta += "" + Number(inverter.temperature) + " | ";
if (showmoney == 1) {
- sta += "" + Math.round(Number(inverter.hourmoney)) + " | ";
+ sta += "" + toThousands(Math.round(Number(inverter.hourmoney))) + " | ";
}
sta += "
";
thour = inverter.tothour ? inverter.tothour.toFixed(2) : 0;
@@ -936,13 +943,15 @@
tkwh = inverter.totKWH ? inverter.totKWH.toFixed(2) : 0;
kWhkwp = inverter.totKWHKWP ? inverter.totKWHKWP.toFixed(2) : 0;
ntd = inverter.totmoney ? Math.round(inverter.totmoney) : 0;
- ntdone = inverter.totmoney / inverter.totKWH ? Math.round(inverter.totmoney / inverter.totKWH) : 0;
+ ntdone = inverter.totmoney / inverter.totKWH ? Math.round(inverter.totmoney / inverter.totKWH * 10000) / 10000 : 0;
+ GeneratingCapacity = inverter.GeneratingCapacity;
})
var stc = "
";
- stc += "| " + '日照小時' + " | ";
+/* stc += "" + '日照小時' + " | ";*/
stc += "" + '有效發電小時' + " | ";
stc += "" + 'PR%' + " | ";
stc += "" + '日發電量(kWh)' + " | ";
+ stc += "" + '裝置容量' + " | ";
if (showmoney == 1) {
stc += "" + '日售電金額(NTD)' + " | ";
stc += "" + '日售電單價(NTD)' + " | ";
@@ -951,13 +960,14 @@
var stb = "
";
- stb += "| " + thour + " | ";
+/* stb += "" + thour + " | ";*/
stb += "" + kWhkwp + " | ";
stb += "" + tpr + " | ";
stb += "" + tkwh + " | ";
+ stb += "" + GeneratingCapacity + " | ";
if (showmoney == 1) {
- stb += "" + Math.round(ntd) + " | ";
- stb += "" + Math.round(ntdone) + " | ";
+ stb += "" + toThousands(Math.round(ntd)) + " | ";
+ stb += "" + Math.round(ntdone * 10000) / 10000 + " | ";
}
stb += "
";
@@ -979,6 +989,7 @@
var sta = "";
var check_hire = false;
var sitedb = "";
+ var GeneratingCapacity = 0;
$.each(rel.data, function (index, inverter) {
sta += "
";
sta += "| " + inverter.report_date + " | ";
@@ -994,10 +1005,10 @@
sta += "" + inverter.tothour + " | ";
sta += "" + inverter.KWHKWP + " | ";
sta += "" + ((inverter.PR == null) ? 0 : inverter.PR.toFixed(2)) + " | ";
- sta += "" + inverter.irradiance + " | ";
+ sta += "" + ((inverter.IrrDay == null) ? 0 : inverter.IrrDay) + " | ";
sta += "" + inverter.temperature + " | ";
if (showmoney == 1) {
- sta += "" + Math.round(inverter.soldmoney) + " | ";
+ sta += "" + toThousands(Math.round(inverter.soldmoney)) + " | ";
}
sta += "
";
avghour += inverter.tothour ? inverter.tothour : 0;
@@ -1011,17 +1022,20 @@
check_hire = true;
sitedb = inverter.SiteDB
}
-
+ GeneratingCapacity = inverter.GeneratingCapacity;
})
monthday = rel.data.length;
var stc = "
";
- stc += "| " + '日照平均(日)' + " | ";
+ /*stc += "" + '日照平均(日)' + " | ";*/
stc += "" + '有效發電小時(日)' + " | ";
stc += "" + '發電量平均(kWh)(日)' + " | ";
stc += "" + '發電量(kWh)(月)' + " | ";
+ stc += "" + '裝置容量' + " | ";
+
if (showmoney == 1) {
+ stc += "" + '每度獲利' + " | ";
stc += "" + '售電金額(NTD)(月)' + " | ";
stc += "" + '售電單價(NTD)(月)' + " | ";
}
@@ -1042,13 +1056,16 @@
stb += "
";
}
else {
- stb += "
" + (avghour / monthday).toFixed(2) + " | ";
+ /*stb += "
" + (avghour / monthday).toFixed(2) + " | ";*/
stb += "
" + (avgKWHKWP / monthday).toFixed(2) + " | ";
stb += "
" + (avgdayKWH / monthday).toFixed(2) + " | ";
stb += "
" + monthKWH + " | ";
+ stb += "
" + GeneratingCapacity + " | ";
+
if (showmoney == 1) {
- stb += "
" + Math.round(monthmoney) + " | ";
- stb += "
" + Math.round(monthmoneyone / monthday) + " | ";
+ stb += "
" + (monthmoney / GeneratingCapacity).toFixed(3) + " | ";
+ stb += "
" + toThousands(Math.round(monthmoney)) + " | ";
+ stb += "
" + Math.round(monthmoneyone / monthday*10000)/10000 + " | ";
}
stb += "
" + monthday + " | ";
stb += "";
@@ -1071,8 +1088,8 @@
std += "
";
std += "| " + value.landowner + " | ";
std += "" + value.leaseRate + "%" + " | ";
- std += "" + Math.round(monthmoney * value.leaseRate / 100) + " | ";
- std += "" + Math.round(monthmoney * value.leaseRate / 100 * 1.05) + " | ";
+ std += "" + toThousands(Math.round(monthmoney * value.leaseRate / 100)) + " | ";
+ std += "" + toThousands(Math.round(monthmoney * value.leaseRate / 100 * 1.05)) + " | ";
std += "
";
})
$('#HireTableBody').append(std);
@@ -1117,7 +1134,7 @@
sta += "
" + inverter.irradiance + " | ";
sta += "
" + inverter.temperature + " | ";
if (showmoney == 1) {
- sta += "
" + Math.round(inverter.soldmoney) + " | ";
+ sta += "
" + toThousands(Math.round(inverter.soldmoney)) + " | ";
}
sta += "";
avghour += inverter.tothour ? inverter.tothour : 0;
@@ -1167,8 +1184,8 @@
stb += "
" + (avgdayKWH / monthday).toFixed(2) + " | ";
stb += "
" + monthKWH + " | ";
if (showmoney == 1) {
- stb += "
" + Math.round(monthmoney) + " | ";
- stb += "
" + Math.round(monthmoneyone / monthday) + " | ";
+ stb += "
" + toThousands(Math.round(monthmoney)) + " | ";
+ stb += "
" + Math.round(monthmoneyone / monthday*10000)/10000 + " | ";
}
stb += "
" + monthday + " | ";
stb += "";
@@ -1191,8 +1208,8 @@
std += "
";
std += "| " + value.landowner + " | ";
std += "" + value.leaseRate + "%" + " | ";
- std += "" + Math.round(monthmoney * value.leaseRate / 100) + " | ";
- std += "" + Math.round(monthmoney * value.leaseRate / 100 * 1.05) + " | ";
+ std += "" + toThousands(Math.round(monthmoney * value.leaseRate / 100)) + " | ";
+ std += "" + toThousands(Math.round(monthmoney * value.leaseRate / 100 * 1.05)) + " | ";
std += "
";
})
$('#HireTableBody').append(std);
@@ -1211,7 +1228,8 @@
}
$('#overviewtable').show();
$('#detailtable').show();
-
+
+ $('#all').show();
nowform = form;
}, 'json');
}
@@ -1267,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) {
@@ -1347,11 +1365,12 @@
StrInfoBody += "
" + data.avgIrradiance.toFixed(2) + " | ";
StrInfoBody += "
" + data.avgPR.toFixed(2) + " | ";
if (showmoney == 1) {
- StrInfoBody += "
" + Math.round(data.todayMoney) + " | ";
+
+ StrInfoBody += "
" + toThousands(Math.round(data.todayMoney)) + " | ";
- StrInfoBody += "
" + Math.round(data.todayMoney * hirerate * 0.01)+ " | ";
+ StrInfoBody += "
" + toThousands(Math.round(data.todayMoney * hirerate * 0.01))+ " | ";
- StrInfoBody += "
" + Math.round(data.todayMoney) + " | ";
+ StrInfoBody += "
" + toThousands(Math.round(data.todayMoney)) + " | ";
}
@@ -1408,6 +1427,7 @@
$('#detailtable').show();
nowform = 2;
+ $('#all').show();
})
}
@@ -1436,5 +1456,22 @@
return hirerate;
}
+ function toThousands(num) {
+ var num = (num || 0).toString(), result = '';
+ var last = "";
+ if (num.indexOf('.') != -1) {
+ var nn = num.split('.');
+ num = nn[0];
+ last = "." + nn[1];
+ }
+
+ while (num.length > 3) {
+ result = ',' + num.slice(-3) + result;
+ num = num.slice(0, num.length - 3);
+ }
+ if (num) { result = num + result + last; }
+
+ return result;
+ }
}
\ No newline at end of file
diff --git a/solarApp/Service/procInvSvc.cs b/solarApp/Service/procInvSvc.cs
index e743235..169400c 100644
--- a/solarApp/Service/procInvSvc.cs
+++ b/solarApp/Service/procInvSvc.cs
@@ -185,64 +185,74 @@ namespace solarApp.Service
_logger.LogInformation("【ProcInvSvc】開始執行[{0}]在{1}逆變器15min補償", _siteID, _date1);
}
- sql = @"
+ sql = @$"DROP TABLE IF EXISTS del_Inv_day_" + _powerStationID + @"_s1;
+ CREATE TABLE del_Inv_day_" + _powerStationID + @"_s1
+ select * from " + _siteDB + ".s" + _siteID01 + @"_inv a
+ WHERE left(crdTime, 10) = @date1;
+ # 2. add index
+ ALTER TABLE del_Inv_day_" + _powerStationID + @"_s1 ADD INDEX `temp_index` (crdTime, inverterid);";
+ int ct = conn.Execute(sql, new { date1 = _date1 });
+
+ sql = @"
INSERT INTO solar_master.inverter_history_15min( PowerStationId, TIMESTAMP, INVERTERID, KWH, TODAYKWH, KWHKWP)
select PowerStationId, reportdate, a.inverterid, KWH, TODAYKWH, (kwh/(capacity/4)) kwpkwp from
(
select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':00:00')reportdate, inverterid,
(sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- from " + _siteDB + ".s" + _siteID01 + @"_inv
+ from del_Inv_day_" + _powerStationID + @"_s1
where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '00' and '10'
group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
union
select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':15:00')reportdate, inverterid,
(sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- from " + _siteDB + ".s" + _siteID01 + @"_inv
+ from del_Inv_day_" + _powerStationID + @"_s1
where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '15' and '25'
group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
union
select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':30:00')reportdate, inverterid,
(sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- from " + _siteDB + ".s" + _siteID01 + @"_inv
+ from del_Inv_day_" + _powerStationID + @"_s1
where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '30' and '40'
group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
union
select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':45:00')reportdate, inverterid,
(sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- from " + _siteDB + ".s" + _siteID01 + @"_inv
+ from del_Inv_day_" + _powerStationID + @"_s1
where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '45' and '55'
group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
) a join " + _siteDB + @".inverter b on a.inverterid = b.inverterid";
- // sql = @"
- // INSERT INTO solar_master.inverter_history_15min( PowerStationId, TIMESTAMP, INVERTERID, KWH, TODAYKWH, KWHKWP)
- // select PowerStationId, reportdate, a.inverterid, KWH, TODAYKWH, (kwh/(capacity/4)) kwpkwp from
- // (
- //select @PowerStationId PowerStationId,CONCAT(left(CrdTime, 13), '%Y-%m-%d %H'), ':00:00')reportdate, inverterid,
- // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- // from " + _siteDB + ".s" + _siteID01 + @"_inv
- // where left(CrdTime, 10) = @date1 and CONCAT(left(CrdTime, 13), '%Y-%m-%d %H:%i') , 2) between '00' and '10'
- // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
- // union
- // select @PowerStationId PowerStationId, CONCAT(left(CrdTime, 13), ':15:00')reportdate, inverterid,
- // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- // from " + _siteDB + ".s" + _siteID01 + @"_inv
- // where left(CrdTime, 10) = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '15' and '25'
- // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
- // union
- // select @PowerStationId PowerStationId, CONCAT(left(CrdTime, 13), ':30:00')reportdate, inverterid,
- // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- // from " + _siteDB + ".s" + _siteID01 + @"_inv
- // where left(CrdTime, 10) = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '30' and '40'
- // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
- // union
- // select @PowerStationId PowerStationId, CONCAT(left(CrdTime, 13), ':45:00')reportdate, inverterid,
- // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
- // from " + _siteDB + ".s" + _siteID01 + @"_inv
- // where left(CrdTime, 10) = @date1 and MINUTE(CrdTime) between '45' and '55'
- // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
- // ) a join " + _siteDB + @".inverter b on a.inverterid = b.inverterid";
-
+ //sql = @"
+ // INSERT INTO solar_master.inverter_history_15min( PowerStationId, TIMESTAMP, INVERTERID, KWH, TODAYKWH, KWHKWP)
+ // select PowerStationId, reportdate, a.inverterid, KWH, TODAYKWH, (kwh/(capacity/4)) kwpkwp from
+ // (
+ // select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':00:00')reportdate, inverterid,
+ // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
+ // from " + _siteDB + ".s" + _siteID01 + @"_inv
+ // where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '00' and '10'
+ // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
+ // union
+ // select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':15:00')reportdate, inverterid,
+ // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
+ // from " + _siteDB + ".s" + _siteID01 + @"_inv
+ // where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '15' and '25'
+ // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
+ // union
+ // select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':30:00')reportdate, inverterid,
+ // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
+ // from " + _siteDB + ".s" + _siteID01 + @"_inv
+ // where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '30' and '40'
+ // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
+ // union
+ // select @PowerStationId PowerStationId, CONCAT(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H'), ':45:00')reportdate, inverterid,
+ // (sum(WH)/1000) KWH, max(TODAYKWH) TODAYKWH
+ // from " + _siteDB + ".s" + _siteID01 + @"_inv
+ // where FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d') = @date1 and right(FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H:%i') , 2) between '45' and '55'
+ // group by FROM_UNIXTIME(`TIMESTAMP`/1000,'%Y-%m-%d %H') , inverterid
+ // ) a join " + _siteDB + @".inverter b on a.inverterid = b.inverterid";
+
+
+
var ds = conn.Execute(sql, new { date1 = _date1, PowerStationID = _powerStationID });
if (_logger != null)
@@ -308,61 +318,60 @@ namespace solarApp.Service
// where powerstationID = @powerstationID and DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d') = @date1
// )irr on a.reportDate = irr.reportDate
// order by a.INVERTERID, a.reportDate;";
- //int ct = conn.Execute(sql, new { date1 = _date1, PowerStationID = _powerStationID });
+ //int ct = conn.Execute(sql, new { date1 = _date1, PowerStationID = _powerStationID });
- sql = @$"DROP TEMPORARY TABLE IF EXISTS Inv_day_"+ _powerStationID + @"_s1;
- CREATE TEMPORARY TABLE Inv_day_" + _powerStationID + @"_s1
- select * from " + _siteDB + ".s" + _siteID01 + @"_inv a
- WHERE left(crdTime, 10) = @date1;
- # 2. add index
- ALTER TABLE Inv_day_" + _powerStationID + @"_s1 ADD INDEX `temp_index` (crdTime, inverterid);";
- int ct = conn.Execute(sql, new { date1 = _date1});
+ sql = @$"DROP TEMPORARY TABLE IF EXISTS Inv_day_" + _powerStationID + @"_s2;
+ CREATE TEMPORARY TABLE Inv_day_" + _powerStationID + @"_s2
+ SELECT " + _powerStationID + @" powerStationID, a.INVERTERID, a.reportDate,a.AC1V, a.AC1A, a.AC1W, a.AC1F, a.AC1WH, a.AC2V, a.AC2A, a.AC2W, a.AC2F, a.AC2WH,
+ a.AC3V, a.AC3A, a.AC3W, a.AC3F, a.AC3WH, a.DC1V, a.DC1A, a.DC1W, a.DC1WH, a.DC2V, a.DC2A, a.DC2W, a.DC2WH, a.DC3V, a.DC3A, a.DC3W,
+ a.DC3WH, a.DC4V, a.DC4A, a.DC4W, a.DC4WH, a.DC5V, a.DC5A, a.DC5W, a.DC5WH,
+ a.RA1, a.RA2, a.RA3, a.RA4, a.RA5, a.KWH, a.TODAYKWH, a.TOTALKWH,
+ IFNULL(Irradiance, 0) irr, 0 as PR, ((DC1W + DC2W + DC3W + DC4W + DC5W) / 1000) DCKW, ((AC1W + AC2W + AC3W) / 1000) ACKW, (a.KWH / i.Capacity) AS KWHKWP
+ from
+ (-- 取得該時間區間的KWH
+ SELECT concat(left(crdTime, 13), ':00:00') reportDate, INVERTERID,
+ AVG(AC1V) AS AC1V, AVG(AC1A) AS AC1A, round(SUM(AC1W), 5) AS AC1W, AVG(AC1F) AS AC1F, SUM(AC1WH) AS AC1WH, AVG(AC2V) AS AC2V,
+ AVG(AC2A) AS AC2A, round(SUM(AC2W), 5) AS AC2W, AVG(AC2F) AS AC2F, SUM(AC2WH) AS AC2WH, AVG(AC3V) AS AC3V, AVG(AC3A) AS AC3A,
+ round(SUM(AC3W), 5) AS AC3W, AVG(AC3F) AS AC3F, SUM(AC3WH) AS AC3WH, AVG(DC1V) AS DC1V, AVG(DC1A) AS DC1A, SUM(DC1W) AS DC1W,
+ SUM(DC1WH) AS DC1WH, AVG(DC2V) AS DC2V, AVG(DC2A) AS DC2A, SUM(DC2W) AS DC2W, SUM(DC2WH) AS DC2WH, AVG(DC3V) AS DC3V,
+ AVG(DC3A) AS DC3A, AVG(DC3W) AS DC3W, AVG(DC3WH) AS DC3WH, AVG(DC4V) AS DC4V, AVG(DC4A) AS DC4A, SUM(DC4W) AS DC4W,
+ SUM(DC4WH) AS DC4WH, AVG(DC5V) AS DC5V, AVG(DC5A) AS DC5A, SUM(DC5W) AS DC5W, SUM(DC5WH) AS DC5WH,
+ AVG(RA1) AS RA1, AVG(RA2) AS RA2, AVG(RA3) AS RA3,
+ AVG(RA4) AS RA4, AVG(RA5) AS RA5, MAX(TODAYKWH) AS TODAYKWH, MAX(TOTALKWH) AS TOTALKWH, (SUM(WH) / 1000) AS KWH
+ FROM del_Inv_day_" + _powerStationID + @"_s1
+ GROUP BY left(crdTime, 13), INVERTERID
+ ) a
+ -- 取得逆變器容量
+ LEFT JOIN " + _siteDB + @".inverter i ON a.INVERTERID = i.InverterId
+ -- 取日照度-------------------- -
+ left join(
+ select concat(DATE_FORMAT(`TIMESTAMP`, '%Y-%m-%d %H'), ':00:00') AS reportDate, Irradiance
+ from sensor_history_hour
+ where powerstationID = " + _powerStationID + @" and DATE_FORMAT(`TIMESTAMP`, '%Y-%m-%d') = @date1
+ )irr on a.reportDate = irr.reportDate; ";
+ int ct = conn.Execute(sql, new { date1 = _date1 });
+
+
+
+ //# 3. insert ans
+ sql = @$"
+ INSERT INTO solar_master.inverter_history_hour(`powerStationID`, `INVERTERID`, `TIMESTAMP`, `AC1V`, `AC1A`, `AC1W`, `AC1F`, `AC1WH`, `AC2V`, `AC2A`, `AC2W`, `AC2F`, `AC2WH`, `AC3V`, `AC3A`, `AC3W`, `AC3F`, `AC3WH`, `DC1V`, `DC1A`, `DC1W`, `DC1WH`, `DC2V`, `DC2A`, `DC2W`, `DC2WH`, `DC3V`, `DC3A`, `DC3W`, `DC3WH`, `DC4V`, `DC4A`, `DC4W`, `DC4WH`, `DC5V`, `DC5A`, `DC5W`, `DC5WH`, `RA1`, `RA2`, `RA3`, `RA4`, `RA5`, `KWH`, `TODAYKWH`, `TOTALKWH`, `Irradiance`, `PR`, `DCKW`, `ACKW`, `KWHKWP`)
+ select `powerStationID`, a.`INVERTERID`, a.`reportDate`, `AC1V`, `AC1A`, `AC1W`, `AC1F`, `AC1WH`, `AC2V`, `AC2A`, `AC2W`, `AC2F`, `AC2WH`, `AC3V`, `AC3A`, `AC3W`, `AC3F`, `AC3WH`, `DC1V`, `DC1A`, `DC1W`, `DC1WH`, `DC2V`, `DC2A`, `DC2W`, `DC2WH`, `DC3V`, `DC3A`, `DC3W`, `DC3WH`, `DC4V`, `DC4A`, `DC4W`, `DC4WH`, `DC5V`, `DC5A`, `DC5W`, `DC5WH`, `RA1`, `RA2`, `RA3`, `RA4`, `RA5`, `KWH`, `TODAYKWH`, `TOTALKWH`, `irr`, inv_pr.`PR`, `DCKW`, `ACKW`, `KWHKWP`
+ from Inv_day_" + _powerStationID + @"_s2 a left JOIN( -- 取得整點值PR
+ SELECT concat(left(crdTime, 13), ':00:00') AS reportDate, inv.INVERTERID, inv.PR
+ FROM del_Inv_day_" + _powerStationID + @"_s1 inv
+ WHERE minute(crdtime) = '55'
+ GROUP BY left(crdTime, 13), inv.INVERTERID
+ ) inv_pr
+ ON a.reportDate = inv_pr.reportDate AND a.INVERTERID = inv_pr.INVERTERID;";
+ ct = conn.Execute(sql, new { date1 = _date1 });
+ if (_logger != null)
+ _logger.LogInformation("【ProcInvSvc】執行完成[{0}]在{1}逆變器hour補償", _siteID, _date1);
+
+ ss = @$"DROP TABLE IF EXISTS del_Inv_day_" + _powerStationID + @"_s1; ";
+ conn.Execute(ss);
+ }
- sql = @$"DROP TEMPORARY TABLE IF EXISTS Inv_day_" + _powerStationID + @"_s2;
- CREATE TEMPORARY TABLE Inv_day_" + _powerStationID + @"_s2
- SELECT " + _powerStationID + @" powerStationID, a.INVERTERID, a.reportDate,a.AC1V, a.AC1A, a.AC1W, a.AC1F, a.AC1WH, a.AC2V, a.AC2A, a.AC2W, a.AC2F, a.AC2WH,
- a.AC3V, a.AC3A, a.AC3W, a.AC3F, a.AC3WH, a.DC1V, a.DC1A, a.DC1W, a.DC1WH, a.DC2V, a.DC2A, a.DC2W, a.DC2WH, a.DC3V, a.DC3A, a.DC3W,
- a.DC3WH, a.DC4V, a.DC4A, a.DC4W, a.DC4WH, a.DC5V, a.DC5A, a.DC5W, a.DC5WH,
- a.RA1, a.RA2, a.RA3, a.RA4, a.RA5, a.KWH, a.TODAYKWH, a.TOTALKWH,
- IFNULL(Irradiance, 0) irr, 0 as PR, ((DC1W + DC2W + DC3W + DC4W + DC5W) / 1000) DCKW, ((AC1W + AC2W + AC3W) / 1000) ACKW, (a.KWH / i.Capacity) AS KWHKWP
- from
- (-- 取得該時間區間的KWH
- SELECT concat(left(crdTime, 13), ':00:00') reportDate, INVERTERID,
- AVG(AC1V) AS AC1V, AVG(AC1A) AS AC1A, round(SUM(AC1W), 5) AS AC1W, AVG(AC1F) AS AC1F, SUM(AC1WH) AS AC1WH, AVG(AC2V) AS AC2V,
- AVG(AC2A) AS AC2A, round(SUM(AC2W), 5) AS AC2W, AVG(AC2F) AS AC2F, SUM(AC2WH) AS AC2WH, AVG(AC3V) AS AC3V, AVG(AC3A) AS AC3A,
- round(SUM(AC3W), 5) AS AC3W, AVG(AC3F) AS AC3F, SUM(AC3WH) AS AC3WH, AVG(DC1V) AS DC1V, AVG(DC1A) AS DC1A, SUM(DC1W) AS DC1W,
- SUM(DC1WH) AS DC1WH, AVG(DC2V) AS DC2V, AVG(DC2A) AS DC2A, SUM(DC2W) AS DC2W, SUM(DC2WH) AS DC2WH, AVG(DC3V) AS DC3V,
- AVG(DC3A) AS DC3A, AVG(DC3W) AS DC3W, AVG(DC3WH) AS DC3WH, AVG(DC4V) AS DC4V, AVG(DC4A) AS DC4A, SUM(DC4W) AS DC4W,
- SUM(DC4WH) AS DC4WH, AVG(DC5V) AS DC5V, AVG(DC5A) AS DC5A, SUM(DC5W) AS DC5W, SUM(DC5WH) AS DC5WH,
- AVG(RA1) AS RA1, AVG(RA2) AS RA2, AVG(RA3) AS RA3,
- AVG(RA4) AS RA4, AVG(RA5) AS RA5, MAX(TODAYKWH) AS TODAYKWH, MAX(TOTALKWH) AS TOTALKWH, (SUM(WH) / 1000) AS KWH
- FROM Inv_day_" + _powerStationID + @"_s1
- GROUP BY left(crdTime, 13), INVERTERID
- ) a
- -- 取得逆變器容量
- LEFT JOIN " + _siteDB + @".inverter i ON a.INVERTERID = i.InverterId
- -- 取日照度-------------------- -
- left join(
- select concat(DATE_FORMAT(`TIMESTAMP`, '%Y-%m-%d %H'), ':00:00') AS reportDate, Irradiance
- from sensor_history_hour
- where powerstationID = " + _powerStationID + @" and DATE_FORMAT(`TIMESTAMP`, '%Y-%m-%d') = @date1
- )irr on a.reportDate = irr.reportDate; ";
- ct = conn.Execute(sql, new { date1 = _date1 });
- //# 3. insert ans
- sql = @$"
- INSERT INTO solar_master.inverter_history_hour(`powerStationID`, `INVERTERID`, `TIMESTAMP`, `AC1V`, `AC1A`, `AC1W`, `AC1F`, `AC1WH`, `AC2V`, `AC2A`, `AC2W`, `AC2F`, `AC2WH`, `AC3V`, `AC3A`, `AC3W`, `AC3F`, `AC3WH`, `DC1V`, `DC1A`, `DC1W`, `DC1WH`, `DC2V`, `DC2A`, `DC2W`, `DC2WH`, `DC3V`, `DC3A`, `DC3W`, `DC3WH`, `DC4V`, `DC4A`, `DC4W`, `DC4WH`, `DC5V`, `DC5A`, `DC5W`, `DC5WH`, `RA1`, `RA2`, `RA3`, `RA4`, `RA5`, `KWH`, `TODAYKWH`, `TOTALKWH`, `Irradiance`, `PR`, `DCKW`, `ACKW`, `KWHKWP`)
- select `powerStationID`, a.`INVERTERID`, a.`reportDate`, `AC1V`, `AC1A`, `AC1W`, `AC1F`, `AC1WH`, `AC2V`, `AC2A`, `AC2W`, `AC2F`, `AC2WH`, `AC3V`, `AC3A`, `AC3W`, `AC3F`, `AC3WH`, `DC1V`, `DC1A`, `DC1W`, `DC1WH`, `DC2V`, `DC2A`, `DC2W`, `DC2WH`, `DC3V`, `DC3A`, `DC3W`, `DC3WH`, `DC4V`, `DC4A`, `DC4W`, `DC4WH`, `DC5V`, `DC5A`, `DC5W`, `DC5WH`, `RA1`, `RA2`, `RA3`, `RA4`, `RA5`, `KWH`, `TODAYKWH`, `TOTALKWH`, `irr`, inv_pr.`PR`, `DCKW`, `ACKW`, `KWHKWP`
- from Inv_day_" + _powerStationID + @"_s2 a left JOIN( -- 取得整點值PR
- SELECT concat(left(crdTime, 13), ':00:00') AS reportDate, inv.INVERTERID, inv.PR
- FROM Inv_day_" + _powerStationID + @"_s1 inv
- WHERE minute(crdtime) = '55'
- GROUP BY left(crdTime, 13), inv.INVERTERID
- ) inv_pr
- ON a.reportDate = inv_pr.reportDate AND a.INVERTERID = inv_pr.INVERTERID;";
- ct = conn.Execute(sql, new { date1 = _date1 });
- if (_logger != null)
- _logger.LogInformation("【ProcInvSvc】執行完成[{0}]在{1}逆變器hour補償", _siteID, _date1);
- }
catch (Exception ex)
{
if (_logger != null)
@@ -538,6 +547,7 @@ ALTER TABLE `temp_invDay{_powerStationID}_s1` ADD INDEX `temp_indexs1` (report_d
#endregion
#region 先新增 inv_no01
+ string inv01 = _siteID01 + "0001";
sql = @$"
insert report_invday(`report_date`, `PowerStationID`, inv_01, `hourKWH`, `hourKWHp`, `irradiance`, `temperature`, `hourmoney`, `pr`, createTime)
select a.report_date, a.powerstationId , ifnull(round(a.kwh, 6), 0) inv_01, ifnull(b.KWH, 0) hourKWH,
@@ -545,7 +555,7 @@ select a.report_date, a.powerstationId , ifnull(round(a.kwh, 6), 0) inv_01, ifn
WHERE DATE_FORMAT(TIMESTAMP,'%Y-%m-%d') = '{_date1}' and powerstationid = {_powerStationID} ))*100,2)
, 0) 'hourKWHp', ifnull(d.irradiance, 0) 'irradiance', ifnull(d.Temperature, 0) 'temperature',
ifnull(b.money, 0) 'hourmoney', ifnull(round(b.PR, 2), 0) as pr, now() createTime
-from temp_invDay{_powerStationID}_s1 a left join
+from temp_invDay{_powerStationID}_s1 a join
( # 每小時加總 inv
select powerStationid, `TIMESTAMP` report_date, siteid, sitetype, round(KWH, 2) KWH,
round(TODAYKWH, 2) TODAYKWH,round(KWHKWP, 2) KWHKWP, round(PR, 2) PR, round(money, 2) money
@@ -559,7 +569,7 @@ from temp_invDay{_powerStationID}_s1 a left join
from sensor_history_hour
where powerstationid = {_powerStationID} and left(`TIMESTAMP`,10) = '{_date1}'
) d on a.powerStationid = d.powerStationid and a.`report_date` = d.report_date
- where right(a.inverterid, 4) = '0001'
+ where a.inverterid = '{inv01}' # right(a.inverterid, 4) = '0001'
GROUP BY left(a.report_date, 13)
order by a.report_date ;";
conn.Execute(sql);
diff --git a/solarApp/Service/procSensorSvc.cs b/solarApp/Service/procSensorSvc.cs
index 3a3e660..f591f3a 100644
--- a/solarApp/Service/procSensorSvc.cs
+++ b/solarApp/Service/procSensorSvc.cs
@@ -242,7 +242,7 @@ namespace solarApp.Service
select a.powerstationID, a.reportdate, ifnull(b.Irradiance, 0) irrAvg, a.Temperature, a.envTemperature, a.humidity, a.Vane, a.Dust, a.WingDirection, a.irrDay from
(
select powerStationID , concat(DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d'), ' 00:00') reportdate, round(avg(Temperature), 6) Temperature,
- envTemperature, humidity, Vane, Dust, WingDirection, irrDay
+ envTemperature, humidity, Vane, Dust, avg(WingDirection) WingDirection, max(irrDay) irrDay
from solar_master.sensor_history_hour
where powerstationID = @powerstationID and DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d') = @date1
group by DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d')
@@ -266,7 +266,7 @@ namespace solarApp.Service
select a.powerstationID, a.reportdate, ifnull(b.Irradiance, 0) irrAvg, a.Temperature, a.envTemperature, a.humidity, a.Vane, a.Dust, WingDirection, irrDay from
(
select powerStationID , concat(DATE_FORMAT(`TIMESTAMP`,'%Y-%m'), '-01 00:00') reportdate, round(avg(Temperature), 6) Temperature,
- envTemperature, humidity, Vane, Dust, WingDirection, irrDay
+ avg(envTemperature) envTemperature, avg(humidity) humidity, avg(Vane) Vane, avg(Dust) Dust, avg(WingDirection) WingDirection, max(irrDay) irrDay
from solar_master.sensor_history_day
where powerstationID = @powerstationID and DATE_FORMAT(`TIMESTAMP`,'%Y-%m') = @date1
group by DATE_FORMAT(`TIMESTAMP`,'%Y-%m')
diff --git a/solarApp/Service/procStationSvc.cs b/solarApp/Service/procStationSvc.cs
index 3f8c23d..ca20833 100644
--- a/solarApp/Service/procStationSvc.cs
+++ b/solarApp/Service/procStationSvc.cs
@@ -195,7 +195,7 @@ namespace solarApp.Service
sql = @" INSERT INTO solar_master.power_station_history_day( PowerStationId, `TIMESTAMP`, SITEID, SITETYPE, TODAYKWH, TOTALKWH, KWHKWP,
PR, MP, SOLARHOUR, MONEY, TOTALMONEY, CARBON, TOTALCARBON)
- select b.id PowerStationId, a.reportdate, b.siteID, a.siteType, a.TODAYKWH, a.TOTALKWH, a.KWHKWP, a.PR, a.MP, a.SOLARHOUR,
+ select b.id PowerStationId, a.reportdate, b.siteID, a.siteType, a.TODAYKWH, a.TOTALKWH, a.KWHKWP, a1.PR, a.MP, a.SOLARHOUR,
/*CASE
WHEN b.SolarType = 1 THEN a.KWH * PowerRate * c.LeaseRate
ELSE a.KWH * PowerRate
@@ -211,11 +211,18 @@ namespace solarApp.Service
(
select concat(DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d'), ' 00:00:00') reportdate, siteid, siteType, round((sum(KWH)), 6) KWH,
round((max(TODAYKWH)), 6) TODAYKWH, round((max(TOTALKWH)), 6) TOTALKWH, round((max(KWHKWP)), 6) KWHKWP,
- round((max(PR)), 6) PR, round((max(MP)), 6) as MP, round((max(SOLARHOUR)), 6) SOLARHOUR
+ #round((max(PR)), 6) PR,
+ round((max(MP)), 6) as MP, round((max(SOLARHOUR)), 6) SOLARHOUR
from solar_master.power_station_history_hour a
where SITEID = @siteID and DATE_FORMAT(a.`TIMESTAMP`,'%Y-%m-%d') = @date1
group by a.siteid, DATE_FORMAT(`TIMESTAMP`,'%Y-%m-%d')
)a join
+ (
+ select id, SITEID, round(PR, 4) PR
+ from solar_master.power_station_history_hour a
+ where SITEID = @siteID and DATE_FORMAT(a.`TIMESTAMP`,'%Y-%m-%d') = @date1
+ order by 1 desc limit 1
+ )a1 on a.siteID = a1.siteID join
(
select id, `code` siteID, PowerRate, (select `value` from solar_master.`variable` where `name` = 'CarbonRate') as CarbonRate, SolarType
from solar_master.power_station