11

Service/Leo1SatTaskServer54/LogHelper.cs

@@ -15,13 +15,13 @@ namespace X1LeoTaskServer54
         public static void Info(string msg)
         {
             var pro = Process.GetCurrentProcess();
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Info,
                 Module = pro.ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Information(msg);
             Serilog.Log.Information("MainWindowTitle=" + pro.MainWindowTitle);
             Serilog.Log.Information("ModuleName=" + pro.MainModule.ModuleName);
@@ -30,13 +30,13 @@ namespace X1LeoTaskServer54
         }
         public static void Warning(string msg, Exception ex = null)
         {
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Warning,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Warning(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Warning, Msg = msg });
         }
@@ -48,13 +48,13 @@ namespace X1LeoTaskServer54
                 if (iex != null)
                     ex = iex;
             }
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Error,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Error(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Error, Msg = msg });
         }

Service/Leo1SatTaskServer54/MainForm.cs

@@ -3,6 +3,7 @@ using DxHelper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using XdCxRhDW.Dto;
@@ -35,9 +36,17 @@ namespace X1LeoTaskServer54
 
         private async void MainForm_LoadAsync(object sender, EventArgs e)
         {
+            try
+            {
+                if (Directory.Exists("tmp"))
+                    Directory.Delete("tmp");
+            }
+            catch
+            { }
             var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
             var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();
             var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
+            LogHelper.BaseUrl = posPlatformAddr + "/api/";
             this.Text = EnumSvrType.LeoX1Task54.GetEnumDisplayName() + "-" + svrID;
             string localIp;
             string getIpUrl = $"{posPlatformAddr}/api/task/getclientip";

Service/Leo1SatTaskServer54/Service/TaskService.cs

@@ -313,7 +313,7 @@ namespace X1LeoTaskServer54.Service
                                             sb.Append($"{3}\t");//定位体制(星地=3)
                                             sb.Append($"{1335:D12}");//符号速率bps  12个
                                             sb.Append("\r\n");
-                                            string resFile = Path.Combine(PosResDir, $"定位结果_{posRes.SigTime:yyyyMMdd}.txt");
+                                            string resFile = Path.Combine(PosResDir, $"低轨单星定位结果_{posRes.SigTime:yyyyMMdd}.txt");
                                             File.AppendAllText(resFile, sb.ToString());
                                         }
                                     }

Service/Leo2SatTaskServer54/App.config

@@ -16,9 +16,6 @@
 		<!--采集数据目录-->
 		<add key="CapDir" value="D:\data\AD"/>
 
-		<!--DDC处理后的目录-->
-		<add key="DdcDir" value="D:\data\DDC"/>
-
 		<!--定位结果输出目录-->
 		<add key="PosResDir" value="D:\data\PosRes"/>
 

Service/Leo2SatTaskServer54/LogHelper.cs

@@ -15,13 +15,13 @@ namespace X2LeoTaskServer54
         public static void Info(string msg)
         {
             var pro = Process.GetCurrentProcess();
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Info,
                 Module = pro.ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Information(msg);
             Serilog.Log.Information("MainWindowTitle=" + pro.MainWindowTitle);
             Serilog.Log.Information("ModuleName=" + pro.MainModule.ModuleName);
@@ -30,13 +30,13 @@ namespace X2LeoTaskServer54
         }
         public static void Warning(string msg, Exception ex = null)
         {
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Warning,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Warning(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Warning, Msg = msg });
         }
@@ -48,13 +48,13 @@ namespace X2LeoTaskServer54
                 if (iex != null)
                     ex = iex;
             }
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Error,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Error(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Error, Msg = msg });
         }

Service/Leo2SatTaskServer54/MainForm.cs

@@ -3,6 +3,7 @@ using DxHelper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using XdCxRhDW.Dto;
@@ -35,9 +36,17 @@ namespace X2LeoTaskServer54
 
         private async void MainForm_LoadAsync(object sender, EventArgs e)
         {
+            try
+            {
+                if (Directory.Exists("tmp"))
+                    Directory.Delete("tmp");
+            }
+            catch
+            { }
             var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
             var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();
             var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
+            LogHelper.BaseUrl = posPlatformAddr + "/api/";
             this.Text = EnumSvrType.LeoX2Task54.GetEnumDisplayName() + "-" + svrID;
             string localIp;
             string getIpUrl = $"{posPlatformAddr}/api/task/getclientip";

Service/Leo2SatTaskServer54/Service/TaskService.cs

@@ -19,7 +19,6 @@ namespace X2LeoTaskServer54.Service
 
         string DetectDir;
         string CapDir;
-        string DdcDir;
         string PosResDir;
         string StateDir;
         int MainSatCode, Adja1SatCode;
@@ -40,7 +39,6 @@ namespace X2LeoTaskServer54.Service
 
             DetectDir = ConfigurationManager.AppSettings["DetectDir"].Trim();
             CapDir = ConfigurationManager.AppSettings["CapDir"].Trim();
-            DdcDir = ConfigurationManager.AppSettings["DdcDir"].Trim();
             PosResDir = ConfigurationManager.AppSettings["PosResDir"].Trim();
             StateDir = ConfigurationManager.AppSettings["StateRptDir"].Trim();
             var PosDtoFactorstr = ConfigurationManager.AppSettings["PosDtoFactor"].Trim();

Service/Leo3SatTaskServer54/App.config

@@ -16,9 +16,6 @@
 		<!--采集数据目录-->
 		<add key="CapDir" value="D:\data\AD"/>
 
-		<!--DDC处理后的目录-->
-		<add key="DdcDir" value="D:\data\DDC"/>
-
 		<!--定位结果输出目录-->
 		<add key="PosResDir" value="D:\data\PosRes"/>
 

Service/Leo3SatTaskServer54/LogHelper.cs

@@ -15,13 +15,13 @@ namespace X3LeoTaskServer54
         public static void Info(string msg)
         {
             var pro = Process.GetCurrentProcess();
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Info,
                 Module = pro.ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Information(msg);
             Serilog.Log.Information("MainWindowTitle=" + pro.MainWindowTitle);
             Serilog.Log.Information("ModuleName=" + pro.MainModule.ModuleName);
@@ -30,13 +30,13 @@ namespace X3LeoTaskServer54
         }
         public static void Warning(string msg, Exception ex = null)
         {
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Warning,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Warning(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Warning, Msg = msg });
         }
@@ -48,13 +48,13 @@ namespace X3LeoTaskServer54
                 if (iex != null)
                     ex = iex;
             }
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Error,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Error(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Error, Msg = msg });
         }

Service/Leo3SatTaskServer54/MainForm.cs

@@ -3,6 +3,7 @@ using DxHelper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using XdCxRhDW.Dto;
@@ -35,9 +36,17 @@ namespace X3LeoTaskServer54
 
         private async void MainForm_LoadAsync(object sender, EventArgs e)
         {
+            try
+            {
+                if (Directory.Exists("tmp"))
+                    Directory.Delete("tmp");
+            }
+            catch
+            { }
             var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
             var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();
             var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
+            LogHelper.BaseUrl = posPlatformAddr + "/api/";
             this.Text = EnumSvrType.LeoX3Task54.GetEnumDisplayName() + "-" + svrID;
             string localIp;
             string getIpUrl = $"{posPlatformAddr}/api/task/getclientip";

Service/Leo3SatTaskServer54/Service/TaskService.cs

@@ -19,7 +19,6 @@ namespace X3LeoTaskServer54.Service
 
         string DetectDir;
         string CapDir;
-        string DdcDir;
         string PosResDir;
         string StateDir;
         int MainSatCode, Adja1SatCode;
@@ -40,7 +39,6 @@ namespace X3LeoTaskServer54.Service
 
             DetectDir = ConfigurationManager.AppSettings["DetectDir"].Trim();
             CapDir = ConfigurationManager.AppSettings["CapDir"].Trim();
-            DdcDir = ConfigurationManager.AppSettings["DdcDir"].Trim();
             PosResDir = ConfigurationManager.AppSettings["PosResDir"].Trim();
             StateDir = ConfigurationManager.AppSettings["StateRptDir"].Trim();
             var PosDtoFactorstr = ConfigurationManager.AppSettings["PosDtoFactor"].Trim();

Service/X2D1NoRefTaskServer54/LogHelper.cs

@@ -15,13 +15,13 @@ namespace X2D1NoRefTaskServer54
         public static void Info(string msg)
         {
             var pro = Process.GetCurrentProcess();
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Info,
                 Module = pro.ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Information(msg);
             Serilog.Log.Information("MainWindowTitle=" + pro.MainWindowTitle);
             Serilog.Log.Information("ModuleName=" + pro.MainModule.ModuleName);
@@ -30,13 +30,13 @@ namespace X2D1NoRefTaskServer54
         }
         public static void Warning(string msg, Exception ex = null)
         {
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Warning,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Warning(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Warning, Msg = msg });
         }
@@ -48,13 +48,13 @@ namespace X2D1NoRefTaskServer54
                 if (iex != null)
                     ex = iex;
             }
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Error,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Error(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Error, Msg = msg });
         }

Service/X2D1TaskServer54/LogHelper.cs

@@ -15,13 +15,13 @@ namespace X3TaskServer54
         public static void Info(string msg)
         {
             var pro = Process.GetCurrentProcess();
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Info,
                 Module = pro.ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Information(msg);
             Serilog.Log.Information("MainWindowTitle=" + pro.MainWindowTitle);
             Serilog.Log.Information("ModuleName=" + pro.MainModule.ModuleName);
@@ -30,13 +30,13 @@ namespace X3TaskServer54
         }
         public static void Warning(string msg, Exception ex = null)
         {
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Warning,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Warning(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Warning, Msg = msg });
         }
@@ -48,13 +48,13 @@ namespace X3TaskServer54
                 if (iex != null)
                     ex = iex;
             }
-            HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Query/Add", new LogInfoDto()
+            _ = HttpHelper.PostRequestAsync<List<LogModulesResDto>>(BaseUrl + "Log/Add", new LogInfoDto()
             {
                 LogTime = DateTime.Now,
                 LogType = EnumLogTypeDto.Error,
                 Module = Process.GetCurrentProcess().ProcessName,
                 Msg = msg
-            }).Wait();
+            });
             Serilog.Log.Error(ex, msg);
             Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Error, Msg = msg });
         }

Service/X2D1TaskServer54/X3TaskServer54.csproj

@@ -134,7 +134,7 @@
     <Compile Include="Service\TaskService.cs" />
     <Compile Include="AddIns\时隙获取\SlotHelper.cs" />
     <None Include="packages.config" />
-    <EmbeddedResource Include="Properties\licenses.licx" />
+    <None Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

XdCxRhDW.App/Controllers/LogController.cs

@@ -74,15 +74,16 @@ namespace XdCxRhDW.App.Controllers
                 using (RHDWContext db = new RHDWContext())
                 {
                     var query = db.LogRes.AsQueryable();
-                    if (!string.IsNullOrWhiteSpace(dto.Module))
+                    if (!string.IsNullOrWhiteSpace(dto.Module) && dto.Module != "全部")
                         query = query.Where(p => p.Module == dto.Module);
-                    if (dto.LogTimeBegin != null)
+                    if (dto.LogTimeBegin != null && dto.LogTimeBegin != DateTime.MinValue)
                         query = query.Where(p => p.LogTime >= dto.LogTimeBegin);
-                    if (dto.LogTimeEnd != null)
+                    if (dto.LogTimeEnd != null && dto.LogTimeEnd != DateTime.MinValue)
                         query = query.Where(p => p.LogTime <= dto.LogTimeEnd);
                     var res = await query.OrderBy(p => p.Module).ThenByDescending(t => t.LogTime).ToListAsync();
                     var dtoRes = res.Select(t => new LogInfoDto
                     {
+                        ID = t.ID,
                         LogTime = t.LogTime,
                         LogType = (EnumLogTypeDto)(int)t.LogType,
                         Module = t.Module,
@@ -103,10 +104,10 @@ namespace XdCxRhDW.App.Controllers
                 return Error<List<LogInfoDto>>("日志信息查询异常");
             }
         }
+
         /// <summary>
         /// 获取所有日志模块
         /// </summary>
-        /// <param name="dto">日志查询参数</param>
         /// <returns></returns>
         [HttpPost]
         public async Task<AjaxResult<List<LogModulesResDto>>> GetModules()
@@ -119,7 +120,7 @@ namespace XdCxRhDW.App.Controllers
                     var dtoRes = res.Select(p => new LogModulesResDto()
                     {
                         Module = p
-                    }).OrderBy(p => p).ToList();
+                    }).OrderBy(p => p.Module).ToList();
 
                     return Success(dtoRes);
                 }
@@ -136,5 +137,45 @@ namespace XdCxRhDW.App.Controllers
                 return Error<List<LogModulesResDto>>("日志模块查询异常");
             }
         }
+
+        /// <summary>
+        /// 删除日志
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<AjaxResult> Delete(IEnumerable<LogDeleteDto> dto)
+        {
+            if (dto == null || !dto.Any()) return Success();
+            try
+            {
+                var ids = dto.Select(p => p.ID);
+                using (RHDWContext db = new RHDWContext())
+                {
+                    var delItems = await db.LogRes.Where(p => ids.Contains(p.ID)).ToListAsync();
+                    var delItemsReal = db.LogRes.RemoveRange(delItems);
+                    db.SaveChanges();
+                    await Add(new LogInfoDto()
+                    {
+                        LogTime = DateTime.Now,
+                        LogType = EnumLogTypeDto.Info,
+                        Module = "平台",
+                        Msg = $"用户删除了{delItemsReal.LongCount()}行日志"
+                    });
+                    return Success();
+                }
+
+            }
+            catch (TaskCanceledException)
+            {
+                Serilog.Log.Warning($"日志信息删除超时.共{dto.Count()}条记录");
+                return Error("日志信息删除超时");
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Error(ex, "日志信息删除异常.共{dto.Count()}条记录");
+                return Error("日志信息删除异常");
+            }
+        }
     }
 }

XdCxRhDW.App/Model/LogInfo.cs

@@ -15,6 +15,8 @@ namespace XdCxRhDW.App.Model
             this.LogTime = DateTime.Now;
             this.LogType = EnumLogType.Info;
         }
+        [Display(Name = "ID")]
+        public long ID { get; set; }
 
         [Display(Name = "所属模块")]
         public string Module { get; set; }

XdCxRhDW.App/UserControl/CtrlSvrLog.cs

@@ -38,7 +38,13 @@ namespace XdCxRhDW.App.UserControl
 
         private async void CtrlSvrs_Load(object sender, EventArgs e)
         {
-            gridLog.UseDefault(list).UseEmptyText("无结果").UseExportCsv().UseClear<LogInfo>().SetLogImageColumn(nameof(LogInfo.LogType), typeof(EnumLogType));
+            gridLog.UseDefault(list).UseEmptyText("无结果").UseRowNumber().UseDeleteAsync<LogInfo>(async data =>
+            {
+                var delItems = data.Select(t => new LogDeleteDto(t.ID));
+                var rsp = await HttpHelper.PostRequestAsync(SysConfig.GetUrl("Log/Delete"), delItems);
+                return rsp.code == 200;
+
+            }).UseExportCsv().SetLogImageColumn(nameof(LogInfo.LogType), typeof(EnumLogType));
             gridView1.Columns[nameof(LogInfo.LogType)].MaxWidth = 100;
             gridView1.Columns[nameof(LogInfo.LogTime)].MaxWidth = 160;
             gridView1.Columns[nameof(LogInfo.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
@@ -57,6 +63,7 @@ namespace XdCxRhDW.App.UserControl
         private async void btnQuery_Click(object sender, EventArgs e)
         {
             btnQuery.Enabled = false;
+            this.list.Clear();
             try
             {
                 LogQueryDto dto = new LogQueryDto()
@@ -74,6 +81,7 @@ namespace XdCxRhDW.App.UserControl
                 {
                     var items = res.data.Select(t => new LogInfo()
                     {
+                        ID = t.ID,
                         LogTime = t.LogTime,
                         LogType = (Model.EnumLogType)(int)t.LogType,
                         Module = t.Module,

XdCxRhDw.Dto/LogInfoDto.cs

@@ -20,6 +20,12 @@ namespace XdCxRhDW.Dto
             this.LogTime = DateTime.Now;
             this.LogType = EnumLogTypeDto.Info;
         }
+
+        /// <summary>
+        /// 日志ID
+        /// </summary>
+        public long ID { get; set; }
+
         /// <summary>
         /// 所属模块
         /// </summary>
@@ -51,4 +57,23 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public string Module { get; set; }
     }
+
+    /// <summary>
+    /// 日志删除模型
+    /// </summary>
+    public class LogDeleteDto
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        public LogDeleteDto(long id)
+        {
+            this.ID = id;
+        }
+        /// <summary>
+        /// 日志ID
+        /// </summary>
+        public long ID { get; set; }
+    }
 }

XdCxRhDw.Dto/LogQueryDto.cs

@@ -12,17 +12,17 @@ namespace XdCxRhDW.Dto
     public class LogQueryDto
     {
         /// <summary>
-        /// 模块名称(可空)
+        /// 模块名称(空表示不限制)
         /// </summary>
         public string Module { get; set; }
 
         /// <summary>
-        /// 日志开始时间(空表示从最早开始查询)
+        /// 日志开始时间(空表示不限制)
         /// </summary>
         public DateTime? LogTimeBegin { get; set; }
 
         /// <summary>
-        /// 日志结束时间(空表示查询到末尾)
+        /// 日志结束时间(空表示不限制)
         /// </summary>
         public DateTime? LogTimeEnd { get; set; } 
     }