修复代码

master
杨威 1 month ago
parent eae3da9152
commit edf0ae93f6

@ -1,21 +0,0 @@
using System;
namespace NDSD_Screwdriver
{
using System.Configuration;
public class AppTool
{
public static string GetIp()
{
return ConfigurationManager.AppSettings["ip"].ToString();
}
public static string GetDb()
{
return ConfigurationManager.AppSettings["db"].ToString();
}
public static String GetCom=> ConfigurationManager.AppSettings["com"].ToString();
}
}

@ -34,7 +34,8 @@ namespace NDSD_Screwdriver
public void Init() public void Init()
{ {
dataGridView1.AutoGenerateColumns = false; dataGridView1.AutoGenerateColumns = false;
var ctx = SqlLiteTool.GetDb(AppTool.GetDb()); var memorySetting = MemorySetting.Current;
var ctx = SqlLiteTool.GetDb(memorySetting.DB);
var list = ctx.Query<RFIDConfigEntity>().Where(x => x.IsEnable == true).ToList(); var list = ctx.Query<RFIDConfigEntity>().Where(x => x.IsEnable == true).ToList();
// dataGridView1.DataSource = list;//DataGridView的行可以添加删除只有允许添加行、删除行 // dataGridView1.DataSource = list;//DataGridView的行可以添加删除只有允许添加行、删除行
@ -44,7 +45,7 @@ namespace NDSD_Screwdriver
dataGridView1.AllowUserToDeleteRows = true; dataGridView1.AllowUserToDeleteRows = true;
var memorySetting = MemorySetting.Current;
ServerIPTextbox.Text = memorySetting.ServerIP; ServerIPTextbox.Text = memorySetting.ServerIP;
ServerPortTextbox.Text=memorySetting.ServerPort; ServerPortTextbox.Text=memorySetting.ServerPort;
AlarmTimeValueTextBox.Text = memorySetting.AlarmTimeValue.ToString(); AlarmTimeValueTextBox.Text = memorySetting.AlarmTimeValue.ToString();
@ -178,7 +179,8 @@ namespace NDSD_Screwdriver
if (list.Count > 0) if (list.Count > 0)
{ {
var ctx = SqlLiteTool.GetDb(AppTool.GetDb()); var memorySetting = MemorySetting.Current;
var ctx = SqlLiteTool.GetDb(memorySetting.DB);
ctx.Update<RFIDConfigEntity>(a => a.IsEnable == true, a => new RFIDConfigEntity() ctx.Update<RFIDConfigEntity>(a => a.IsEnable == true, a => new RFIDConfigEntity()
{ {
IsEnable = false IsEnable = false

@ -75,12 +75,15 @@ namespace NDSD_Screwdriver
public MainForm() public MainForm()
{ {
SqlLiteTool.CreateTable(AppTool.GetDb());
InitializeComponent(); InitializeComponent();
var memorySetting = MemorySetting.Current; var memorySetting = MemorySetting.Current;
LogContext = SqlLiteTool.GetDb(AppTool.GetDb()); SqlLiteTool.CreateTable(memorySetting.DB);
LogContext = SqlLiteTool.GetDb(memorySetting.DB);
RFIDLogsEntitys = LogContext.Query<RFIDLogsEntity>().OrderByDesc(a => a.CreateTime).Take(200).ToList(); RFIDLogsEntitys = LogContext.Query<RFIDLogsEntity>().OrderByDesc(a => a.CreateTime).Take(200).ToList();
LogDataGridView.AutoGenerateColumns = false; LogDataGridView.AutoGenerateColumns = false;
LogDataGridView.DataSource = null; LogDataGridView.DataSource = null;
@ -94,7 +97,7 @@ namespace NDSD_Screwdriver
try try
{ {
serialPort = new SerialPortFactory(AppTool.GetCom); serialPort = new SerialPortFactory(memorySetting.Com);
StartLongRunningTask(); StartLongRunningTask();
} }
catch (Exception e) catch (Exception e)
@ -165,10 +168,11 @@ namespace NDSD_Screwdriver
// flashThread.Abort(); // flashThread.Abort();
//} //}
//FlashThread(); //FlashThread();
var memorySetting = MemorySetting.Current;
//读取rfid数据 //读取rfid数据
var ctx = SqlLiteTool.GetDb(AppTool.GetDb()); var ctx = SqlLiteTool.GetDb(memorySetting.DB);
var list = ctx.Query<RFIDConfigEntity>().Where(x => x.IsEnable == true).ToList(); var list = ctx.Query<RFIDConfigEntity>().Where(x => x.IsEnable == true).ToList();
var strs = list.Select(x => x.RfidNo).ToArray(); var strs = list.Select(x => x.RfidNo).ToArray();
RFIDStatesEntities = new List<RFIDStatesEntity>(); RFIDStatesEntities = new List<RFIDStatesEntity>();

@ -14,6 +14,15 @@ namespace NDSD_Screwdriver
[Config("MemorySetting")] [Config("MemorySetting")]
public class MemorySetting : Config<MemorySetting> public class MemorySetting : Config<MemorySetting>
{ {
public MemorySetting()
{
}
public string DB { get; set; }= "Data Source=ndsd.db;Version=3;"
/// <summary> /// <summary>
/// 服务端IP /// 服务端IP
/// </summary> /// </summary>

@ -98,7 +98,6 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AppTool.cs" />
<Compile Include="FrmSetting.cs"> <Compile Include="FrmSetting.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>

Loading…
Cancel
Save