diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 974b3b7..cca90fb 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -184,8 +184,7 @@ } if (stability.Equals("")&&stability10.Equals("") && stability20.Equals("") && stability100.Equals("") && stability1.Equals("") && accuracy.Equals("") && bootFeature.Equals("") && ageRate.Equals("")) return -1; - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "stability : "+ stability); - + string sQry = "UPDATE r_detection_item SET"; if(!stability.Equals("")) sQry = sQry + " STABILITY=@STABILITY,"; diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 974b3b7..cca90fb 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -184,8 +184,7 @@ } if (stability.Equals("")&&stability10.Equals("") && stability20.Equals("") && stability100.Equals("") && stability1.Equals("") && accuracy.Equals("") && bootFeature.Equals("") && ageRate.Equals("")) return -1; - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "stability : "+ stability); - + string sQry = "UPDATE r_detection_item SET"; if(!stability.Equals("")) sQry = sQry + " STABILITY=@STABILITY,"; diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 2fc89ad..9413e2f 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -484,35 +484,41 @@ MySqlDataAdapter adap = new MySqlDataAdapter(aCommand); DataTable dt = new DataTable(); adap.Fill(dt); + aCommand.Dispose(); + adap.Dispose(); if (dt != null && dt.Rows.Count > 0) { - DeviceView deviceView = new DeviceView(); - if(dt.Rows[0][0] != DBNull.Value) deviceView.Id = Convert.ToInt64(dt.Rows[0][0]); - if (dt.Rows[0][1] != DBNull.Value) deviceView.DevName = dt.Rows[0][1].ToString(); - if (dt.Rows[0][2] != DBNull.Value) deviceView.DevCode = dt.Rows[0][2].ToString(); - if (dt.Rows[0][3] != DBNull.Value) deviceView.DevTypeId = dt.Rows[0][3].ToString(); - if (dt.Rows[0][4] != DBNull.Value) deviceView.DevModel = dt.Rows[0][4].ToString(); - if (dt.Rows[0][5] != DBNull.Value) deviceView.RegTime = dt.Rows[0][5].ToString(); - if (dt.Rows[0][6] != DBNull.Value) deviceView.CustomerName = dt.Rows[0][6].ToString(); - if (dt.Rows[0][7] != DBNull.Value) deviceView.CustomerDev = dt.Rows[0][7].ToString(); - if (dt.Rows[0][8] != DBNull.Value) deviceView.Channel = dt.Rows[0][8].ToString(); - if (dt.Rows[0][9] != DBNull.Value) deviceView.Active = Convert.ToInt32(dt.Rows[0][9]); - if (dt.Rows[0][10] != DBNull.Value) deviceView.StartTime = Convert.ToDateTime(dt.Rows[0][10]).ToString("yyyy - MM - dd HH: mm:ss"); - if (dt.Rows[0][11] != DBNull.Value) deviceView.EndTime = Convert.ToDateTime(dt.Rows[0][11]).ToString("yyyy - MM - dd HH: mm:ss"); - if (dt.Rows[0][12] != DBNull.Value) deviceView.StatusId = dt.Rows[0][12].ToString(); - if (dt.Rows[0][13] != DBNull.Value) deviceView.Stability = dt.Rows[0][13].ToString(); - if (dt.Rows[0][14] != DBNull.Value) deviceView.Accuracy = dt.Rows[0][14].ToString(); - if (dt.Rows[0][15] != DBNull.Value) deviceView.BootFeature = dt.Rows[0][15].ToString(); - if (dt.Rows[0][16] != DBNull.Value) deviceView.AgeRate = dt.Rows[0][16].ToString(); - if (dt.Rows[0][17] != DBNull.Value) deviceView.DetectionItemId = Convert.ToInt64(dt.Rows[0][17]); + foreach (DataRow row in dt.Rows) + { + DeviceView deviceView = new DeviceView(); + if (row[0] != DBNull.Value) deviceView.Id = Convert.ToInt64(row[0]); + if (row[1] != DBNull.Value) deviceView.DevName = row[1].ToString(); + if (row[2] != DBNull.Value) deviceView.DevCode = row[2].ToString(); + if (row[3] != DBNull.Value) deviceView.DevTypeId = row[3].ToString(); + if (row[4] != DBNull.Value) deviceView.DevModel = row[4].ToString(); + if (row[5] != DBNull.Value) deviceView.RegTime = row[5].ToString(); + if (row[6] != DBNull.Value) deviceView.CustomerName = row[6].ToString(); + if (row[7] != DBNull.Value) deviceView.CustomerDev = row[7].ToString(); + if (row[8] != DBNull.Value) deviceView.Channel = row[8].ToString(); + if (row[9] != DBNull.Value) deviceView.Active = Convert.ToInt32(row[9]); + if (row[10] != DBNull.Value) deviceView.StartTime = Convert.ToDateTime(row[10]).ToString("yyyy - MM - dd HH: mm:ss"); + if (row[11] != DBNull.Value) deviceView.EndTime = Convert.ToDateTime(row[11]).ToString("yyyy - MM - dd HH: mm:ss"); + if (row[12] != DBNull.Value) deviceView.StatusId = row[12].ToString(); + if (row[13] != DBNull.Value) deviceView.Stability = row[13].ToString(); + if (row[14] != DBNull.Value) deviceView.Accuracy = row[14].ToString(); + if (row[15] != DBNull.Value) deviceView.BootFeature = row[15].ToString(); + if (row[16] != DBNull.Value) deviceView.AgeRate = row[16].ToString(); + if (row[17] != DBNull.Value) deviceView.DetectionItemId = Convert.ToInt64(row[17]); + deviceViewList.Add(deviceView); + } } //using (MySqlDataReader aReader = aCommand.ExecuteReader()) //{ // while (aReader.Read()) // { // DeviceView deviceView = new DeviceView(); - + // if (!aReader.IsDBNull(0)) deviceView.Id = Convert.ToInt64(aReader.GetString(0)); // id // if (!aReader.IsDBNull(1)) deviceView.DevName = aReader.GetString(1); // devName // if (!aReader.IsDBNull(2)) deviceView.DevCode = aReader.GetString(2); // devCode @@ -553,7 +559,7 @@ // aCommand.Dispose(); // } //} - + if (deviceViewList.Count > 0) { foreach (DeviceView deviceView in deviceViewList) @@ -564,7 +570,7 @@ } catch (Exception ex) { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getDeviceByChannel: " + ex.Message); + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getDeviceByChannel: " + ex.Message + " ; "+ ex.ToString()); deviceViewList = null; } finally diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs index 974b3b7..cca90fb 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DetectionItemServiceImpl.cs @@ -184,8 +184,7 @@ } if (stability.Equals("")&&stability10.Equals("") && stability20.Equals("") && stability100.Equals("") && stability1.Equals("") && accuracy.Equals("") && bootFeature.Equals("") && ageRate.Equals("")) return -1; - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "stability : "+ stability); - + string sQry = "UPDATE r_detection_item SET"; if(!stability.Equals("")) sQry = sQry + " STABILITY=@STABILITY,"; diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs index 2fc89ad..9413e2f 100644 --- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs +++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs @@ -484,35 +484,41 @@ MySqlDataAdapter adap = new MySqlDataAdapter(aCommand); DataTable dt = new DataTable(); adap.Fill(dt); + aCommand.Dispose(); + adap.Dispose(); if (dt != null && dt.Rows.Count > 0) { - DeviceView deviceView = new DeviceView(); - if(dt.Rows[0][0] != DBNull.Value) deviceView.Id = Convert.ToInt64(dt.Rows[0][0]); - if (dt.Rows[0][1] != DBNull.Value) deviceView.DevName = dt.Rows[0][1].ToString(); - if (dt.Rows[0][2] != DBNull.Value) deviceView.DevCode = dt.Rows[0][2].ToString(); - if (dt.Rows[0][3] != DBNull.Value) deviceView.DevTypeId = dt.Rows[0][3].ToString(); - if (dt.Rows[0][4] != DBNull.Value) deviceView.DevModel = dt.Rows[0][4].ToString(); - if (dt.Rows[0][5] != DBNull.Value) deviceView.RegTime = dt.Rows[0][5].ToString(); - if (dt.Rows[0][6] != DBNull.Value) deviceView.CustomerName = dt.Rows[0][6].ToString(); - if (dt.Rows[0][7] != DBNull.Value) deviceView.CustomerDev = dt.Rows[0][7].ToString(); - if (dt.Rows[0][8] != DBNull.Value) deviceView.Channel = dt.Rows[0][8].ToString(); - if (dt.Rows[0][9] != DBNull.Value) deviceView.Active = Convert.ToInt32(dt.Rows[0][9]); - if (dt.Rows[0][10] != DBNull.Value) deviceView.StartTime = Convert.ToDateTime(dt.Rows[0][10]).ToString("yyyy - MM - dd HH: mm:ss"); - if (dt.Rows[0][11] != DBNull.Value) deviceView.EndTime = Convert.ToDateTime(dt.Rows[0][11]).ToString("yyyy - MM - dd HH: mm:ss"); - if (dt.Rows[0][12] != DBNull.Value) deviceView.StatusId = dt.Rows[0][12].ToString(); - if (dt.Rows[0][13] != DBNull.Value) deviceView.Stability = dt.Rows[0][13].ToString(); - if (dt.Rows[0][14] != DBNull.Value) deviceView.Accuracy = dt.Rows[0][14].ToString(); - if (dt.Rows[0][15] != DBNull.Value) deviceView.BootFeature = dt.Rows[0][15].ToString(); - if (dt.Rows[0][16] != DBNull.Value) deviceView.AgeRate = dt.Rows[0][16].ToString(); - if (dt.Rows[0][17] != DBNull.Value) deviceView.DetectionItemId = Convert.ToInt64(dt.Rows[0][17]); + foreach (DataRow row in dt.Rows) + { + DeviceView deviceView = new DeviceView(); + if (row[0] != DBNull.Value) deviceView.Id = Convert.ToInt64(row[0]); + if (row[1] != DBNull.Value) deviceView.DevName = row[1].ToString(); + if (row[2] != DBNull.Value) deviceView.DevCode = row[2].ToString(); + if (row[3] != DBNull.Value) deviceView.DevTypeId = row[3].ToString(); + if (row[4] != DBNull.Value) deviceView.DevModel = row[4].ToString(); + if (row[5] != DBNull.Value) deviceView.RegTime = row[5].ToString(); + if (row[6] != DBNull.Value) deviceView.CustomerName = row[6].ToString(); + if (row[7] != DBNull.Value) deviceView.CustomerDev = row[7].ToString(); + if (row[8] != DBNull.Value) deviceView.Channel = row[8].ToString(); + if (row[9] != DBNull.Value) deviceView.Active = Convert.ToInt32(row[9]); + if (row[10] != DBNull.Value) deviceView.StartTime = Convert.ToDateTime(row[10]).ToString("yyyy - MM - dd HH: mm:ss"); + if (row[11] != DBNull.Value) deviceView.EndTime = Convert.ToDateTime(row[11]).ToString("yyyy - MM - dd HH: mm:ss"); + if (row[12] != DBNull.Value) deviceView.StatusId = row[12].ToString(); + if (row[13] != DBNull.Value) deviceView.Stability = row[13].ToString(); + if (row[14] != DBNull.Value) deviceView.Accuracy = row[14].ToString(); + if (row[15] != DBNull.Value) deviceView.BootFeature = row[15].ToString(); + if (row[16] != DBNull.Value) deviceView.AgeRate = row[16].ToString(); + if (row[17] != DBNull.Value) deviceView.DetectionItemId = Convert.ToInt64(row[17]); + deviceViewList.Add(deviceView); + } } //using (MySqlDataReader aReader = aCommand.ExecuteReader()) //{ // while (aReader.Read()) // { // DeviceView deviceView = new DeviceView(); - + // if (!aReader.IsDBNull(0)) deviceView.Id = Convert.ToInt64(aReader.GetString(0)); // id // if (!aReader.IsDBNull(1)) deviceView.DevName = aReader.GetString(1); // devName // if (!aReader.IsDBNull(2)) deviceView.DevCode = aReader.GetString(2); // devCode @@ -553,7 +559,7 @@ // aCommand.Dispose(); // } //} - + if (deviceViewList.Count > 0) { foreach (DeviceView deviceView in deviceViewList) @@ -564,7 +570,7 @@ } catch (Exception ex) { - LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getDeviceByChannel: " + ex.Message); + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getDeviceByChannel: " + ex.Message + " ; "+ ex.ToString()); deviceViewList = null; } finally diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 1d3a64b..70dc261 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ