From a05d131deca32f9e3c6b442f9d56fc341ddbd189 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Tue, 5 Mar 2024 15:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=20=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=20=E6=8C=89=E9=92=AE=EF=BC=8C=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E4=BB=A5?= =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=8C=87=E7=BA=B9=E5=BB=B6=E6=97=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Services/UserService.cs | 26 ++++++++++++++----- .../OrderTakeDrugWindowViewModel.cs | 1 - .../Views/Dialog/BindingChannelNewDialog.xaml | 6 ++--- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/DM_Weight/Services/UserService.cs b/DM_Weight/Services/UserService.cs index 38e1ae4..325962f 100644 --- a/DM_Weight/Services/UserService.cs +++ b/DM_Weight/Services/UserService.cs @@ -8,12 +8,14 @@ using System.Collections.Generic; using System.Configuration; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace DM_Weight.Services { public class UserService { + private readonly ILog logger = LogManager.GetLogger(typeof(UserService)); //public static string connStr = ConfigurationManager.AppSettings["database"].ToString(); public static string connStr = ConfigurationManager.ConnectionStrings["database"].ToString(); public UserList CheckUserByFingerPrinter(int fingerPrinterId) @@ -22,12 +24,24 @@ namespace DM_Weight.Services using (MySqlConnection con = new MySqlConnection(connStr)) { - con.Open(); + logger.Info($"connStr：{connStr}"); + try + { + con.Open(); + } + catch (Exception ex) + { + logger.Info($"Open失败：{ex.ToString()}"); + Thread.Sleep(200); + logger.Info("再次Open"); + con.Open(); + } + logger.Info("数据库连接已打开"); string sql = @"select ul.id as id,ul.User_name as userName,r.id,r.role_name,r.permissions,r.machine_id from user_list ul INNER JOIN role r on ul.machine_role_id=r.id where ul.Id=@ID and ul.machine_id=@machine_id and r.machine_id=@machine_id;"; MySqlCommand cmd = new MySqlCommand(sql, con); cmd.Parameters.Clear(); - MySqlParameter[] mySqlParameter = new MySqlParameter[] {new MySqlParameter("ID", fingerPrinterId),new MySqlParameter("machine_id", (ConfigurationManager.AppSettings["machineId"] ?? "DM1")) }; + MySqlParameter[] mySqlParameter = new MySqlParameter[] { new MySqlParameter("ID", fingerPrinterId), new MySqlParameter("machine_id", (ConfigurationManager.AppSettings["machineId"] ?? "DM1")) }; cmd.Parameters.AddRange(mySqlParameter); //执行语句 MySqlDataReader reader = cmd.ExecuteReader(); @@ -37,17 +51,17 @@ namespace DM_Weight.Services user.Id = reader.GetInt32("id"); user.UserName = reader["userName"] is DBNull ? "" : reader.GetString("userName"); //user.UserName = reader["id"] is DBNull ? "" : reader.GetString("id"); - user.Nickname= reader["userName"] is DBNull ? "" : reader.GetString("userName"); + user.Nickname = reader["userName"] is DBNull ? "" : reader.GetString("userName"); user.MachineId = reader["machine_id"] is DBNull ? "" : reader.GetString("machine_id"); - RoleDm role= new RoleDm(); - role.Id= reader.GetInt32("id"); + RoleDm role = new RoleDm(); + role.Id = reader.GetInt32("id"); //role.Permissions = reader["permissions"] is DBNull ? "" : reader.GetString("permissions"); role.RoleName = reader["role_name"] is DBNull ? "" : reader.GetString("role_name"); role.Permissions = JsonConvert.DeserializeObject>(reader["permissions"] is DBNull ? "" : reader.GetString("permissions")); // JsonConvert.SerializeObject(reader.GetString("permissions")).ToList(); user.Role = role; } reader.Close(); - + logger.Info($"sql：{sql}"); return user; } diff --git a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs index 52f36f0..5d971ef 100644 --- a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs @@ -249,7 +249,6 @@ namespace DM_Weight.ViewModels //接收导航传过来的参数 现在是在此处初始化了表格数据 public void OnNavigatedTo(NavigationContext navigationContext) { - logger.Info("进入OrderTakeDrugWindowViewModel_OnNavigatedTo"); _eventAggregator.GetEvent().Subscribe(DoMyPrismEvent); //RequestData(); diff --git a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml index 6e1f72c..41f83b3 100644 --- a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml +++ b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml @@ -72,7 +72,7 @@ SelectedItem="{Binding DrugInfo}" DisplayMemberPath="drug_name_spec" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp" /> - + + />