From fcbdb97d1f5ed4ef80cba4d5e77f46d39aa082cd Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Wed, 9 Oct 2024 10:21:10 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B7=BB=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Business/LogInfoBusiness.cs         | 71 ++++++++++++++++
 SlnMesnac.Business/TagScanBusiness.cs         |  4 +-
 .../Page/History/HistoryControl.xaml          |  6 +-
 .../Page/LogInfo/LogInfoControl.xaml          | 41 +++++----
 .../Page/LogInfo/LogInfoControl.xaml.cs       |  5 +-
 SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs   | 85 +++++++++++++++++++
 6 files changed, 188 insertions(+), 24 deletions(-)
 create mode 100644 SlnMesnac.Business/LogInfoBusiness.cs
 create mode 100644 SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs

diff --git a/SlnMesnac.Business/LogInfoBusiness.cs b/SlnMesnac.Business/LogInfoBusiness.cs
new file mode 100644
index 0000000..56f9b3c
--- /dev/null
+++ b/SlnMesnac.Business/LogInfoBusiness.cs
@@ -0,0 +1,71 @@
+using SlnMesnac.Common;
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.LogImpl;
+using SlnMesnac.Repository.service.ScanLog;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.Business
+* 唯一标识：9d48fdd1-4ce5-4944-9756-2a814bdd51ff
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-10-09 9:53:19
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Business
+{
+    public class LogInfoBusiness
+    {
+        private IBaseLogService logService;
+
+        public LogInfoBusiness(IBaseLogService _logService)
+        {
+            logService = _logService;
+        }
+
+        /// <summary>
+        /// 查询日志信息
+        /// </summary>
+        /// <param name="logLevel"></param>
+        /// <param name="beginTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="result"></param>
+        public void QueryLogInfo(string logLevel, DateTime beginTime, DateTime endTime, out List<BaseLog> result)
+        {
+            //var info = scanLogService.Query(x => x.CreateTime >= beginTime && x.CreateTime <= endTime);
+            Expression<Func<BaseLog, bool>> exp = s1 => true;
+            if (beginTime != null)
+            {
+                exp = exp.And(x => x.CreateTime >= beginTime.Date);
+            }
+
+            if (endTime != null)
+            {
+                exp = exp.And(x => x.CreateTime <= endTime.Date);
+            }
+
+            if (!string.IsNullOrEmpty(logLevel) && logLevel != "所有")
+            {
+                exp = exp.And(x => x.LogLevel == logLevel);
+            }
+            result = logService.Query(exp);
+        }
+    }
+}
diff --git a/SlnMesnac.Business/TagScanBusiness.cs b/SlnMesnac.Business/TagScanBusiness.cs
index b0c1c05..be1b040 100644
--- a/SlnMesnac.Business/TagScanBusiness.cs
+++ b/SlnMesnac.Business/TagScanBusiness.cs
@@ -123,12 +123,12 @@ namespace SlnMesnac.Business
             Expression<Func<ScanLogModel, bool>> exp = s1 => true;
             if(beginTime != null)
             {
-                exp = exp.And(x => x.CreateTime >= beginTime);
+                exp = exp.And(x => x.CreateTime >= beginTime.Date);
             }
 
             if (endTime != null)
             {
-                exp = exp.And(x => x.CreateTime <= endTime);
+                exp = exp.And(x => x.CreateTime <= endTime.Date);
             }
 
             if (!string.IsNullOrEmpty(rfidStr))
diff --git a/SlnMesnac.WPF/Page/History/HistoryControl.xaml b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
index 72faeb0..038cdec 100644
--- a/SlnMesnac.WPF/Page/History/HistoryControl.xaml
+++ b/SlnMesnac.WPF/Page/History/HistoryControl.xaml
@@ -14,7 +14,7 @@
         <Border Grid.Row="0" BorderBrush="#EBF4FD" BorderThickness="2" CornerRadius="10" Background="#EBF4FD" Margin="10,10">
             <StackPanel Grid.Column="0" VerticalAlignment="Center"  HorizontalAlignment="Left" Orientation="Horizontal">
                 <TextBlock Text="RFID" FontSize="18" Foreground="#31446E" Margin="10,3"/>
-                <TextBox Text="{Binding RfidCode}" FontSize="24" Grid.Row="1" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
+                <TextBox Text="{Binding RfidCode}" FontSize="16" Grid.Row="1" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
                     <TextBox.Template>
                         <ControlTemplate TargetType="TextBox">
                             <Border Background="White" BorderBrush="White" BorderThickness="1" CornerRadius="5">
@@ -25,9 +25,9 @@
                 </TextBox>
                 
                 <TextBlock Text="扫描时间" FontSize="18" Foreground="#31446E" Margin="20,3,10,0"/>
-                <DatePicker x:Name="BeginTimeDatePicker" SelectedDate="{Binding BeginTime}"  Width="120" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                <DatePicker x:Name="BeginTimeDatePicker" SelectedDate="{Binding BeginTime}"  FontSize="14" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5" Margin="0,0,5,0"/>
                 <TextBlock Text="-" FontSize="18" Foreground="#31446E" Margin="10,3"/>
-                <DatePicker x:Name="EndTimeDatePicker" SelectedDate="{Binding EndTime}" Width="120" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                <DatePicker x:Name="EndTimeDatePicker" SelectedDate="{Binding EndTime}" FontSize="14"  Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5" Margin="0,0,5,0"/>
 
                 <Button Content="查    询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#5095F3" BorderBrush="#5095F3" Margin="10,0,10,0"/>
                 <Button Content="导    出" Command="{Binding ExportCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
diff --git a/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml b/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml
index d98a561..22e1839 100644
--- a/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml
+++ b/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml
@@ -24,24 +24,17 @@
                     </TextBox.Template>
                 </TextBox>-->
 
-                <ComboBox SelectedItem="{Binding LogType}" FontSize="16" Grid.Row="1" Width="180" Height="30">
-                    <ComboBoxItem>INFO</ComboBoxItem>
-                    <ComboBoxItem>WARN</ComboBoxItem>
-                    <ComboBoxItem>ERROR</ComboBoxItem>
+                <ComboBox SelectedItem="{Binding LogLevel}" FontSize="16" Grid.Row="1" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5">
+                    <ComboBoxItem>Info</ComboBoxItem>
+                    <ComboBoxItem>Warn</ComboBoxItem>
+                    <ComboBoxItem>Error</ComboBoxItem>
                     <ComboBoxItem>所有</ComboBoxItem>
-                    <!--<ComboBox.Template>
-                        <ControlTemplate TargetType="ComboBox">
-                            <Border Background="White" BorderBrush="White" BorderThickness="1" CornerRadius="5">
-                                <ScrollViewer x:Name="PART_ContentHost" />
-                            </Border>
-                        </ControlTemplate>
-                    </ComboBox.Template>-->
                 </ComboBox>
 
                 <TextBlock Text="日志时间" FontSize="18" Foreground="#31446E" Margin="20,3,10,0"/>
-                <DatePicker x:Name="BeginTimeDatePicker" SelectedDate="{Binding BeginTime}"  Width="120" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                <DatePicker x:Name="BeginTimeDatePicker" SelectedDate="{Binding BeginTime}"  FontSize="14" Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5" Margin="0,0,5,0"/>
                 <TextBlock Text="-" FontSize="18" Foreground="#31446E" Margin="10,3"/>
-                <DatePicker x:Name="EndTimeDatePicker" SelectedDate="{Binding EndTime}" Width="120" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                <DatePicker x:Name="EndTimeDatePicker" SelectedDate="{Binding EndTime}" FontSize="14"  Width="180" Height="30" VerticalContentAlignment="Center" HorizontalAlignment="Center" Padding="5" Margin="0,0,5,0"/>
 
                 <Button Content="查    询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#5095F3" BorderBrush="#5095F3" Margin="10,0,10,0"/>
                 <Button Content="导    出" Command="{Binding ExportCommand}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
@@ -51,17 +44,29 @@
         <Border Grid.Row="1" BorderBrush="#EBF4FD" BorderThickness="2" CornerRadius="10" Background="#EBF4FD" Margin="10,10">
             <DataGrid Grid.Row="0" ItemsSource="{Binding ScanItems}" Background="Transparent" 
               FontSize="18" ColumnHeaderHeight="35" 
-              RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+              RowHeight="150" AutoGenerateColumns="False" RowHeaderWidth="0" 
               GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
               ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
               Foreground="#31446E" x:Name="dataGrid" Margin="0,10,0,0" >
                 <!--resourceStyle 399行修改选中字体颜色-->
                 <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding Id}" Header="序号" Width="1*" IsReadOnly="True"/>
+                    <DataGridTextColumn Binding="{Binding LogLevel}" Header="日志级别" Width="1*" IsReadOnly="True"/>
+                    <DataGridTextColumn Binding="{Binding Content}" Header="日志内容" Width="3*" IsReadOnly="True">
+                        <DataGridTextColumn.ElementStyle>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="TextWrapping" Value="Wrap"/>
+                            </Style>
+                        </DataGridTextColumn.ElementStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ErrMsg}" Header="异常日志" Width="3*" IsReadOnly="True">
+                        <DataGridTextColumn.ElementStyle>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="TextWrapping" Value="Wrap"/>
+                            </Style>
+                        </DataGridTextColumn.ElementStyle>
+                    </DataGridTextColumn>
                     <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="记录时间" Width="1.5*" IsReadOnly="True"/>
-                    <DataGridTextColumn Binding="{Binding Rfid}" Header="RFID" Width="2*" IsReadOnly="True"/>
-                    <DataGridTextColumn Binding="{Binding Code}" Header="ATR" Width="2*" IsReadOnly="True"/>
-                    <DataGridTextColumn Binding="{Binding Ocr}" Header="OCR" Width="2*" IsReadOnly="True"/>
-                    <DataGridTextColumn Binding="{Binding Url}" Header="图像路径" Width="2*" IsReadOnly="True"/>
                 </DataGrid.Columns>
             </DataGrid>
         </Border>
diff --git a/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml.cs b/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml.cs
index f5077a1..f720c2c 100644
--- a/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml.cs
+++ b/SlnMesnac.WPF/Page/LogInfo/LogInfoControl.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using SlnMesnac.WPF.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -23,6 +24,8 @@ namespace SlnMesnac.WPF.Page.LogInfo
         public LogInfoControl()
         {
             InitializeComponent();
+
+            this.DataContext = new LogInfoViewModel();
         }
     }
 }
diff --git a/SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs b/SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs
new file mode 100644
index 0000000..09f6d08
--- /dev/null
+++ b/SlnMesnac.WPF/ViewModel/LogInfoViewModel.cs
@@ -0,0 +1,85 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
+using SlnMesnac.Business;
+using SlnMesnac.Model.domain;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：T14-GEN3-7895
+* 命名空间：SlnMesnac.WPF.ViewModel
+* 唯一标识：06dea146-4bed-4f74-9aac-01f8ea91d6bf
+*
+* 创建者：WenJY
+* 电子邮箱：
+* 创建时间：2024-10-09 8:50:06
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.WPF.ViewModel
+{
+    public partial class LogInfoViewModel: ObservableObject
+    {
+
+        private readonly LogInfoBusiness logInfoBusiness;
+
+        public LogInfoViewModel()
+        {
+            logInfoBusiness = App.ServiceProvider.GetService<LogInfoBusiness>();
+
+        }
+
+        public ComboBoxItem _logLevel = null;
+        public ComboBoxItem LogLevel
+        {
+            get => _logLevel;
+            set => SetProperty(ref _logLevel, value);
+        }
+
+        public DateTime _beginTime = DateTime.Now;
+        public DateTime BeginTime
+        {
+            get => _beginTime;
+            set => SetProperty(ref _beginTime, value);
+        }
+
+        public DateTime _endTime = DateTime.Now;
+        public DateTime EndTime
+        {
+            get => _endTime;
+            set => SetProperty(ref _endTime, value);
+        }
+
+        private ObservableCollection<BaseLog> _scanItems = new ObservableCollection<BaseLog>();
+        public ObservableCollection<BaseLog> ScanItems
+        {
+            get => _scanItems;
+            set => SetProperty(ref _scanItems, value);
+        }
+
+        [RelayCommand]
+        private void Query()
+        {
+            logInfoBusiness.QueryLogInfo(_logLevel.Content.ToString(), _beginTime, _endTime, out List<BaseLog> info);
+
+            ScanItems = new ObservableCollection<BaseLog>(info);
+        }
+    }
+}