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

SolarPower/Quartz/Jobs/CalcPowerStationJob.cs

@@ -727,7 +727,9 @@ namespace SolarPower.Quartz.Jobs
                         "EnvTemperature",
                         "Humidity",
                         "Vane",
-                        "Dust"
+                        "Dust",
+                        "WingDirection",
+                        "IrrDay",
                     };
 
                     await powerStationRepository.AddSensorHistoryHour(sensorHistoriesHour, sensor_history_properties);

solarApp/Service/procInvSvc.cs

@@ -455,7 +455,8 @@ namespace solarApp.Service
 	                            select  DATE_FORMAT(a.TIMESTAMP, '%Y-%m-%d') AS reportDate,  Irradiance
 	                            from sensor_history_day a
 	                            where powerstationID = @powerstationID  and DATE_FORMAT(a.TIMESTAMP, '%Y-%m-%d') = @date1 and Irradiance <> 0  limit 1
-                            )irr on  a.reportDate = irr.reportDate ;";
+                            )irr on  a.reportDate = irr.reportDate 
+                            where i.enabled = 1;";
                     // conn.Execute(sql, new { date1 = _date1, PowerStationID = _powerStationID });
                             MySqlCommand cmd = new MySqlCommand();
                             cmd.Connection = conn;