wyq 2 anni fa
parent
commit
fc9b733aa7
2 ha cambiato i file con 12 aggiunte e 4 eliminazioni
  1. 1 1
      XdCxRhDW.TaskServer/MainForm.cs
  2. 11 3
      XdCxRhDW.TaskServer/Task/X2D1Task.cs

+ 1 - 1
XdCxRhDW.TaskServer/MainForm.cs

@@ -33,7 +33,7 @@ namespace XdCxRhDW.TaskServer
         private async void MainForm_LoadAsync(object sender, EventArgs e)
         {
 
-            //HistoryTaskProcessingController historyTask = new HistoryTaskProcessingController();
+            //HistoryTaskProcessingController historyTask = new HistoryTaskProcessingController(new Service.HistoryTaskService());
             //historyTask.Run(new HistoryTaskProcessingDto());
             var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
             var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();

+ 11 - 3
XdCxRhDW.TaskServer/Task/X2D1Task.cs

@@ -30,9 +30,17 @@ namespace XdCxRhDW.TaskServer.Task
                 while (IsRuning || dto.EndTime.HasValue && dto.EndTime <= DateTime.Now)
                 {
                     string capfile = Path.Combine(dto.CapDir, $"{preTime.ToString(dto.DateDirFormat)}");
-
-                    var files = Directory.EnumerateFiles(capfile, "*.dat");
-
+                    IEnumerable<string> files;
+                    try
+                    {
+                        files = Directory.EnumerateFiles(capfile, "*.dat");
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Info($"查询历史任务:{dto.ID}采集数据异常:{ex.Message}");
+                        Thread.Sleep(1000);
+                        continue;
+                    }
                     var groups = files.Select(f => FileToHistoryFile(f)).GroupBy(m => m.CapTime).OrderBy(m => m.Key);
                     foreach (var item in groups)
                     {