src/DataSharing.Host/Controllers/Police110/PoliceDSController.cs

@@ -17,11 +17,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.Net;
 using System.Text;
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Text.Unicode;
 using XF.Domain.Filters;
 using XF.Domain.Repository;
 
@@ -180,7 +176,7 @@ namespace DataSharing.Host.Controllers.Police110
                             IsEnforcementOrder = false,
                             Title = string.Empty,
                             AcceptType = "咨询",
-                            AcceptTypeCode="10"
+                            AcceptTypeCode = "10"
                         };
 
                         bool isSuccess = true;
@@ -391,26 +387,27 @@ namespace DataSharing.Host.Controllers.Police110
                         var listData = await _dsPoliceSendChainAlarmDsRepository.Queryable()
                              .WhereIF(!string.IsNullOrEmpty(openData.StartDate), p => p.CallPoliceTime >= Convert.ToDateTime(openData.StartDate))
                              .WhereIF(!string.IsNullOrEmpty(openData.EndDate), p => p.CallPoliceTime <= Convert.ToDateTime(openData.EndDate))
-                             .Select(p=>new ChainAlarm_DSNewDto {
-                                 LSH=p.SerialNumber,
-                                 JJYBH=p.RegisterNo,
-                                 JJDBH=p.AlarmReceiptNumber,
-                                 BJDH=p.CallPoliceNumber,
-                                 BJDHYHM=p.CallPoliceName,
-                                 LXDH=p.PhoneNumber,
-                                 BJDZ=p.CallPoliceAddress,
-                                 JQLBDM=p.PoliceTypeCode,
-                                 JQLBMC=p.PoliceTypeName,
-                                 BJNR=p.CallPoliceContent,
-                                 GXDWDM=p.JurisdictionalUnitCode,
-                                 GXDWMC=p.JurisdictionalUnitName,
-                                 GXDWDH=p.JurisdictionalUnitNumber,
-                                 BJSJ=p.CallPoliceTime,
-                                 TSSJ=p.PushTime,
-                                 JJDWDM=p.AlarmReceivingUnitCode,
-                                 JJDWMC=p.AlarmReceivingUnitName,
-                                 JJLX=p.AlarmReceptionType,
-                                 XZQHDM=p.AreaCode
+                             .Select(p => new ChainAlarm_DSNewDto
+                             {
+                                 LSH = p.SerialNumber,
+                                 JJYBH = p.RegisterNo,
+                                 JJDBH = p.AlarmReceiptNumber,
+                                 BJDH = p.CallPoliceNumber,
+                                 BJDHYHM = p.CallPoliceName,
+                                 LXDH = p.PhoneNumber,
+                                 BJDZ = p.CallPoliceAddress,
+                                 JQLBDM = p.PoliceTypeCode,
+                                 JQLBMC = p.PoliceTypeName,
+                                 BJNR = p.CallPoliceContent,
+                                 GXDWDM = p.JurisdictionalUnitCode,
+                                 GXDWMC = p.JurisdictionalUnitName,
+                                 GXDWDH = p.JurisdictionalUnitNumber,
+                                 BJSJ = p.CallPoliceTime,
+                                 TSSJ = p.PushTime,
+                                 JJDWDM = p.AlarmReceivingUnitCode,
+                                 JJDWMC = p.AlarmReceivingUnitName,
+                                 JJLX = p.AlarmReceptionType,
+                                 XZQHDM = p.AreaCode
                              })
                              .OrderBy(p => p.BJSJ)
                              .Take(50)
@@ -420,7 +417,7 @@ namespace DataSharing.Host.Controllers.Police110
                             apiR = DaoShuDeResponse<string>.Failed(null);
                         else
                         {
-                            var daoShuDe= DaoShuDeResponse<List<ChainAlarm_DSNewDto>>.Succeed(listData, "调用成功");
+                            var daoShuDe = DaoShuDeResponse<List<ChainAlarm_DSNewDto>>.Succeed(listData, "调用成功");
                             string jsonResultok = ModelToJson(daoShuDe);
                             // 加密：json通过sm4加密转base64
                             string base64ok = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResultok);
@@ -514,9 +511,9 @@ namespace DataSharing.Host.Controllers.Police110
                                  .WhereIF(!string.IsNullOrEmpty(openData.EndDate), p => p.WarehousingTime <= Convert.ToDateTime(openData.EndDate))
                                  .WhereIF(!string.IsNullOrEmpty(openData.AlarmReceiptNumber), p => p.AlarmReceiptNumber == openData.AlarmReceiptNumber)
                                  .Where(p => p.DisposalType == openData.DisposalType)
-                                 .Select(p=>new ChainDeal_DSNewDto
+                                 .Select(p => new ChainDeal_DSNewDto
                                  {
-                                     JJDBH=p.AlarmReceiptNumber,
+                                     JJDBH = p.AlarmReceiptNumber,
                                      FKSJ = p.FeedbackTime,
                                      CJCZQK = p.DisposalSituation,
                                      JQCLJGSM = p.ResultDescription,
@@ -544,7 +541,7 @@ namespace DataSharing.Host.Controllers.Police110
                         {
                             var daoShuDe = DaoShuDeResponse<List<ChainDeal_DSNewDto>>.Succeed(listData, "调用成功");
                             string jsonResultok = ModelToJson(daoShuDe);
-                           
+
                             // 加密：json通过sm4加密转base64
                             string base64ok = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResultok);
                             _logger.LogInformation($"输出：" + $"\r\n\r\nbase64：{base64ok}\r\nJson：{jsonResultok}");
@@ -751,13 +748,13 @@ namespace DataSharing.Host.Controllers.Police110
         /// <returns></returns>
         private async Task InitChainDeal(ChainDeal_DS policeReceiveChainDealDs)
         {
-            var orderData = await _dsOrderRepository.GetAsync(p => p.ExternalId == policeReceiveChainDealDs.AlarmReceiptNumber);
+            var orderData = await _dsPoliceSendChainAlarmDsRepository.GetAsync(p => p.AlarmReceiptNumber == policeReceiveChainDealDs.AlarmReceiptNumber);
             if (orderData is null)
             {
                 //写入对外展示表数据
                 DsReceiveHandleData dsReceive = new()
                 {
-                    OrderNo = orderData.OrderNo,
+                    OrderNo = orderData.OrderId,
                     Source = "110平台",
                     PlatformsName = "110平台",
                     ReceiveData = System.Text.Json.JsonSerializer.Serialize(policeReceiveChainDealDs)
@@ -817,7 +814,7 @@ namespace DataSharing.Host.Controllers.Police110
             {
                 ProvinceOrderVisitDto orderVisitDto = new()
                 {
-                    ProvinceNo = orderData.ProvinceNo,
+                    ProvinceNo = orderData.OrderId,
                     VisitTime = Convert.ToDateTime(policeReceiveChainDealDs.RevisitTime),
                     VisitContent = policeReceiveChainDealDs.VisitContent,
                     //  OrgProcessingResults = policeReceiveChainDealDs.VisitResult,