Merge pull request GavinYellow#16 from kevin100702/master

GavinYellow · web-flow · commit cac01894e745 · 2018-05-09T09:45:07.000+08:00
ModbusTCP添加port参数和SQL 参数Datetime格式化
diff --git a/SCADA/Program/BatchCoreService/DAService.cs b/SCADA/Program/BatchCoreService/DAService.cs
@@ -1164,7 +1164,7 @@ public void Flush()
             {
                 if (_hda.Count == 0) return;
                 if (DataHelper.Instance.BulkCopy(new HDASqlReader(_hda, this), "Log_HData",
-                      string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'", _hda[0].TimeStamp.ToString())))
+                      string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'", _hda[0].TimeStamp.ToString("yyyy/MM/dd HH:mm:ss"))))
                 {
                     _hda.Clear();
                     _hdastart = DateTime.Now;
@@ -1177,7 +1177,7 @@ public bool SaveRange(DateTime startTime, DateTime endTime)
             var tempdata = _hda.ToArray();
             if (tempdata.Length == 0) return true;
             return DataHelper.Instance.BulkCopy(new HDASqlReader(GetData(tempdata, startTime, endTime), this), "Log_HData",
-                     string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP] BETWEEN '{0}' AND '{1}'", startTime, endTime));
+                     string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP] BETWEEN '{0}' AND '{1}'", startTime.ToString("yyyy/MM/dd HH:mm:ss"), endTime.ToString("yyyy/MM/dd HH:mm:ss")));
         }
 
         public void OnUpdate(object stateInfo)
@@ -1192,7 +1192,7 @@ public void OnUpdate(object stateInfo)
                     DateTime start = _hda[0].TimeStamp;
                     //_array.CopyTo(data, 0);
                     if (DataHelper.Instance.BulkCopy(new HDASqlReader(_hda, this), "Log_HData",
-                    string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'", start.ToString())))
+                    string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'", start.ToString("yyyy/MM/dd HH:mm:ss"))))
                         _hdastart = DateTime.Now;
                     else ThreadPool.UnsafeQueueUserWorkItem(new WaitCallback(this.SaveCachedData), _hda.ToArray());
                     _hda.Clear();
@@ -1213,7 +1213,7 @@ public void SaveCachedData(object stateInfo)
                 if (count >= 5) return;
                 if (DataHelper.Instance.BulkCopy(new HDASqlReader(tempData, this), "Log_HData",
                    string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP] BETWEEN '{0}' AND '{1}'",
-                    startTime, endTime)))
+                    startTime.ToString("yyyy/MM/dd HH:mm:ss"), endTime.ToString("yyyy/MM/dd HH:mm:ss"))))
                 {
                     stateInfo = null;
                     _hdastart = DateTime.Now;
diff --git a/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs b/SCADA/Program/ModbusDriver/ModbusTCPDriver.cs
@@ -137,6 +137,13 @@ public string ServerName
             set { _ip = value; }
         }
 
+        int _port = 502;
+        public int Port
+        {
+            get { return _port; }
+            set { _port = value; }
+        }
+
         public bool IsClosed
         {
             get
@@ -172,7 +179,7 @@ public ModbusTCPReader(IDataServer server, short id, string name)
 
         public bool Connect()
         {
-            int port = 502;
+            //int port = 502;
             try
             {
                 if (tcpSynCl != null)
@@ -185,7 +192,7 @@ public bool Connect()
                 tcpSynCl.SendTimeout = _timeout;
                 tcpSynCl.ReceiveTimeout = _timeout;
                 tcpSynCl.NoDelay = true;
-                tcpSynCl.Connect(_ip, port);
+                tcpSynCl.Connect(_ip, _port);
                 return true;
             }
             catch (SocketException error)
diff --git a/SCADA/dll/ModbusDriver.dll b/SCADA/dll/ModbusDriver.dll

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,13 @@ public string ServerName`
`137`	`137`	`set { _ip = value; }`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ int _port = 502;`
	`141`	`+ public int Port`
	`142`	`+ {`
	`143`	`+ get { return _port; }`
	`144`	`+ set { _port = value; }`
	`145`	`+ }`
	`146`	`+`
`140`	`147`	`public bool IsClosed`
`141`	`148`	`{`
`142`	`149`	`get`
`@@ -172,7 +179,7 @@ public ModbusTCPReader(IDataServer server, short id, string name)`
`172`	`179`
`173`	`180`	`public bool Connect()`
`174`	`181`	`{`
`175`		`- int port = 502;`
	`182`	`+ //int port = 502;`
`176`	`183`	`try`
`177`	`184`	`{`
`178`	`185`	`if (tcpSynCl != null)`
`@@ -185,7 +192,7 @@ public bool Connect()`
`185`	`192`	`tcpSynCl.SendTimeout = _timeout;`
`186`	`193`	`tcpSynCl.ReceiveTimeout = _timeout;`
`187`	`194`	`tcpSynCl.NoDelay = true;`
`188`		`- tcpSynCl.Connect(_ip, port);`
	`195`	`+ tcpSynCl.Connect(_ip, _port);`
`189`	`196`	`return true;`
`190`	`197`	`}`
`191`	`198`	`catch (SocketException error)`