diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/bin/BRServer.Model.pdb b/bin/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/bin/BRServer.Model.pdb +++ b/bin/BRServer.Model.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/bin/BRServer.Model.pdb b/bin/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/bin/BRServer.Model.pdb +++ b/bin/BRServer.Model.pdb Binary files differ diff --git a/bin/BRServer.dll b/bin/BRServer.dll index d1eb51b..daca7f0 100644 --- a/bin/BRServer.dll +++ b/bin/BRServer.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/bin/BRServer.Model.pdb b/bin/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/bin/BRServer.Model.pdb +++ b/bin/BRServer.Model.pdb Binary files differ diff --git a/bin/BRServer.dll b/bin/BRServer.dll index d1eb51b..daca7f0 100644 --- a/bin/BRServer.dll +++ b/bin/BRServer.dll Binary files differ diff --git a/bin/BRServer.pdb b/bin/BRServer.pdb index 999158c..ca3f878 100644 --- a/bin/BRServer.pdb +++ b/bin/BRServer.pdb Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/bin/BRServer.Model.pdb b/bin/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/bin/BRServer.Model.pdb +++ b/bin/BRServer.Model.pdb Binary files differ diff --git a/bin/BRServer.dll b/bin/BRServer.dll index d1eb51b..daca7f0 100644 --- a/bin/BRServer.dll +++ b/bin/BRServer.dll Binary files differ diff --git a/bin/BRServer.pdb b/bin/BRServer.pdb index 999158c..ca3f878 100644 --- a/bin/BRServer.pdb +++ b/bin/BRServer.pdb Binary files differ diff --git a/bin/BRServerTest.vshost.exe.manifest b/bin/BRServerTest.vshost.exe.manifest new file mode 100644 index 0000000..061c9ca --- /dev/null +++ b/bin/BRServerTest.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/bin/BRServer.Model.pdb b/bin/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/bin/BRServer.Model.pdb +++ b/bin/BRServer.Model.pdb Binary files differ diff --git a/bin/BRServer.dll b/bin/BRServer.dll index d1eb51b..daca7f0 100644 --- a/bin/BRServer.dll +++ b/bin/BRServer.dll Binary files differ diff --git a/bin/BRServer.pdb b/bin/BRServer.pdb index 999158c..ca3f878 100644 --- a/bin/BRServer.pdb +++ b/bin/BRServer.pdb Binary files differ diff --git a/bin/BRServerTest.vshost.exe.manifest b/bin/BRServerTest.vshost.exe.manifest new file mode 100644 index 0000000..061c9ca --- /dev/null +++ b/bin/BRServerTest.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bin/Logs/debug.log b/bin/Logs/debug.log index 6257246..fe6ee67 100644 --- a/bin/Logs/debug.log +++ b/bin/Logs/debug.log @@ -5,3 +5,10 @@ 2019-03-12 09:28:51,404 [8220] DEBUG DefaultBootstrap - The Bootstrap has been initialized! 2019-03-12 09:28:51,436 [8220] DEBUG TelecomServer - Listener (0.0.0.0:50000) was started 2019-03-12 09:28:51,441 [8220] DEBUG DefaultBootstrap - The PerformanceMonitor has been started! +2019-03-12 11:06:55,140 [9672] DEBUG DefaultBootstrap - The server instance TelecomServer has been created! +2019-03-12 11:06:55,182 [9672] DEBUG TelecomServer - The command Casic(BRServer.CasicCmd, BRServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null) has been discovered +2019-03-12 11:06:55,194 [9672] DEBUG DefaultBootstrap - The server instance TelecomServer has been initialized! +2019-03-12 11:06:58,068 [9672] DEBUG DefaultBootstrap - The PerformanceMonitor has been initialized! +2019-03-12 11:06:58,068 [9672] DEBUG DefaultBootstrap - The Bootstrap has been initialized! +2019-03-12 11:06:58,104 [9672] DEBUG TelecomServer - Listener (0.0.0.0:50000) was started +2019-03-12 11:06:58,108 [9672] DEBUG DefaultBootstrap - The PerformanceMonitor has been started! diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/bin/BRServer.Model.pdb b/bin/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/bin/BRServer.Model.pdb +++ b/bin/BRServer.Model.pdb Binary files differ diff --git a/bin/BRServer.dll b/bin/BRServer.dll index d1eb51b..daca7f0 100644 --- a/bin/BRServer.dll +++ b/bin/BRServer.dll Binary files differ diff --git a/bin/BRServer.pdb b/bin/BRServer.pdb index 999158c..ca3f878 100644 --- a/bin/BRServer.pdb +++ b/bin/BRServer.pdb Binary files differ diff --git a/bin/BRServerTest.vshost.exe.manifest b/bin/BRServerTest.vshost.exe.manifest new file mode 100644 index 0000000..061c9ca --- /dev/null +++ b/bin/BRServerTest.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bin/Logs/debug.log b/bin/Logs/debug.log index 6257246..fe6ee67 100644 --- a/bin/Logs/debug.log +++ b/bin/Logs/debug.log @@ -5,3 +5,10 @@ 2019-03-12 09:28:51,404 [8220] DEBUG DefaultBootstrap - The Bootstrap has been initialized! 2019-03-12 09:28:51,436 [8220] DEBUG TelecomServer - Listener (0.0.0.0:50000) was started 2019-03-12 09:28:51,441 [8220] DEBUG DefaultBootstrap - The PerformanceMonitor has been started! +2019-03-12 11:06:55,140 [9672] DEBUG DefaultBootstrap - The server instance TelecomServer has been created! +2019-03-12 11:06:55,182 [9672] DEBUG TelecomServer - The command Casic(BRServer.CasicCmd, BRServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null) has been discovered +2019-03-12 11:06:55,194 [9672] DEBUG DefaultBootstrap - The server instance TelecomServer has been initialized! +2019-03-12 11:06:58,068 [9672] DEBUG DefaultBootstrap - The PerformanceMonitor has been initialized! +2019-03-12 11:06:58,068 [9672] DEBUG DefaultBootstrap - The Bootstrap has been initialized! +2019-03-12 11:06:58,104 [9672] DEBUG TelecomServer - Listener (0.0.0.0:50000) was started +2019-03-12 11:06:58,108 [9672] DEBUG DefaultBootstrap - The PerformanceMonitor has been started! diff --git a/bin/Logs/info.log b/bin/Logs/info.log index c43e11c..cf9ac88 100644 --- a/bin/Logs/info.log +++ b/bin/Logs/info.log @@ -1 +1,2 @@ 2019-03-12 09:28:51,437 [8220] INFO TelecomServer - The server instance TelecomServer has been started! +2019-03-12 11:06:58,104 [9672] INFO TelecomServer - The server instance TelecomServer has been started! diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache index 64bafec..fa9500f 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.dll b/BRServer.BLL/obj/Debug/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.dll +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.dll Binary files differ diff --git a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/BRServer.BLL/obj/Debug/BRServer.BLL.pdb +++ b/BRServer.BLL/obj/Debug/BRServer.BLL.pdb Binary files differ diff --git a/BRServer.DAL/BR.cs b/BRServer.DAL/BR.cs index 5b6742b..f424477 100644 --- a/BRServer.DAL/BR.cs +++ b/BRServer.DAL/BR.cs @@ -12,35 +12,35 @@ System.Configuration.ConfigurationManager.AppSettings["MySqlConnString"]; // Static constants - private const string TABLE_NAME = "BRKKJ_DATA"; + private const string TABLE_NAME = "BRGDF_DATA"; private const string COLUMN_DEVCODE = "DEVCODE"; private const string COLUMN_LOGTIME = "LOGTIME"; private const string COLUMN_CELL = "CELL"; - private const string COLUMN_SEDIMENTATION = "SEDIMENTATION"; + private const string COLUMN_VALUE = "OPENING"; private const string COLUMN_UPTIME = "UPTIME"; private const string PARM_DEVCODE = "@DEVCODE"; private const string PARM_LOGTIME = "@LOGTIME"; private const string PARM_CELL = "@CELL"; - private const string PARM_SEDIMENTATION = "@SEDIMENTATION"; + private const string PARM_VALUE = "@OPENING"; private const string PARM_UPTIME = "@UPTIME"; private const string SQL_INSERT_CJ = "INSERT INTO " + TABLE_NAME + " (" + COLUMN_DEVCODE + "," + " " + COLUMN_LOGTIME + "," + " " + COLUMN_CELL + "," - + " " + COLUMN_SEDIMENTATION + "," + + " " + COLUMN_VALUE + "," + " " + COLUMN_UPTIME + ")" + " VALUES " + " (" + PARM_DEVCODE + "," + " " + PARM_LOGTIME + "," + " " + PARM_CELL + "," - + " " + PARM_SEDIMENTATION + "," + + " " + PARM_VALUE + "," + " " + PARM_UPTIME + ")"; - public void insert(List cjs) + public void insert(List brs) { MySqlTransaction tran = null; using (MySqlConnection conn = new MySqlConnection(ConnectionStringOrderDistributedTransaction)) @@ -50,15 +50,15 @@ conn.Open(); tran = conn.BeginTransaction(); - foreach (Model.BR cj in cjs) + foreach (Model.BR br in brs) { - if (string.IsNullOrEmpty(cj.DEVCODE)) + if (string.IsNullOrEmpty(br.DEVCODE)) { throw new Exception("设备ID为空！"); } MySqlParameter[] parms = GetAdapterParameters(); - SetAdapterParameters(parms, cj); + SetAdapterParameters(parms, br); MySqlCommand cmd = new MySqlCommand(SQL_INSERT_CJ, conn); foreach (MySqlParameter pram in parms) @@ -134,7 +134,7 @@ new MySqlParameter(PARM_DEVCODE, MySqlDbType.VarChar, 255), new MySqlParameter(PARM_LOGTIME, MySqlDbType.DateTime), new MySqlParameter(PARM_CELL, MySqlDbType.VarChar,255), - new MySqlParameter(PARM_SEDIMENTATION, MySqlDbType.Float,20), + new MySqlParameter(PARM_VALUE, MySqlDbType.Float,20), new MySqlParameter(PARM_UPTIME, MySqlDbType.DateTime) }; } @@ -148,40 +148,40 @@ /// /// Database parameters /// Values to bind to parameters - private void SetAdapterParameters(MySqlParameter[] parms, Model.BR cj) + private void SetAdapterParameters(MySqlParameter[] parms, Model.BR br) { - parms[0].Value = cj.DEVCODE; + parms[0].Value = br.DEVCODE; - if (null != cj.LOGTIME) + if (null != br.LOGTIME) { - parms[1].Value = cj.LOGTIME; + parms[1].Value = br.LOGTIME; } else { parms[1].Value = DBNull.Value; } - if (null != cj.CELL) + if (null != br.CELL) { - parms[2].Value = cj.CELL; + parms[2].Value = br.CELL; } else { parms[2].Value = DBNull.Value; } - if (null != cj.SEDIMENTATION) + if (null != br.OPENING) { - parms[3].Value = cj.SEDIMENTATION; + parms[3].Value = br.OPENING; } else { parms[3].Value = DBNull.Value; } - if (null != cj.UPTIME) + if (null != br.UPTIME) { - parms[4].Value = cj.UPTIME; + parms[4].Value = br.UPTIME; } else { diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache index 4a9e055..d8cd516 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.dll b/BRServer.DAL/obj/Debug/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.dll +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.dll Binary files differ diff --git a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/BRServer.DAL/obj/Debug/BRServer.DAL.pdb +++ b/BRServer.DAL/obj/Debug/BRServer.DAL.pdb Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache index 716d0c1..9bafb16 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.dll Binary files differ diff --git a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb +++ b/BRServer.DALFactory/obj/Debug/BRServer.DALFactory.pdb Binary files differ diff --git a/BRServer.IDAL/IBR.cs b/BRServer.IDAL/IBR.cs index 6a36b3f..9f8cf44 100644 --- a/BRServer.IDAL/IBR.cs +++ b/BRServer.IDAL/IBR.cs @@ -8,7 +8,5 @@ void insert(List djs); void updateSequence(String sequeceName); //int queryCountByDevAndUpTime(String devCode, DateTime upTime); - - //float getLastData(Model.BRKKJ tempInfo); } } diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache index 77a9cd8..930f397 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.dll Binary files differ diff --git a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb +++ b/BRServer.IDAL/obj/Debug/BRServer.IDAL.pdb Binary files differ diff --git a/BRServer.Model/BR.cs b/BRServer.Model/BR.cs index 3c71a94..9ba29ae 100644 --- a/BRServer.Model/BR.cs +++ b/BRServer.Model/BR.cs @@ -11,7 +11,7 @@ private string devCode; private DateTime logTime; private string cell; - private float sedimentation; + private float opening; private DateTime upTime; public long DBID @@ -38,10 +38,10 @@ set { cell = value; } } - public float SEDIMENTATION + public float OPENING { - get { return sedimentation; } - set { sedimentation = value; } + get { return opening; } + set { opening = value; } } public DateTime UPTIME diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt index 7803ceb..28abe26 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt +++ b/BRServer.Model/obj/Debug/BRServer.Model.csproj.FileListAbsolute.txt @@ -2,3 +2,4 @@ E:\gwq\BRServer\bin\BRServer.Model.pdb E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.dll E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.pdb +E:\gwq\BRServer\BRServer.Model\obj\Debug\BRServer.Model.csprojResolveAssemblyReference.cache diff --git a/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..3de0bd2 --- /dev/null +++ b/BRServer.Model/obj/Debug/BRServer.Model.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.dll b/BRServer.Model/obj/Debug/BRServer.Model.dll index 973712c..468d516 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.dll +++ b/BRServer.Model/obj/Debug/BRServer.Model.dll Binary files differ diff --git a/BRServer.Model/obj/Debug/BRServer.Model.pdb b/BRServer.Model/obj/Debug/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/BRServer.Model/obj/Debug/BRServer.Model.pdb +++ b/BRServer.Model/obj/Debug/BRServer.Model.pdb Binary files differ diff --git a/BRServer.suo b/BRServer.suo index 72bf124..f69c948 100644 --- a/BRServer.suo +++ b/BRServer.suo Binary files differ diff --git a/BRServer/BRTagHandler.cs b/BRServer/BRTagHandler.cs index 8428f7f..3859f60 100644 --- a/BRServer/BRTagHandler.cs +++ b/BRServer/BRTagHandler.cs @@ -13,7 +13,7 @@ UploadTag uploadTag = tag as UploadTag; - return uploadTag.BizType == 18 ? true : false;//业务类型 + return uploadTag.BizType == 19 ? true : false;//业务类型 } public override void execute(Tag tag,String devCode,CellTag cellTag, @@ -26,7 +26,7 @@ int len = BRTag.Len; String dataValue = BRTag.DataValue; - session.Logger.Info("北燃沉降监测仪数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + + session.Logger.Info("北燃轨道阀回讯装置数据上传TAG：oid：" + BRTag.Oid + " 采集间隔: " + itv + " 采集时间：" + collecTime + " 上传数值：" + dataValue); int num = len / 8; @@ -36,11 +36,11 @@ for (int i = 0; i < num; i++) { Model.BR BRInfo = new Model.BR(); - float sedimentation = strHexToSingle(dataValue.Substring(i * 8, 8)); + float opening = strHexToSingle(dataValue.Substring(i * 8, 8)); //TODO LIST:电池电量 BRInfo.CELL = (cellTag == null ? "" : cellTag.Cell); - BRInfo.SEDIMENTATION = sedimentation; + BRInfo.OPENING = opening; BRInfo.LOGTIME = DateTime.Now; BRInfo.UPTIME = baseTime.AddMinutes(i * itv); BRInfo.DEVCODE = devCode; @@ -48,7 +48,7 @@ } BLL.BR.getInstance().insert(djs); - session.Logger.Info("北燃沉降监测仪数据保存成功"); + session.Logger.Info("北燃轨道阀回讯装置数据保存成功"); } //网络序列转int diff --git a/BRServer/CasicCmd.cs b/BRServer/CasicCmd.cs index 46c321e..cb72b09 100644 --- a/BRServer/CasicCmd.cs +++ b/BRServer/CasicCmd.cs @@ -29,6 +29,9 @@ case 21: devType = "北燃沉降监测仪"; break; + case 22: + devType = "北燃轨道阀回讯装置"; + break; default: devType = "undefiend"; break; @@ -176,12 +179,6 @@ session.Logger.Info("操作类型:" + operType); session.Logger.Info("序列seq:" + seq); - if (devType != "北燃沉降监测仪") - { - session.Logger.Error("数据不是由北燃沉降监测仪上传，不作处理！"); - return; - } - List tags = this.getTags(settings, session); CellTag cellTag = this.getCellTag(tags, session); SystemDateTag systemDateTag = this.getSystemDateTag(tags); diff --git a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache index a12034b..b38312c 100644 --- a/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache +++ b/BRServer/obj/Debug/BRServer.csprojResolveAssemblyReference.cache Binary files differ diff --git a/BRServer/obj/Debug/BRServer.dll b/BRServer/obj/Debug/BRServer.dll index d1eb51b..daca7f0 100644 --- a/BRServer/obj/Debug/BRServer.dll +++ b/BRServer/obj/Debug/BRServer.dll Binary files differ diff --git a/BRServer/obj/Debug/BRServer.pdb b/BRServer/obj/Debug/BRServer.pdb index 999158c..ca3f878 100644 --- a/BRServer/obj/Debug/BRServer.pdb +++ b/BRServer/obj/Debug/BRServer.pdb Binary files differ diff --git a/bin/BRServer.BLL.dll b/bin/BRServer.BLL.dll index 273337f..55f14f3 100644 --- a/bin/BRServer.BLL.dll +++ b/bin/BRServer.BLL.dll Binary files differ diff --git a/bin/BRServer.BLL.pdb b/bin/BRServer.BLL.pdb index ac68f3f..9022850 100644 --- a/bin/BRServer.BLL.pdb +++ b/bin/BRServer.BLL.pdb Binary files differ diff --git a/bin/BRServer.DAL.dll b/bin/BRServer.DAL.dll index 59819df..9b43079 100644 --- a/bin/BRServer.DAL.dll +++ b/bin/BRServer.DAL.dll Binary files differ diff --git a/bin/BRServer.DAL.pdb b/bin/BRServer.DAL.pdb index f5a2f12..ebf2877 100644 --- a/bin/BRServer.DAL.pdb +++ b/bin/BRServer.DAL.pdb Binary files differ diff --git a/bin/BRServer.DALFactory.dll b/bin/BRServer.DALFactory.dll index b32b907..c6e5603 100644 --- a/bin/BRServer.DALFactory.dll +++ b/bin/BRServer.DALFactory.dll Binary files differ diff --git a/bin/BRServer.DALFactory.pdb b/bin/BRServer.DALFactory.pdb index d3f668a..48a571f 100644 --- a/bin/BRServer.DALFactory.pdb +++ b/bin/BRServer.DALFactory.pdb Binary files differ diff --git a/bin/BRServer.IDAL.dll b/bin/BRServer.IDAL.dll index 095ed2b..ccf00d4 100644 --- a/bin/BRServer.IDAL.dll +++ b/bin/BRServer.IDAL.dll Binary files differ diff --git a/bin/BRServer.IDAL.pdb b/bin/BRServer.IDAL.pdb index f13b477..ee42fd1 100644 --- a/bin/BRServer.IDAL.pdb +++ b/bin/BRServer.IDAL.pdb Binary files differ diff --git a/bin/BRServer.Model.dll b/bin/BRServer.Model.dll index 973712c..468d516 100644 --- a/bin/BRServer.Model.dll +++ b/bin/BRServer.Model.dll Binary files differ diff --git a/bin/BRServer.Model.pdb b/bin/BRServer.Model.pdb index dcf82a9..3ba05f3 100644 --- a/bin/BRServer.Model.pdb +++ b/bin/BRServer.Model.pdb Binary files differ diff --git a/bin/BRServer.dll b/bin/BRServer.dll index d1eb51b..daca7f0 100644 --- a/bin/BRServer.dll +++ b/bin/BRServer.dll Binary files differ diff --git a/bin/BRServer.pdb b/bin/BRServer.pdb index 999158c..ca3f878 100644 --- a/bin/BRServer.pdb +++ b/bin/BRServer.pdb Binary files differ diff --git a/bin/BRServerTest.vshost.exe.manifest b/bin/BRServerTest.vshost.exe.manifest new file mode 100644 index 0000000..061c9ca --- /dev/null +++ b/bin/BRServerTest.vshost.exe.manifest @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bin/Logs/debug.log b/bin/Logs/debug.log index 6257246..fe6ee67 100644 --- a/bin/Logs/debug.log +++ b/bin/Logs/debug.log @@ -5,3 +5,10 @@ 2019-03-12 09:28:51,404 [8220] DEBUG DefaultBootstrap - The Bootstrap has been initialized! 2019-03-12 09:28:51,436 [8220] DEBUG TelecomServer - Listener (0.0.0.0:50000) was started 2019-03-12 09:28:51,441 [8220] DEBUG DefaultBootstrap - The PerformanceMonitor has been started! +2019-03-12 11:06:55,140 [9672] DEBUG DefaultBootstrap - The server instance TelecomServer has been created! +2019-03-12 11:06:55,182 [9672] DEBUG TelecomServer - The command Casic(BRServer.CasicCmd, BRServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null) has been discovered +2019-03-12 11:06:55,194 [9672] DEBUG DefaultBootstrap - The server instance TelecomServer has been initialized! +2019-03-12 11:06:58,068 [9672] DEBUG DefaultBootstrap - The PerformanceMonitor has been initialized! +2019-03-12 11:06:58,068 [9672] DEBUG DefaultBootstrap - The Bootstrap has been initialized! +2019-03-12 11:06:58,104 [9672] DEBUG TelecomServer - Listener (0.0.0.0:50000) was started +2019-03-12 11:06:58,108 [9672] DEBUG DefaultBootstrap - The PerformanceMonitor has been started! diff --git a/bin/Logs/info.log b/bin/Logs/info.log index c43e11c..cf9ac88 100644 --- a/bin/Logs/info.log +++ b/bin/Logs/info.log @@ -1 +1,2 @@ 2019-03-12 09:28:51,437 [8220] INFO TelecomServer - The server instance TelecomServer has been started! +2019-03-12 11:06:58,104 [9672] INFO TelecomServer - The server instance TelecomServer has been started! diff --git a/bin/Logs/perf.log b/bin/Logs/perf.log index 3b645ed..fe858a0 100644 --- a/bin/Logs/perf.log +++ b/bin/Logs/perf.log @@ -12,3 +12,17 @@ Avialable Sending Queue Items: 256 Total Sending Queue Items: 256 +2019-03-12 11:06:58,183 Performance - --------------------------------------------------- +CPU Usage: 0.00%, Physical Memory Usage: 45,654,016.00, Total Thread Count: 25 +AvailableWorkingThreads: 1022, AvailableCompletionPortThreads: 1000 +MaxWorkingThreads: 1023, MaxCompletionPortThreads: 1000 +TelecomServer ---------------------------------- +Started Time: 2019/3/12 11:06:58 +Is Running: True +Total Connections: 0 +Maximum Allowed Connection Number: 100 +Total Handled Requests: 0 +Request Handling Speed (#/second): 0 +Avialable Sending Queue Items: 256 +Total Sending Queue Items: 256 +