diff --git a/SlnMesnac.RfidUpload.Common/JsonChange.cs b/SlnMesnac.RfidUpload.Common/JsonChange.cs index c18ab1f..a958cb9 100644 --- a/SlnMesnac.RfidUpload.Common/JsonChange.cs +++ b/SlnMesnac.RfidUpload.Common/JsonChange.cs @@ -1,4 +1,4 @@ -using Nancy.Json; + using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; @@ -28,10 +28,10 @@ namespace SlnMesnac.RfidUpload.Common /// public string ModeToJson(object Model) { - JavaScriptSerializer serializer = new JavaScriptSerializer(); + try { - string str = serializer.Serialize(Model); + string str = JsonConvert.SerializeObject(Model); return str; } catch (Exception) @@ -48,10 +48,10 @@ namespace SlnMesnac.RfidUpload.Common /// public T JsonToMode(string jsonStr) { - JavaScriptSerializer serializer = new JavaScriptSerializer(); + try { - var info = serializer.Deserialize(jsonStr); + var info = JsonConvert.DeserializeObject(jsonStr); return info; } catch (Exception) diff --git a/SlnMesnac.RfidUpload.Common/SlnMesnac.RfidUpload.Common.csproj b/SlnMesnac.RfidUpload.Common/SlnMesnac.RfidUpload.Common.csproj index 0ca18b0..cfc8833 100644 --- a/SlnMesnac.RfidUpload.Common/SlnMesnac.RfidUpload.Common.csproj +++ b/SlnMesnac.RfidUpload.Common/SlnMesnac.RfidUpload.Common.csproj @@ -6,8 +6,9 @@ - + + diff --git a/SlnMesnac.RfidUpload.Common/SqLiteHelper.cs b/SlnMesnac.RfidUpload.Common/SqLiteHelper.cs new file mode 100644 index 0000000..e4c6b45 --- /dev/null +++ b/SlnMesnac.RfidUpload.Common/SqLiteHelper.cs @@ -0,0 +1,91 @@ +using SQLite; + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq.Expressions; +using System.Text; + +namespace SlnMesnac.RfidUpload.Common +{ + /// + /// SQLite同步方法帮助类 + /// 作者：追逐时光者 + /// 创建时间：2023年11月30日 + /// + /// + public class SqLiteHelper where T : new() + { + private readonly string _databasePath = Path.Combine(Environment.CurrentDirectory, "db.db"); + private readonly SQLiteConnection _connection; // SQLite连接对象 + + /// + /// 构造函数 + /// + public SqLiteHelper() + { + // 创建SQLite连接对象并打开连接 + _connection = new SQLiteConnection(_databasePath); + _connection.CreateTable(); // 如果表不存在，则创建该表[不会创建重复的表] + } + + /// + /// 数据插入 + /// + /// 要插入的数据项 + /// + public int Insert(T item) + { + return _connection.Insert(item); + } + + /// + /// 数据删除 + /// + /// 要删除的数据的主键ID + /// + public int Delete(int id) + { + return _connection.Delete(id); + } + + /// + /// 数据更新 + /// + /// 要更新的数据项 + /// + public int Update(T item) + { + return _connection.Update(item); + } + + /// + /// 根据条件查询记录 + /// + /// 查询条件 + /// + public List Query(Expression> predExpr) + { + return _connection.Table().Where(predExpr).ToList(); + } + + /// + /// 查询所有数据 + /// + /// + public List QueryAll() + { + return _connection.Table().ToList(); + } + + /// + /// 根据条件查询单条记录 + /// + /// 查询条件 + /// + public T QuerySingle(Expression> predExpr) + { + return _connection.Table().Where(predExpr).FirstOrDefault(); + } + } +} diff --git a/SlnMesnac.RfidUpload.TouchSocket/WebApiClientApp.cs b/SlnMesnac.RfidUpload.TouchSocket/WebApiClientApp.cs index c1edd11..4f4febd 100644 --- a/SlnMesnac.RfidUpload.TouchSocket/WebApiClientApp.cs +++ b/SlnMesnac.RfidUpload.TouchSocket/WebApiClientApp.cs @@ -6,9 +6,11 @@ using SlnMesnac.RfidUpload.NLog; using System; using System.IO; using System.Net; +using System.Net.Http; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using NewLife.Http; using TouchSocket.Core; using TouchSocket.Rpc; using TouchSocket.Sockets; @@ -34,43 +36,7 @@ namespace SlnMesnac.RfidUpload.TouchSocket private JsonChange jsonChange = JsonChange.Instance; private AppConfig appConfig = AppConfig.Instance; - private WebApiClientApp() { } - - private WebApiClientSlim CreateWebApiClient(string url) - { - var client = new WebApiClientSlim(new System.Net.Http.HttpClient()); - client.Setup(new TouchSocketConfig() - .SetRemoteIPHost(ExtractBaseURL(appConfig.localUrl)) - .ConfigurePlugins(a => - { - })); - return client; - } - - /// - /// 例： - /// appConfig.localUrl =http://127.0.0.1:9090/api/uploadCsb - /// ExtractBaseURL(appConfig.localUrl)= http://127.0.0.1:9090 - /// - /// - /// - static string ExtractBaseURL(string url) - { - // 使用正则表达式匹配 http:// 或 https:// 开头的 URL 部分，直到第一个斜杠 - string pattern = @"^(https?://[^/]+)"; - Match match = Regex.Match(url, pattern); - - if (match.Success) - { - return match.Value; - } - else - { - return null; - } - } - - + public string UploadAsync(int code,string paramStr) { string result = string.Empty; @@ -154,22 +120,26 @@ namespace SlnMesnac.RfidUpload.TouchSocket return result; } - public static string Post(string url, object postData) - { - HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url); - req.Method = "POST"; - req.ContentType = "application/json"; - req.Timeout = 5000; - - if (req == null) return string.Empty; + private HttpClient client = new HttpClient(); - byte[] data = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(postData)); - using (Stream reqStream = req.GetRequestStream()) - reqStream.Write(data, 0, data.Length); - using (HttpWebResponse resp = (HttpWebResponse)req.GetResponse()) - using (Stream stream = resp.GetResponseStream()) - using (StreamReader reader = new StreamReader(stream, Encoding.UTF8)) - return reader.ReadToEnd(); + public string Post(string url, object postData) + { + var res = client.PostJson(url,postData); + return res; + //HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url); + //req.Method = "POST"; + //req.ContentType = "application/json"; + //req.Timeout = 5000; + + //if (req == null) return string.Empty; + + //byte[] data = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(postData)); + //using (Stream reqStream = req.GetRequestStream()) + // reqStream.Write(data, 0, data.Length); + //using (HttpWebResponse resp = (HttpWebResponse)req.GetResponse()) + //using (Stream stream = resp.GetResponseStream()) + //using (StreamReader reader = new StreamReader(stream, Encoding.UTF8)) + // return reader.ReadToEnd(); } } } \ No newline at end of file diff --git a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs index 35ba4cc..6ddb47f 100644 --- a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs +++ b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs @@ -1,7 +1,6 @@  using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using Nancy.Json; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SlnMesnac.RfidUpload.Business; diff --git a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs index 08b5989..48c4a7b 100644 --- a/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs +++ b/SlnMesnac.RfidUpload.UI/viewModel/TransferOrderViewModel.cs @@ -1,9 +1,6 @@  using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using Nancy.Json; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using SlnMesnac.RfidUpload.Business; using SlnMesnac.RfidUpload.Common; using SlnMesnac.RfidUpload.Model; diff --git a/SlnMesnac.RfidUpload.sln b/SlnMesnac.RfidUpload.sln index 7479a9c..0d3aae6 100644 --- a/SlnMesnac.RfidUpload.sln +++ b/SlnMesnac.RfidUpload.sln @@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.RfidUpload.NLog", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlnMesnac.RfidUpload.UI", "SlnMesnac.RfidUpload.UI\SlnMesnac.RfidUpload.UI.csproj", "{600503B8-7174-4A34-A38F-F4CFFAA6764F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slnmesnac.rfidupload.WebApplication", "slnmesnac.rfidupload.WebApplication\slnmesnac.rfidupload.WebApplication.csproj", "{76E1E241-C83D-4F79-8079-67CDD95E3D9E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slnmesnac.rfidupload.Repository", "slnmesnac.rfidupload.Repository\slnmesnac.rfidupload.Repository.csproj", "{8F0C9BA1-495F-4D97-9B1D-CFC60701D2BE}" EndProject Global @@ -55,10 +53,6 @@ Global {600503B8-7174-4A34-A38F-F4CFFAA6764F}.Debug|Any CPU.Build.0 = Debug|Any CPU {600503B8-7174-4A34-A38F-F4CFFAA6764F}.Release|Any CPU.ActiveCfg = Release|Any CPU {600503B8-7174-4A34-A38F-F4CFFAA6764F}.Release|Any CPU.Build.0 = Release|Any CPU - {76E1E241-C83D-4F79-8079-67CDD95E3D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76E1E241-C83D-4F79-8079-67CDD95E3D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76E1E241-C83D-4F79-8079-67CDD95E3D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76E1E241-C83D-4F79-8079-67CDD95E3D9E}.Release|Any CPU.Build.0 = Release|Any CPU {8F0C9BA1-495F-4D97-9B1D-CFC60701D2BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8F0C9BA1-495F-4D97-9B1D-CFC60701D2BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F0C9BA1-495F-4D97-9B1D-CFC60701D2BE}.Release|Any CPU.ActiveCfg = Release|Any CPU