From 30ce6a3233c079c803ae23d7c879e628fdc94f01 Mon Sep 17 00:00:00 2001
From: movingsam <samsu9194@163.com>
Date: Tue, 13 Aug 2024 09:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=A1=88=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoDispathingWork/CloseWorker.cs             |  2 +-
 AutoDispathingWork/Services/SpiderServices.cs | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/AutoDispathingWork/CloseWorker.cs b/AutoDispathingWork/CloseWorker.cs
index 21110bf..7b60c5e 100644
--- a/AutoDispathingWork/CloseWorker.cs
+++ b/AutoDispathingWork/CloseWorker.cs
@@ -57,7 +57,7 @@ public class CloseWorker : BackgroundService
                 foreach (var item in needDispose)
                 {
                     //2.结案操作
-                    var result = await _spiderServices.CloseFile(item.caseNumber, "");
+                    var result = await _spiderServices.CloseFile(item.caseNumber, "",item.address);
                     if (result.IsSuccess)
                     {
                         var message = $"结案成功，任务编号:{item.caseNumber},任务地址:{item.address},任务类型:{item.typeCode}";
diff --git a/AutoDispathingWork/Services/SpiderServices.cs b/AutoDispathingWork/Services/SpiderServices.cs
index 08e028f..241c958 100644
--- a/AutoDispathingWork/Services/SpiderServices.cs
+++ b/AutoDispathingWork/Services/SpiderServices.cs
@@ -264,7 +264,8 @@ public class SpiderServices
             {
                 var msg = $"成功分发任务，任务编号:{caseNumber},任务地址:{cameraName},任务类型:{typeCode},处理人:{userRealName}";
                 var smsService = scope.ServiceProvider.GetRequiredService<WechatRobot>();
-                await smsService.SendText($"{userRealName},您好，您有一条新案件，案件编号{caseNumber}，案件地址{cameraName},请及时处置，谢谢。", false);
+                await smsService.SendText($"{userRealName},您好，您有一条新案件，案件编号{caseNumber}，案件地址{cameraName},请及时处置，谢谢。",
+                    false);
                 _logger.LogInformation(msg);
 
                 return new SpiderResponse<object>()
@@ -288,7 +289,7 @@ public class SpiderServices
 
 
     // api/megcity/v1/events/pass
-    public async Task<SpiderResponse<object>> CloseFile(string caseNumber, string suggestion)
+    public async Task<SpiderResponse<object>> CloseFile(string caseNumber, string suggestion, string address)
     {
         var token = await GetToken();
         using var client = _httpClientFactory.CreateClient();
@@ -317,8 +318,10 @@ public class SpiderServices
             if (spiderRes?.code == 0)
             {
                 _logger.LogInformation("成功结案");
-                _serviceProvider.GetService<SmsService>()?
-                    .SendSmsAsync("13700000000", "您有一条案件已经结案", caseNumber);
+                _serviceProvider.GetService<WechatRobot>()?
+                    .SendText(
+                        $"案件{caseNumber}已经结案,所在位置{address},处理意见{(string.IsNullOrWhiteSpace(suggestion) ? "无" : suggestion)}",
+                        false);
                 return new SpiderResponse<object>()
                 {
                     IsSuccess = true,