Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

UserClass/AsyncTcpServer.cs

@@ -450,6 +450,78 @@ namespace DyeingComputer.UserClass
                     }
                     else { client.SendAsync("SC999"); }
                 }//缓存表
+                else if (SYSAPI == "SC854")
+                {
+                    if (SYSKEY == MainWindowViewModel.SYSKEY)
+                    {
+                        try
+                        {
+                            client.SendAsync("SC854" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_ParameterSet.ToJsonString());//缓存信息
+                        }
+                        catch { client.SendAsync("SC954"); }
+                    }
+                    else { client.SendAsync("SC999"); }
+                }//程序设置表
+                else if (SYSAPI == "SC855")
+                {
+                    if (SYSKEY == MainWindowViewModel.SYSKEY)
+                    {
+                        try
+                        {
+                            client.SendAsync("SC855" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_SysSet.ToJsonString());//缓存信息
+                        }
+                        catch { client.SendAsync("SC955"); }
+                    }
+                    else { client.SendAsync("SC999"); }
+                }//系统设置表
+                else if (SYSAPI == "SC861")
+                {
+                    if (SYSKEY == MainWindowViewModel.SYSKEY)
+                    {
+                        try
+                        {
+                            Dictionary<string, object> dat_861;
+                            dat_861 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
+
+                            Dictionary<string, object> datagrid_v = new Dictionary<string, object>();//缓存函数
+                            datagrid_v.Add("Value", dat_861.GetValue("Value")); 
+                            
+                            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                            SQLiteHelpers.Open();  //打开数据库
+                            SQLiteHelpers.Update("Parameters", datagrid_v, "ParameterID ='" + dat_861.GetValue("ID") + "'", null);//更新
+                            MainWindowViewModel.dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0];
+                            SQLiteHelpers.Close();//关闭数据库
+
+                            client.SendAsync("SC854" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_ParameterSet.ToJsonString());//缓存信息
+                        }
+                        catch { client.SendAsync("SC961"); }
+                    }
+                    else { client.SendAsync("SC999"); }
+                }//修改软件设置
+                else if (SYSAPI == "SC862")
+                {
+                    if (SYSKEY == MainWindowViewModel.SYSKEY)
+                    {
+                        try
+                        {
+                            Dictionary<string, object> dat_862;
+                            dat_862 = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
+
+                            Dictionary<string, object> datagrid_v = new Dictionary<string, object>();//缓存函数
+                            datagrid_v.Add("Value", dat_862.GetValue("Value"));
+
+                            SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
+                            SQLiteHelpers.Open();  //打开数据库
+                            SQLiteHelpers.Update("System", datagrid_v, "ParameterID ='" + dat_862.GetValue("ID") + "'", null);//更新
+                            MainWindowViewModel.dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0];
+                            SQLiteHelpers.Close();//关闭数据库
+
+                            client.SendAsync("SC855" + "[" + MainWindowViewModel.S01 + "]" + MainWindowViewModel.dt_SysSet.ToJsonString());//缓存信息
+                        }
+                        catch { client.SendAsync("SC962"); }
+                    }
+                    else { client.SendAsync("SC999"); }
+                }//修改系统
 
                 return EasyTask.CompletedTask;
             };

View/ParameterSetView.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using DyeingComputer.ViewModel;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
@@ -36,18 +37,13 @@ namespace DyeingComputer.View
 
         private SQLiteHelper SQLiteHelpers = null;  //定义数据库
         private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db";  //数据库路径
-        DataSet sql; //内存数据缓存
 
         public void set_sql()
         {
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
             SQLiteHelpers.Open();  //打开数据库
-
+            MainWindowViewModel.dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0];  //读取计划表写入缓存
-            string sql_script = "select * from Parameters order by ParameterID asc";
+            if (MainWindowViewModel.dt_ParameterSet.Rows.Count>0) Grid.ItemsSource = MainWindowViewModel.dt_ParameterSet.DefaultView;  //转换显示计划表
-
-            if (sql != null) sql.Clear();  //清空缓存
-            sql = SQLiteHelpers.ExecuteDataSet(sql_script, null);  //读取计划表写入缓存
-            if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
             SQLiteHelpers.Close();  //关闭连接
 
         }
@@ -67,6 +63,7 @@ namespace DyeingComputer.View
                 SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
                 SQLiteHelpers.Open();  //打开数据库
                 SQLiteHelpers.Update("Parameters", datagrid_v, "ParameterID ='" + ID + "'", null);//更新
+                MainWindowViewModel.dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0];  //读取计划表写入缓存
                 SQLiteHelpers.Close();//关闭数据库
             }
         }

View/SysSetView.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using DyeingComputer.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -31,18 +32,13 @@ namespace DyeingComputer.View
 
         private SQLiteHelper SQLiteHelpers = null;  //定义数据库
         private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db";  //数据库路径    
-        DataSet sql; //内存数据缓存
 
         public void set_sql()
         {
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
             SQLiteHelpers.Open();  //打开数据库
-
+            MainWindowViewModel.dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0];  //读取计划表写入缓存
-            string sql_script = "select * from System order by ParameterID asc";
+            if (MainWindowViewModel.dt_SysSet.Rows.Count>0) Grid.ItemsSource = MainWindowViewModel.dt_SysSet.DefaultView;  //转换显示计划表
-
-            if (sql != null) sql.Clear();  //清空缓存
-            sql = SQLiteHelpers.ExecuteDataSet(sql_script, null);  //读取计划表写入缓存
-            if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView;  //转换显示计划表
             SQLiteHelpers.Close();  //关闭连接
 
         }
@@ -62,6 +58,7 @@ namespace DyeingComputer.View
                 SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
                 SQLiteHelpers.Open();  //打开数据库
                 SQLiteHelpers.Update("System", datagrid_v, "ParameterID ='" + ID + "'", null);//更新
+                MainWindowViewModel.dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0];  
                 SQLiteHelpers.Close();//关闭数据库
             }
         }

ViewModel/MainWindowViewModel.cs

@@ -1574,6 +1574,8 @@ namespace DyeingComputer.ViewModel
         public static DataTable dt_a = new DataTable("AIO");
         public static DataTable dt_m = new DataTable("M");
         public static DataTable dt_TP = new DataTable();
+        public static DataTable dt_ParameterSet = new DataTable();
+        public static DataTable dt_SysSet = new DataTable();
         public static void SQL_data()//获得io表
         {
             SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
@@ -1581,6 +1583,9 @@ namespace DyeingComputer.ViewModel
             dt_d = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='DO' OR type='DQ' order by ID", null).Tables[0];  //读取表写入缓存
             dt_a = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='AI' OR type='AO' order by ID", null).Tables[0];
             dt_m = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='M' order by ID", null).Tables[0];
+            dt_ParameterSet = SQLiteHelpers.ExecuteDataSet("select * from Parameters order by ParameterID asc", null).Tables[0];
+            dt_SysSet = SQLiteHelpers.ExecuteDataSet("select * from System order by ParameterID asc", null).Tables[0];
+
             SQLiteHelpers.Close();
             //创建dt_d主建
             DataColumn[] dt_dcols =new DataColumn[] { dt_d.Columns["ID"] };