Merge branch 'master' of http://git.51dayu.com.cn/diamond-cut/SparkClient

App.config

@@ -2,8 +2,8 @@
 <configuration>
     <appSettings>
         <!-- 切工仪URL -->
-        <add key="BaseUrl" value="http://localhost:5000/api/SoC"/>
+        <!-- <add key="BaseUrl" value="http://localhost:5000/api/SoC"/> -->
-        <!-- <add key="BaseUrl" value="http://192.168.3.100:8080"/> -->
+        <add key="BaseUrl" value="http://192.168.3.100:8080"/>
         <!-- SOC下载图片目录 -->
         <add key="ImageFileBasePath" value="D:\diamond_images"/>
         <!-- 算法失败时，历史图片保存文件夹路径 -->

Model/Services/SOCClientService.cs

@@ -180,14 +180,12 @@ namespace SparkClient.Model.Services
                 {
                     // 捕获HTTP请求异常并记录错误信息
                     Logger.Error($"HTTP request failed for URL: {url}, Exception: {ex.Message}");
-                    imageNames.Clear();
                     return imageNames;
                 }
                 catch (Exception ex)
                 {
                     // 捕获其他异常并记录错误信息，结束循环
                     Logger.Error($"An unexpected error occurred for URL: {url}, Exception: {ex.Message}");
-                    imageNames.Clear();
                     return imageNames;
                 }
             }
@@ -255,8 +253,11 @@ namespace SparkClient.Model.Services
 
                 // 读取图片接口
                 List<string> imageNames = await RetrieveImageAsync(savePath);
-                if (imageNames.Count != 0)
+                if (imageNames.Count == 0)
                 {
+                    // 采集状态失败
+                        return new SocResultEntity { Status = StatusCodes.ImageFileReadFailure, Images = new List<string>() };                        
+                }
                 // 采集状态接口
                 string acquisitionStatus = await CollectStatusAsync();
                 // 成功
@@ -265,8 +266,7 @@ namespace SparkClient.Model.Services
                     // 采集状态失败
                     return new SocResultEntity { Status = acquisitionStatus, Images = new List<string>() };                        
                 }
-                }
+                return new SocResultEntity { Status = acquisitionStatus, Images = imageNames, DeviceId = entity.DeviceId};                
-                return new SocResultEntity { Status = StatusCodes.Success, Images = imageNames, DeviceId = entity.DeviceId};                
             }
             catch (Exception e)
             {

Resource/Document/log.txt

@@ -1,34 +1 @@
-[2024-12-05 16:21:22.627] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
+读取完成：404读取完成：404读取完成：404读取完成：404读取完成：404
-[2024-12-05 16:42:38.854] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-05 16:42:49.827] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-05 16:50:48.304] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-05 16:50:56.037] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-05 16:51:04.013] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-05 16:58:31.184] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-12 13:27:06.264] 发生异常: The process cannot access the file 'image_39.bmp' because it is being used by another process.
-[2024-12-18 08:56:09.327] 发生异常: The request was canceled due to the configured HttpClient.Timeout of 100 seconds elapsing.
-[2024-12-18 15:58:22.476] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 16:12:57.999] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 16:13:12.680] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 16:13:20.632] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 16:13:29.227] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 16:13:44.433] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 16:13:59.933] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 16:14:09.063] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 17:03:24.758] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 17:03:50.352] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 17:06:16.074] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 17:06:53.906] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 17:11:04.161] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 17:13:26.174] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-18 17:25:38.182] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 08:50:34.643] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 08:54:45.576] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 10:41:33.529] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 10:45:23.466] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 10:45:35.270] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 16:22:02.662] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 16:22:15.784] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 22:00:52.183] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 22:01:00.827] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)
-[2024-12-19 22:01:33.476] 发生异常: 由于目标计算机积极拒绝，无法连接。 (localhost:5000)

SparkClient.sln.DotSettings.user

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncStreamReader_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4a26a752ec6249c4a090905d31c0cdfa528a0_003F4d_003Fa3eda23d_003FAsyncStreamReader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncStreamReader_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5657934e169f1e03f1713934a999de82e80b02c892c78df9913e46e2e681e_003FAsyncStreamReader_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncTaskMethodBuilder_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F211e6f3b24fa438a92f1815153647ce2c8f908_003F93_003F031cf753_003FAsyncTaskMethodBuilder_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncVoidMethodBuilder_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F211e6f3b24fa438a92f1815153647ce2c8f908_003F18_003Feb00c5a4_003FAsyncVoidMethodBuilder_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABaseUriHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fbfd90ad81939493b96034353abcd1045825908_003Fdc_003Fff55e936_003FBaseUriHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABrushes_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F96a561fe76144633acef44f09d0dcb8a825920_003F7e_003F126cf976_003FBrushes_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>