添加859指令

UserClass/APILog.cs

@@ -73,7 +73,7 @@ namespace DyeingComputer.UserClass
             API_LOG.Add("NAME", WorkOrder);
             API_LOG.Add("ERRID", ERRID);
             API_LOG.Add("MESSAGE", MESSAGE);
-            API_LOG.Add("TIME", Time);
+            API_LOG.Add("TIME", MainWindowViewModel.SYSTime);
             LOGDB("ERRLog", API_LOG);//行插入      
             API_LOG.Clear();
         }
@@ -94,16 +94,25 @@ namespace DyeingComputer.UserClass
             if(DBQueue.Count==0) QueueT=false;
         }
 
-        public static void LOGDB()//从队列写入数据库
+        public static void LOGnew()
         {
             SQLiteHelpers = new SQLiteHelper(LOGAddress); //数据库连接路径
             SQLiteHelpers.Open();  //打开数据库                                   
+        }//
+        public static DataTable LOGSELECT(string select)
+        {
+           var dat = SQLiteHelpers.ExecuteDataSet(select, null);        
+            DataTable dt = dat.Tables[0];
+            return dt;
+        }
+        public static void LOGDB()//从队列写入数据库
+        {           
             while (DBQueue.Count > 0)//信息发送队列
             {                
                 QueueString t = DBQueue.Dequeue();
                 SQLiteHelpers.InsertData(t.ID, t.DAT);//行插入     
             }
-            SQLiteHelpers.Close();  //关闭连接
+            //SQLiteHelpers.Close();  //关闭连接
             QueueT = false;
         }       
     }

UserClass/AsyncTcpServer.cs

@@ -719,58 +719,44 @@ namespace DyeingComputer.UserClass
                     {
                         try
                         {
-                            SQLiteHelper SQLiteHelpersLOG = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径
+                          //  SQLiteHelper SQLiteHelpersLOG = new SQLiteHelper(Environment.CurrentDirectory+"\\DataBase\\LOG.db"); //数据库连接路径
+                          //  SQLiteHelpersLOG.Open();  //打开数据库
                             Dictionary<string, object> dat_859;
                             dat_859 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
 
                             if (dat_859.GetValue("INSTRUCTION").ToString() == "SERVER")
                             {
-                                //SQLiteHelper SQLiteHelpersLOG = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径
+                                var dt_ = APILog.LOGSELECT("select * from SERVER where TIME >'" +
-                                SQLiteHelpersLOG.Open();  //打开数据库
+                                  DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "' and TIME <'" +
-                                DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from SERVER where TIME >"+
+                                  DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "'");
-                                  DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <"+ 
-                                  DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0];
-                                SQLiteHelpersLOG.Close();//关闭数据库
-
                                 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息
 
                                 APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令                                                                                
                             }
                             else if (dat_859.GetValue("INSTRUCTION").ToString() == "OperationLog")
                             {
-                                //SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径
+                                var dt_ = APILog.LOGSELECT("select * from OperationLog where TIME >'" + 
-                                SQLiteHelpersLOG.Open();  //打开数据库
+                                    DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "' and TIME <'" +
-                                DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from OperationLog where TIME >" +
+                                    DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "'");
-                                  DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <" +
-                                  DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0];
-                                SQLiteHelpersLOG.Close();//关闭数据库
-
                                 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息
 
                                 APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令      
                             }
                             else if (dat_859.GetValue("INSTRUCTION").ToString() == "IOLog")
                             {
-                                //SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径
-                                SQLiteHelpersLOG.Open();  //打开数据库
-                                DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from IOLog where TIME >" +
-                                  DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <" +
-                                  DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0];
-                                SQLiteHelpersLOG.Close();//关闭数据库
                               
+                                var dt_ = APILog.LOGSELECT("select * from IOLog where TIME >'" +         
+                                    DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "' and TIME <'" +
+                                    DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "'");
                                 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息
 
                                 APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令      
                             }
                             else if (dat_859.GetValue("INSTRUCTION").ToString() == "ERRLog")
                             {
-                                //SQLiteHelpers = new SQLiteHelper("\\DataBase\\LOG.db"); //数据库连接路径
+                                var dt_ = APILog.LOGSELECT("select * from ERRLog where TIME >'" + 
-                                SQLiteHelpersLOG.Open();  //打开数据库
+                                    DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "' and TIME <'" + 
-                                DataTable dt_ = SQLiteHelpersLOG.ExecuteDataSet("select * from ERRLog where TIME >" +
+                                    DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "'");
-                                  DateTime.Parse(dat_859.GetValue("TIME_S").ToString()).ToString("yyyy/MM/dd HH:mm:ss") + "TIME <" +
-                                  DateTime.Parse(dat_859.GetValue("TIME_E").ToString()).ToString("yyyy/MM/dd HH:mm:ss"), null).Tables[0];
-                                SQLiteHelpersLOG.Close();//关闭数据库
-
                                 client.SendAsync("SC859" + "[" + MainWindowViewModel.S01 + "]" + dt_.ToJsonString());//缓存信息
 
                                 APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令      
@@ -778,7 +764,7 @@ namespace DyeingComputer.UserClass
                         }
                         catch (Exception ex)
                         {
-                            client.SendAsync("SC959" + "[" + MainWindowViewModel.S01 + "]" + ex);
+                            client.SendAsync("SC959" + "[" + MainWindowViewModel.S01 + "]" + ex.Message);
                         }
                     }
                     else { client.SendAsync("SC999"); }

ViewModel/MainWindowViewModel.cs

@@ -230,6 +230,7 @@ namespace DyeingComputer.ViewModel
             WorkNumder = "----------";
             SYS_SET();  //crbl
             SQL_data();   //读数据库
+            APILog.LOGnew();
             if(S04!="1") UPort();    //启动串口
             if (dt_TP.Rows.Count > 0)
             {