diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index 746f63e..f79f77f 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -7,7 +7,7 @@
{F9A73B92-70CF-4F91-B58B-E461A180A75C}
WinExe
Casic.Birmm.RbFreqStandMeasure
- RbFreqStandMeasure
+ RbFreqStandMeasure1
v4.0
512
true
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index 746f63e..f79f77f 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -7,7 +7,7 @@
{F9A73B92-70CF-4F91-B58B-E461A180A75C}
WinExe
Casic.Birmm.RbFreqStandMeasure
- RbFreqStandMeasure
+ RbFreqStandMeasure1
v4.0
512
true
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
new file mode 100644
index 0000000..f17856a
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
Binary files differ
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index 746f63e..f79f77f 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -7,7 +7,7 @@
{F9A73B92-70CF-4F91-B58B-E461A180A75C}
WinExe
Casic.Birmm.RbFreqStandMeasure
- RbFreqStandMeasure
+ RbFreqStandMeasure1
v4.0
512
true
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
new file mode 100644
index 0000000..f17856a
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
Binary files differ
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
new file mode 100644
index 0000000..9402b9e
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index 746f63e..f79f77f 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -7,7 +7,7 @@
{F9A73B92-70CF-4F91-B58B-E461A180A75C}
WinExe
Casic.Birmm.RbFreqStandMeasure
- RbFreqStandMeasure
+ RbFreqStandMeasure1
v4.0
512
true
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
new file mode 100644
index 0000000..f17856a
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
Binary files differ
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
new file mode 100644
index 0000000..9402b9e
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
index 8bf08b3..92c3de1 100644
--- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs
+++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
@@ -144,8 +144,8 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "描述",
- Location = new Point(226, 0),
- Size = new Size(100, 50)
+ Location = new Point(242, 0),
+ Size = new Size(50, 50)
};
dataGridView_CounterResult.Controls.Add(colDevPort);
colDevPort.BringToFront();
@@ -159,7 +159,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "输出频率",
- Location = new Point(300, 0),
+ Location = new Point(285, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colStdValue);
@@ -174,7 +174,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "测量频率",
- Location = new Point(385, 0),
+ Location = new Point(377, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colValue);
@@ -188,9 +188,9 @@
TextAlign = ContentAlignment.MiddleCenter,
BackColor = titleBackColor,
AutoSize = false,
- Text = "灵敏度",
+ Text = "灵敏度(Vpp)",
Location = new Point(485, 0),
- Size = new Size(75, 50)
+ Size = new Size(95, 50)
};
dataGridView_CounterResult.Controls.Add(colSensitivity);
colSensitivity.BringToFront();
@@ -247,7 +247,7 @@
devCode = list[0].DevCode;
}
- string type = textBox_detecModel.Text.Equals("周期测量") ? "1" : "2";
+ string type = textBox_detecModel.Text.Equals("频率测量") ? "1" : "2";
//查询历史检测数据
List counterDataList = counterDataService.getHistory(deviceId, "", type);
if (null != counterDataList && counterDataList.Count > 0)
@@ -290,9 +290,9 @@
dataGridView_CounterResult.Columns[0].Width = 50;
dataGridView_CounterResult.Columns[1].Width = 95;
dataGridView_CounterResult.Columns[2].Width = 95;
- dataGridView_CounterResult.Columns[3].Width = 70;
+ dataGridView_CounterResult.Columns[3].Width = 50;
dataGridView_CounterResult.Columns[4].Width = 85;
- dataGridView_CounterResult.Columns[5].Width = 85;
+ dataGridView_CounterResult.Columns[5].Width = 105;
dataGridView_CounterResult.Columns[6].Width = 85;
dataGridView_CounterResult.Columns[7].Width = 129;
@@ -392,7 +392,6 @@
MessageBox.Show("删除成功", "提示");
LoadCounterDetecInitList();
- updateDatabase();
}
}
@@ -544,6 +543,7 @@
isDetecting = true;
btn_add.Enabled = false;
benDelete.Enabled = false;
+ btn_dropDetecModel.Enabled = false;
string[] ids = gPIBService.getId();
//string[] ips = tcpService.getId();
if (ids != null && ids.Length > 0)
@@ -610,7 +610,7 @@
btnStart.Enabled = false;
btn_dropDetecModel.Enabled = false;
textBox_detecModel.ReadOnly = true;
-
+ btn_dropDetecModel.Enabled = true;
SetDevTestDlg.inDetecCounterId = deviceId;
string type = textBox_detecModel.Text.Equals("频率测量") ? "freq" : "period";
string typeId = type.Equals("freq") ? "1" : "2";
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index 746f63e..f79f77f 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -7,7 +7,7 @@
{F9A73B92-70CF-4F91-B58B-E461A180A75C}
WinExe
Casic.Birmm.RbFreqStandMeasure
- RbFreqStandMeasure
+ RbFreqStandMeasure1
v4.0
512
true
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
new file mode 100644
index 0000000..f17856a
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
Binary files differ
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
new file mode 100644
index 0000000..9402b9e
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
index 8bf08b3..92c3de1 100644
--- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs
+++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
@@ -144,8 +144,8 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "描述",
- Location = new Point(226, 0),
- Size = new Size(100, 50)
+ Location = new Point(242, 0),
+ Size = new Size(50, 50)
};
dataGridView_CounterResult.Controls.Add(colDevPort);
colDevPort.BringToFront();
@@ -159,7 +159,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "输出频率",
- Location = new Point(300, 0),
+ Location = new Point(285, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colStdValue);
@@ -174,7 +174,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "测量频率",
- Location = new Point(385, 0),
+ Location = new Point(377, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colValue);
@@ -188,9 +188,9 @@
TextAlign = ContentAlignment.MiddleCenter,
BackColor = titleBackColor,
AutoSize = false,
- Text = "灵敏度",
+ Text = "灵敏度(Vpp)",
Location = new Point(485, 0),
- Size = new Size(75, 50)
+ Size = new Size(95, 50)
};
dataGridView_CounterResult.Controls.Add(colSensitivity);
colSensitivity.BringToFront();
@@ -247,7 +247,7 @@
devCode = list[0].DevCode;
}
- string type = textBox_detecModel.Text.Equals("周期测量") ? "1" : "2";
+ string type = textBox_detecModel.Text.Equals("频率测量") ? "1" : "2";
//查询历史检测数据
List counterDataList = counterDataService.getHistory(deviceId, "", type);
if (null != counterDataList && counterDataList.Count > 0)
@@ -290,9 +290,9 @@
dataGridView_CounterResult.Columns[0].Width = 50;
dataGridView_CounterResult.Columns[1].Width = 95;
dataGridView_CounterResult.Columns[2].Width = 95;
- dataGridView_CounterResult.Columns[3].Width = 70;
+ dataGridView_CounterResult.Columns[3].Width = 50;
dataGridView_CounterResult.Columns[4].Width = 85;
- dataGridView_CounterResult.Columns[5].Width = 85;
+ dataGridView_CounterResult.Columns[5].Width = 105;
dataGridView_CounterResult.Columns[6].Width = 85;
dataGridView_CounterResult.Columns[7].Width = 129;
@@ -392,7 +392,6 @@
MessageBox.Show("删除成功", "提示");
LoadCounterDetecInitList();
- updateDatabase();
}
}
@@ -544,6 +543,7 @@
isDetecting = true;
btn_add.Enabled = false;
benDelete.Enabled = false;
+ btn_dropDetecModel.Enabled = false;
string[] ids = gPIBService.getId();
//string[] ips = tcpService.getId();
if (ids != null && ids.Length > 0)
@@ -610,7 +610,7 @@
btnStart.Enabled = false;
btn_dropDetecModel.Enabled = false;
textBox_detecModel.ReadOnly = true;
-
+ btn_dropDetecModel.Enabled = true;
SetDevTestDlg.inDetecCounterId = deviceId;
string type = textBox_detecModel.Text.Equals("频率测量") ? "freq" : "period";
string typeId = type.Equals("freq") ? "1" : "2";
diff --git a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
index d3e6480..e73e0df 100644
--- a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
+++ b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
@@ -485,7 +485,7 @@
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(64, 30);
this.label11.TabIndex = 16;
- this.label11.Text = "VRMS";
+ this.label11.Text = "Vpp";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label10
@@ -496,7 +496,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(65, 30);
this.label10.TabIndex = 15;
- this.label10.Text = "VRMS";
+ this.label10.Text = "Vpp";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label9
@@ -559,7 +559,7 @@
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(64, 30);
this.label6.TabIndex = 10;
- this.label6.Text = "VRMS";
+ this.label6.Text = "Vpp";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label7
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index 746f63e..f79f77f 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -7,7 +7,7 @@
{F9A73B92-70CF-4F91-B58B-E461A180A75C}
WinExe
Casic.Birmm.RbFreqStandMeasure
- RbFreqStandMeasure
+ RbFreqStandMeasure1
v4.0
512
true
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
new file mode 100644
index 0000000..f17856a
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
Binary files differ
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
new file mode 100644
index 0000000..9402b9e
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
index 8bf08b3..92c3de1 100644
--- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs
+++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
@@ -144,8 +144,8 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "描述",
- Location = new Point(226, 0),
- Size = new Size(100, 50)
+ Location = new Point(242, 0),
+ Size = new Size(50, 50)
};
dataGridView_CounterResult.Controls.Add(colDevPort);
colDevPort.BringToFront();
@@ -159,7 +159,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "输出频率",
- Location = new Point(300, 0),
+ Location = new Point(285, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colStdValue);
@@ -174,7 +174,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "测量频率",
- Location = new Point(385, 0),
+ Location = new Point(377, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colValue);
@@ -188,9 +188,9 @@
TextAlign = ContentAlignment.MiddleCenter,
BackColor = titleBackColor,
AutoSize = false,
- Text = "灵敏度",
+ Text = "灵敏度(Vpp)",
Location = new Point(485, 0),
- Size = new Size(75, 50)
+ Size = new Size(95, 50)
};
dataGridView_CounterResult.Controls.Add(colSensitivity);
colSensitivity.BringToFront();
@@ -247,7 +247,7 @@
devCode = list[0].DevCode;
}
- string type = textBox_detecModel.Text.Equals("周期测量") ? "1" : "2";
+ string type = textBox_detecModel.Text.Equals("频率测量") ? "1" : "2";
//查询历史检测数据
List counterDataList = counterDataService.getHistory(deviceId, "", type);
if (null != counterDataList && counterDataList.Count > 0)
@@ -290,9 +290,9 @@
dataGridView_CounterResult.Columns[0].Width = 50;
dataGridView_CounterResult.Columns[1].Width = 95;
dataGridView_CounterResult.Columns[2].Width = 95;
- dataGridView_CounterResult.Columns[3].Width = 70;
+ dataGridView_CounterResult.Columns[3].Width = 50;
dataGridView_CounterResult.Columns[4].Width = 85;
- dataGridView_CounterResult.Columns[5].Width = 85;
+ dataGridView_CounterResult.Columns[5].Width = 105;
dataGridView_CounterResult.Columns[6].Width = 85;
dataGridView_CounterResult.Columns[7].Width = 129;
@@ -392,7 +392,6 @@
MessageBox.Show("删除成功", "提示");
LoadCounterDetecInitList();
- updateDatabase();
}
}
@@ -544,6 +543,7 @@
isDetecting = true;
btn_add.Enabled = false;
benDelete.Enabled = false;
+ btn_dropDetecModel.Enabled = false;
string[] ids = gPIBService.getId();
//string[] ips = tcpService.getId();
if (ids != null && ids.Length > 0)
@@ -610,7 +610,7 @@
btnStart.Enabled = false;
btn_dropDetecModel.Enabled = false;
textBox_detecModel.ReadOnly = true;
-
+ btn_dropDetecModel.Enabled = true;
SetDevTestDlg.inDetecCounterId = deviceId;
string type = textBox_detecModel.Text.Equals("频率测量") ? "freq" : "period";
string typeId = type.Equals("freq") ? "1" : "2";
diff --git a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
index d3e6480..e73e0df 100644
--- a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
+++ b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
@@ -485,7 +485,7 @@
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(64, 30);
this.label11.TabIndex = 16;
- this.label11.Text = "VRMS";
+ this.label11.Text = "Vpp";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label10
@@ -496,7 +496,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(65, 30);
this.label10.TabIndex = 15;
- this.label10.Text = "VRMS";
+ this.label10.Text = "Vpp";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label9
@@ -559,7 +559,7 @@
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(64, 30);
this.label6.TabIndex = 10;
- this.label6.Text = "VRMS";
+ this.label6.Text = "Vpp";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label7
diff --git a/RbFreqStandMeasure/status/StatusCtrlForm.cs b/RbFreqStandMeasure/status/StatusCtrlForm.cs
index 483fc5a..93c08dc 100644
--- a/RbFreqStandMeasure/status/StatusCtrlForm.cs
+++ b/RbFreqStandMeasure/status/StatusCtrlForm.cs
@@ -76,10 +76,13 @@
Invoke(new MethodInvoker(delegate ()
{
- panelSite.Controls.Clear();
- coo = new Coordinate();
- panelSite.Controls.Add(coo);
- coo.Show();
+ Graphics gp = panelSite.CreateGraphics();
+ gp.Clear(panelSite.BackColor);
+ gp.Dispose();
+ //panelSite.Controls.Clear();
+ //coo = new Coordinate();
+ //panelSite.Controls.Add(coo);
+ //coo.Show();
drawFunc(bdList);
drawFunc(gpList);
}
@@ -102,7 +105,7 @@
{
if (gvsList.Count > 0)
{
- Graphics gp = coo.CreateGraphics();
+ Graphics gp = panelSite.CreateGraphics();
gp.SmoothingMode = SmoothingMode.HighQuality;
int gpCount = 0;
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
index 94ad90e..52b36f8 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDataServiceImpl.cs
@@ -30,50 +30,54 @@
}
}
//先查询是否有历史数据
- string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = " + outValue;
+ string sQry = "select ID from r_counter_data where DEVICE_ID=" + deviceId + " and OUT_VALUE = '" + outValue + "'";
MySqlCommand cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
MySqlDataReader aReader = cmd.ExecuteReader();
if (aReader.Read())
{
dataId = Convert.ToInt64(aReader.GetString(0));
-
- sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
+ aReader.Close();
+ sQry = "update r_counter_data set VALUE=@VALUE, SENSITIVITY=@SENSITIVITY, LOG_TIME=@LOG_TIME, DETEC_TYPE=@DETEC_TYPE " +
" where ID="+ dataId;
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
+
}
else
{
+ aReader.Close();
+
sQry = "INSERT INTO r_counter_data (DEVICE_ID, OUT_VALUE, VALUE, SENSITIVITY, LOG_TIME, DETEC_TYPE)" +
"values(@DEVICE_ID,@OUT_VALUE,@VALUE,@SENSITIVITY,@LOG_TIME,@DETEC_TYPE)";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
cmd.Parameters.Add("@DEVICE_ID", MySqlDbType.Int64, 20).Value = deviceId;
cmd.Parameters.Add("@OUT_VALUE", MySqlDbType.String, 255).Value = outValue;
- cmd.Parameters.Add("@VALUE", MySqlDbType.String, 0).Value = value;
- cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 0).Value = sensitivity;
- cmd.Parameters.Add("@LOG_TIME", MySqlDbType.DateTime, 0).Value = logTime;
- cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.DateTime, 0).Value = detecType;
+ cmd.Parameters.Add("@VALUE", MySqlDbType.String, 255).Value = value;
+ cmd.Parameters.Add("@SENSITIVITY", MySqlDbType.String, 255).Value = sensitivity;
+ cmd.Parameters.Add("@LOG_TIME", MySqlDbType.String, 20).Value = logTime;
+ cmd.Parameters.Add("@DETEC_TYPE", MySqlDbType.String, 5).Value = detecType;
cmd.ExecuteNonQuery();
sQry = "SELECT max(ID) from r_counter_data";
cmd = new MySqlCommand(sQry, DbConnectService.mySqlConnect);
+
+ aReader = cmd.ExecuteReader();
+
+ if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
+
- using ( aReader = cmd.ExecuteReader())
- {
- if (aReader.Read()) dataId = Convert.ToInt64(aReader.GetString(0));
- }
- }
-
+ }
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
@@ -210,7 +214,7 @@
{
if (DbConnectService.mySqlConnect.State == ConnectionState.Closed)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : 数据库链接断开");
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : 数据库链接断开");
iRetval = DbConnectService.openDb();
if (iRetval != 0)
{
@@ -235,7 +239,7 @@
}
catch (MySqlException ex)
{
- LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "addCounterParam : " + ex.Message);
+ LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "deleteCounter : " + ex.Message);
iRetval = -1;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
index f807b5c..6795325 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterDetecInitServiceImpl.cs
@@ -97,6 +97,7 @@
cmd.ExecuteNonQuery();
}
+ aReader.Close();
cmd.Dispose();
iRetval = 0;
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
index 6a29597..97b06ba 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/CounterParamServiceImpl.cs
@@ -91,7 +91,7 @@
counterParam.SignalSourceIp = aReader.GetString(4);
}
}
-
+ aReader.Close();
cmd.Dispose();
}
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
index 917870b..118a766 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DeviceServiceImpl.cs
@@ -199,7 +199,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(6)) deviceDto.CustomerName = aReader.GetString(6);
@@ -207,7 +206,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(7);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -217,6 +215,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -264,7 +270,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3);
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4);
if (!aReader.IsDBNull(5)) deviceDto.CustomerName = aReader.GetString(6);
@@ -272,7 +277,6 @@
if (!aReader.IsDBNull(7))
{
deviceDto.StatusId = aReader.GetString(8);
- deviceDto.StatusName = dictService.getNameByCode("devStatus", aReader.GetString(8));
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -282,6 +286,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -346,7 +358,6 @@
if (!aReader.IsDBNull(3))
{
deviceDto.DevTypeId = aReader.GetString(3); // devType
- deviceDto.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceDto.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -359,7 +370,6 @@
if (!aReader.IsDBNull(8))
{
deviceDto.StatusId = aReader.GetString(8); // devStatus
- deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
}
if (!aReader.IsDBNull(9)) deviceDto.Channel = aReader.GetString(9);
@@ -369,6 +379,14 @@
aCommand.Dispose();
}
+ if (deviceDtoList.Count > 0)
+ {
+ foreach (DeviceDto deviceDto in deviceDtoList)
+ {
+ deviceDto.DevTypeName = dictService.getNameByCode("devType", deviceDto.DevTypeId);
+ deviceDto.StatusName = dictService.getNameByCode("devStatus", deviceDto.StatusId);
+ }
+ }
}
catch (MySqlException ex)
{
@@ -479,7 +497,7 @@
if (!aReader.IsDBNull(3))
{
deviceView.DevTypeId = aReader.GetString(3); // devType
- deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
+ //deviceView.DevTypeName = dictService.getNameByCode("devType", aReader.GetString(3));
}
if (!aReader.IsDBNull(4)) deviceView.DevModel = aReader.GetString(4); // devModel
if (!aReader.IsDBNull(5))
@@ -512,6 +530,14 @@
aCommand.Dispose();
}
}
+
+ if (deviceViewList.Count > 0)
+ {
+ foreach (DeviceView deviceView in deviceViewList)
+ {
+ deviceView.DevTypeName = dictService.getNameByCode("devType", deviceView.DevTypeId);
+ }
+ }
}
catch (Exception ex)
{
diff --git a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
index 9d7782f..ff6a679 100644
--- a/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
+++ b/RbFreqStandMeasure/R_DataBase/Service/Impl/DictServiceImpl.cs
@@ -45,6 +45,7 @@
}
aReader.Close();
+
cmd.Dispose();
return name;
}
@@ -103,7 +104,6 @@
}
finally
{
-
}
return nameList;
diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
index 746f63e..f79f77f 100644
--- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj
+++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj
@@ -7,7 +7,7 @@
{F9A73B92-70CF-4F91-B58B-E461A180A75C}
WinExe
Casic.Birmm.RbFreqStandMeasure
- RbFreqStandMeasure
+ RbFreqStandMeasure1
v4.0
512
true
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
new file mode 100644
index 0000000..f17856a
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe
Binary files differ
diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
new file mode 100644
index 0000000..9402b9e
--- /dev/null
+++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
index 8bf08b3..92c3de1 100644
--- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs
+++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs
@@ -144,8 +144,8 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "描述",
- Location = new Point(226, 0),
- Size = new Size(100, 50)
+ Location = new Point(242, 0),
+ Size = new Size(50, 50)
};
dataGridView_CounterResult.Controls.Add(colDevPort);
colDevPort.BringToFront();
@@ -159,7 +159,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "输出频率",
- Location = new Point(300, 0),
+ Location = new Point(285, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colStdValue);
@@ -174,7 +174,7 @@
BackColor = titleBackColor,
AutoSize = false,
Text = "测量频率",
- Location = new Point(385, 0),
+ Location = new Point(377, 0),
Size = new Size(100, 50)
};
dataGridView_CounterResult.Controls.Add(colValue);
@@ -188,9 +188,9 @@
TextAlign = ContentAlignment.MiddleCenter,
BackColor = titleBackColor,
AutoSize = false,
- Text = "灵敏度",
+ Text = "灵敏度(Vpp)",
Location = new Point(485, 0),
- Size = new Size(75, 50)
+ Size = new Size(95, 50)
};
dataGridView_CounterResult.Controls.Add(colSensitivity);
colSensitivity.BringToFront();
@@ -247,7 +247,7 @@
devCode = list[0].DevCode;
}
- string type = textBox_detecModel.Text.Equals("周期测量") ? "1" : "2";
+ string type = textBox_detecModel.Text.Equals("频率测量") ? "1" : "2";
//查询历史检测数据
List counterDataList = counterDataService.getHistory(deviceId, "", type);
if (null != counterDataList && counterDataList.Count > 0)
@@ -290,9 +290,9 @@
dataGridView_CounterResult.Columns[0].Width = 50;
dataGridView_CounterResult.Columns[1].Width = 95;
dataGridView_CounterResult.Columns[2].Width = 95;
- dataGridView_CounterResult.Columns[3].Width = 70;
+ dataGridView_CounterResult.Columns[3].Width = 50;
dataGridView_CounterResult.Columns[4].Width = 85;
- dataGridView_CounterResult.Columns[5].Width = 85;
+ dataGridView_CounterResult.Columns[5].Width = 105;
dataGridView_CounterResult.Columns[6].Width = 85;
dataGridView_CounterResult.Columns[7].Width = 129;
@@ -392,7 +392,6 @@
MessageBox.Show("删除成功", "提示");
LoadCounterDetecInitList();
- updateDatabase();
}
}
@@ -544,6 +543,7 @@
isDetecting = true;
btn_add.Enabled = false;
benDelete.Enabled = false;
+ btn_dropDetecModel.Enabled = false;
string[] ids = gPIBService.getId();
//string[] ips = tcpService.getId();
if (ids != null && ids.Length > 0)
@@ -610,7 +610,7 @@
btnStart.Enabled = false;
btn_dropDetecModel.Enabled = false;
textBox_detecModel.ReadOnly = true;
-
+ btn_dropDetecModel.Enabled = true;
SetDevTestDlg.inDetecCounterId = deviceId;
string type = textBox_detecModel.Text.Equals("频率测量") ? "freq" : "period";
string typeId = type.Equals("freq") ? "1" : "2";
diff --git a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
index d3e6480..e73e0df 100644
--- a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
+++ b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs
@@ -485,7 +485,7 @@
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(64, 30);
this.label11.TabIndex = 16;
- this.label11.Text = "VRMS";
+ this.label11.Text = "Vpp";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label10
@@ -496,7 +496,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(65, 30);
this.label10.TabIndex = 15;
- this.label10.Text = "VRMS";
+ this.label10.Text = "Vpp";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label9
@@ -559,7 +559,7 @@
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(64, 30);
this.label6.TabIndex = 10;
- this.label6.Text = "VRMS";
+ this.label6.Text = "Vpp";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label7
diff --git a/RbFreqStandMeasure/status/StatusCtrlForm.cs b/RbFreqStandMeasure/status/StatusCtrlForm.cs
index 483fc5a..93c08dc 100644
--- a/RbFreqStandMeasure/status/StatusCtrlForm.cs
+++ b/RbFreqStandMeasure/status/StatusCtrlForm.cs
@@ -76,10 +76,13 @@
Invoke(new MethodInvoker(delegate ()
{
- panelSite.Controls.Clear();
- coo = new Coordinate();
- panelSite.Controls.Add(coo);
- coo.Show();
+ Graphics gp = panelSite.CreateGraphics();
+ gp.Clear(panelSite.BackColor);
+ gp.Dispose();
+ //panelSite.Controls.Clear();
+ //coo = new Coordinate();
+ //panelSite.Controls.Add(coo);
+ //coo.Show();
drawFunc(bdList);
drawFunc(gpList);
}
@@ -102,7 +105,7 @@
{
if (gvsList.Count > 0)
{
- Graphics gp = coo.CreateGraphics();
+ Graphics gp = panelSite.CreateGraphics();
gp.SmoothingMode = SmoothingMode.HighQuality;
int gpCount = 0;
diff --git a/RbFreqStandMeasure/tools/FreshStatus.cs b/RbFreqStandMeasure/tools/FreshStatus.cs
index 0b2f119..9f36899 100644
--- a/RbFreqStandMeasure/tools/FreshStatus.cs
+++ b/RbFreqStandMeasure/tools/FreshStatus.cs
@@ -191,8 +191,9 @@
}
LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "清空清空清空 : " + dataArray.Length);
int index = -1;
- bool gpdrawed = false;
- bool bddrawed = false;
+ bool drawed = false;
+ bool gga = false;
+ bool rmc = false;
foreach (string sss in dataArray)
{
index++;
@@ -203,8 +204,7 @@
string[] resultArray = sss.Split(',');
if (resultArray.Length > 5)
{
- LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "resultArray.Length : " + resultArray.Length);
-
+ gga = true;
try
{
lat = resultArray[2].Replace(".", "").Insert(2, ".") + resultArray[3];
@@ -235,7 +235,8 @@
{
string[] resultArray = sss.Split(',');
if (resultArray.Length > 9)
- {
+ {
+ rmc = true;
date = resultArray[9];
mjd = "";
if (date.Length > 5)
@@ -307,15 +308,14 @@
}
}
LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "gpList.Count : " + gpList.Count);
- LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "gpMessCount : " + gpMessCount);
+ LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "共有 : " + gpMessCount);
LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "bdList.Count : " + bdList.Count);
- LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "bdMessCount : " + bdMessCount);
+ LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "共有 : " + bdMessCount);
- if ((gpList.Count>0 &&gpList.Count == gpMessCount) || (bdList.Count>0) && bdList.Count == bdMessCount)
+ if ((gpList.Count>0 &&gpList.Count == gpMessCount) && (bdList.Count>0) && bdList.Count == bdMessCount)
{
- if (gpList.Count == gpMessCount) gpdrawed = true;
- if (bdList.Count == bdMessCount) bddrawed = true;
- if (!gpdrawed || !bddrawed)
+ drawed = true;
+ if (!drawed)
{
try
{
@@ -336,6 +336,11 @@
}
}
+ if (drawed && gga && rmc)
+ {
+ break;
+ }
+
}
break;
}