Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

SolarPower/Controllers/PowerStationController.cs

@@ -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)
                     {

SolarPower/Quartz/Jobs/CalcInverter15minJob.cs

@@ -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();
 

SolarPower/Repository/Implement/PowerStationRepository.cs

@@ -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>

SolarPower/Repository/Interface/IPowerStationRepository.cs

@@ -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();
     }
 }

SolarPower/Views/StationOverview/StationOverviewInfo.cshtml

@@ -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();
             })
         }
 

SolarPower/Views/StationOverview/_History.cshtml

@@ -50,8 +50,7 @@
 
 </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>
@@ -84,7 +83,7 @@
                     <tr>
                         <th>時間</th>
                         <th>發電量(kWh)</th>
-                    <th>有效日照時數</th>
+                        <th>有效發電小時</th>
                         <th>日照度(W/m2)</th>
                         <th>PR(%)</th>
                         <th>溫度(℃)</th>
@@ -95,3 +94,5 @@
             </table>
         </div>
     </div>
+</div>
+

SolarPower/Views/StationReport/Index.cshtml

@@ -1285,11 +1285,11 @@
                 PowerStation: selecterd_invert
             }
             var url = "/StationReport/GetMaxForm";
-            var StrInfoBody;
+            var StrInfoBody = "";
             var CityArray = [];
-            var CityInfoBody;
+            var CityInfoBody = "";
-            var TotalHead;
+            var TotalHead = "";
-            var TotalBody;
+            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();
             })
         }