泸州110海能达对接

NuGet.Config

@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="fengwo.org" value="http://110.188.24.182:5555/v3/index.json" />
+    <add key="fengwo.org" value="http://110.188.24.182:5555/v3/index.json" allowInsecureConnections="true" />
   </packageSources>
 </configuration>

src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -989,6 +989,8 @@ namespace DataSharing.Application.Receivers
         }
         #endregion
 
+        #region 派单是判断需要往第三方推送数据
+
         /// <summary>
         /// 派单是判断需要往第三方推送数据
         /// </summary>
@@ -1031,6 +1033,10 @@ namespace DataSharing.Application.Receivers
             }
         }
 
+        #endregion
+
+        #region 给110推送行政审批工单（自贡独有）
+
         /// <summary>
         /// 给110推送行政审批工单（自贡独有）
         /// </summary>
@@ -1086,5 +1092,7 @@ namespace DataSharing.Application.Receivers
             {
             }
         }
+
+        #endregion
     }
 }

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

@@ -2,6 +2,7 @@
 using DataSharing.Police110.DaoShu110;
 using DataSharing.Police110.Encryption;
 using DataSharing.Police110.HaiNengDa110;
+using DataSharing.Province;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.HotlineSetting;
@@ -11,7 +12,6 @@ using DotNetCore.CAP;
 using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
 using Hotline.Share.Enums.Order;
 using MapsterMapper;
-using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -84,7 +84,7 @@ namespace DataSharing.Host.Controllers.Police110
         /// 工单受理
         /// </summary>
         /// <returns></returns>
-        [HttpPost("api/police/receive/lz12345/orderAccept")]
+        [HttpPost("receive/lz12345/orderAccept")]
         [AllowAnonymous]
         public async Task<OpenResponse> ChainAlarm_Receive()
         {
@@ -240,7 +240,7 @@ namespace DataSharing.Host.Controllers.Police110
         /// 工单办结
         /// </summary>
         /// <returns></returns>
-        [HttpPost("api/police/receive/lz12345/orderEnd")]
+        [HttpPost("receive/lz12345/orderEnd")]
         [AllowAnonymous]
         public async Task<OpenResponse> ChainDeal_Receive()
         {
@@ -314,6 +314,231 @@ namespace DataSharing.Host.Controllers.Police110
 
         #endregion
 
+        #region send-工单受理-已完成---12345将警情工单推送给110
+
+        /// <summary>
+        /// 工单受理
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("send/lz12345/orderAccept")]
+        [AllowAnonymous]
+        public async Task<OpenResponse> ChainAlarm_Send()
+        {
+            //{"startDate":"2023-04-01 10:43:17","endDate":"2023-04-17 10:43:17"}
+            //gzWXSn3A2ZW9u3k9yrHdEqE5zRzto/Rud6LZ6JRJ1k59ou5nWABc8t8fR/sWU89lGweFQMsZkefowEBYzArADnSXjbKwfQj19UoF5RN/0mI=
+            ConfigurationPoliceHND configurationPoliceHND = new();
+
+            //根据不同地市州获取不同的配置信息
+            if (_sharingConfigurationManager.IsCity(ConfigurationConsts.LuZhou))
+                configurationPoliceHND = _sharingConfigurationManager.GetLuZhouConfig().PoliceHND;
+
+            string sm4 = configurationPoliceHND.token3_sm4_mw;
+            var apiR = new HaiNengDaDeResponse<string>();
+            try
+            {
+                // 验证dcsm
+                string dcsmMsg = CheckDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceHND.token3_dcsm);
+                if (!string.IsNullOrEmpty(dcsmMsg))
+                {
+                    apiR = HaiNengDaDeResponse<string>.Failed(dcsmMsg);
+                }
+                else
+                {
+                    OpenData openData = new();
+                    string base64String = await GetStreamBase64(HttpContext.Request);
+                    if (!string.IsNullOrEmpty(base64String))
+                    {
+                        // 解密：base64通过sm4解密转json
+                        string jsonRes = Sm4Crypto.Decrypt_ECB_Base64(sm4, base64String);
+                        if (!string.IsNullOrEmpty(jsonRes))
+                            // json 转 实体类
+                            openData = System.Text.Json.JsonSerializer.Deserialize<OpenData>(jsonRes);
+
+                        //await InitRawData("api/police/send/lz12345/orderAccept", base64String, jsonRes, openData?.AlarmReceiptNumber);
+                    }
+
+                    var listData = await _dsPoliceSendChainAlarmHndRepository.Queryable()
+                         .WhereIF(!string.IsNullOrEmpty(openData.FlowID), p => Convert.ToInt32(p.No) > Convert.ToInt32(openData.FlowID))
+                         .Select(p => new ChainAlarm_HNDNewDto
+                         {
+                             FLOWID = p.No,
+                             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,
+                             SFBM = p.IsSecret,
+                             BJRXBDM = p.FromGender,
+                             Title = p.Title
+                         })
+                         .OrderBy(p => p.JJDBH)
+                         .Take(20)
+                         .ToListAsync();
+
+                    if (null == listData)
+                        apiR = HaiNengDaDeResponse<string>.Failed(null);
+                    else
+                    {
+                        var daoShuDe = HaiNengDaDeResponse<List<ChainAlarm_HNDNewDto>>.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}");
+                        return OpenResponse.Ok(base64ok);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                apiR = HaiNengDaDeResponse<string>.Failed("接口异常");
+            }
+
+            // 返回数据转Json
+            //string jsonResult = ModelToJson(apiR);
+
+            string jsonResult = System.Text.Json.JsonSerializer.Serialize(apiR, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+            jsonResult = System.Text.RegularExpressions.Regex.Unescape(jsonResult);
+            // 加密：json通过sm4加密转base64
+            string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+
+            _logger.LogInformation($"输出：" + $"\r\n\r\nbase64：{base64}\r\nJson：{jsonResult}");
+            return OpenResponse.Ok(base64);
+        }
+
+        #endregion
+
+        #region send-工单办结---12345将110推过来的工单办理结果推送给110
+
+        /// <summary>
+        /// 工单办结
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("send/lz12345/orderEnd")]
+        [AllowAnonymous]
+        public async Task<OpenResponse> ChainDeal_Send()
+        {
+            // 测试JSON
+            // {"JJDBH":"510300202304070001202304070001","CZLX":"1"}
+
+            // 测试Base64
+            // 6RB6Hat8dpBfvCTtEpwotd/MlonxdmqZaa3TcLaua/xcjFv1SZJzKZPrhgsux63Gq/DXxtAQ25buLsI1fgFv3g==
+            ConfigurationPoliceHND configurationPoliceHND = new();
+
+            //根据不同地市州获取不同的配置信息
+            if (_sharingConfigurationManager.IsCity(ConfigurationConsts.LuZhou))
+                configurationPoliceHND = _sharingConfigurationManager.GetLuZhouConfig().PoliceHND;
+
+            string sm4 = configurationPoliceHND.token4_sm4_mw;
+            var apiR = new HaiNengDaDeResponse<string>();
+            try
+            {
+                // 验证dcsm
+                string dcsmMsg = CheckDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceHND.token4_dcsm);
+                if (!string.IsNullOrEmpty(dcsmMsg))
+                {
+                    apiR = HaiNengDaDeResponse<string>.Failed(dcsmMsg);
+                }
+                else
+                {
+                    string base64String = await GetStreamBase64(HttpContext.Request);
+                    OpenData openData = new();
+                    if (!string.IsNullOrEmpty(base64String))
+                    {
+                        // 解密：base64通过sm4解密转json
+                        string jsonRes = Sm4Crypto.Decrypt_ECB_Base64(sm4, base64String);
+                        if (!string.IsNullOrEmpty(jsonRes))
+                            // json 转 实体类
+                            openData = System.Text.Json.JsonSerializer.Deserialize<OpenData>(jsonRes);
+
+                        //await InitRawData("service/api/ds/12345To110/chainDeal", base64String, jsonRes, openData?.AlarmReceiptNumber);
+                    }
+
+                    bool bRun = true;
+
+                    if (openData.DYYY != "1" && openData.DYYY != "2" && openData.DYYY != "3")
+                    {
+                        bRun = false;
+                        apiR = HaiNengDaDeResponse<string>.Failed("【接口调用原因】不符合要求");
+                    }
+
+                    if (bRun)
+                    {
+                        var listData = await _dsPoliceSendChainDealHndRepository.Queryable()
+                                 .WhereIF(!string.IsNullOrEmpty(openData.FlowID), p => Convert.ToInt32(p.No) > Convert.ToInt32(openData.FlowID))
+                                 .Where(p => p.DisposalType == openData.DYYY)
+                                 .Select(p => new ChainDeal_HNDNewDto
+                                 {
+                                     FLOWID = p.No,
+                                     JJDBH = p.AlarmReceiptNumber,
+                                     FKSJ = p.FeedbackTime,
+                                     CJCZQK = p.DisposalSituation,
+                                     JQCLJGSM = p.ResultDescription,
+                                     FKYBH = p.FeedbackPersonNumber,
+                                     FKYXM = p.FeedbackPersonName,
+                                     FKDWDM = p.FeedbackUnitCode,
+                                     FKDWMC = p.FeedbackUnitName,
+                                     TSSJ = p.WarehousingTime,
+                                     HFSJ = p.RevisitTime,
+                                     DHHFHSQK = p.CheckingContent,
+                                     CLJGDM = p.VisitResult,
+                                     CLJGMC = p.VisitContent,
+                                     HANDLEUSERNAME = p.ReturnName,
+                                     HANDLEBMNAME = p.ReturnUnit,
+                                     HANDLEOPINION = p.ReturnOpinion,
+                                     HANDLETIME = p.ReturnTime,
+                                     DYYY = p.DisposalType
+                                 })
+                                 .OrderBy(p => p.JJDBH)
+                                 .Take(20)
+                                 .ToListAsync();
+
+                        if (null == listData)
+                            apiR = HaiNengDaDeResponse<string>.Failed(null);
+                        else
+                        {
+                            var daoShuDe = HaiNengDaDeResponse<List<ChainDeal_HNDNewDto>>.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}");
+                            return OpenResponse.Ok(base64ok);
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                apiR = HaiNengDaDeResponse<string>.Failed("接口异常");
+            }
+
+            // 返回数据转Json
+            //string jsonResult = ModelToJson(apiR);
+            string jsonResult = System.Text.Json.JsonSerializer.Serialize(apiR, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+            jsonResult = System.Text.RegularExpressions.Regex.Unescape(jsonResult);
+            // 加密：json通过sm4加密转base64
+            string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+            _logger.LogInformation($"输出：" + $"\r\n\r\nbase64：{base64}\r\nJson：{jsonResult}");
+
+            return OpenResponse.Ok(base64);
+        }
+
+        #endregion
+
         #region 私有方法
 
         #region 工单办结

src/DataSharing.Host/StartupExtensions.cs

@@ -4,6 +4,7 @@ using DataSharing.LuZhou.LuZhou110;
 using DataSharing.Police110;
 using DataSharing.Police110.DaoShu110;
 using DataSharing.Police110.DCJT110;
+using DataSharing.Police110.HaiNengDa110;
 using DataSharing.Repository.Extensions;
 using DataSharing.SendTask;
 using DataSharing.YiBin.Enterprise;
@@ -69,7 +70,7 @@ internal static class StartupExtensions
         else if (sharingConfig != null && sharingConfig.CityCode == ConfigurationConsts.LuZhou)//泸州
         {
             services.AddScoped<ISendTaskDataService, DataSharing.LuZhou.LuZhouSendTaskDataService>();
-             services.AddScoped<IPoliceService, DaoShuService>();//110 
+             services.AddScoped<IPoliceService, HndService>();//110 
             services.AddScoped<ICityStateDataExchangeService, CityStateDataExchangeService>();//市州互转
             services.AddScoped<ILuZhou110Service, LuZhou110Service>();//泸州110
         }

src/DataSharing.Host/config/appsettings.Development.json

@@ -321,46 +321,46 @@
         "SendDataAddress": "http://59.213.83.7:8123"
       },
 
-      //110对接--大成均图
-      "PoliceDCJT": {
-        "GXDWDM": "510300000000",
-        "GXDWMC": "自贡市公安局",
-        "GXDWDH": "0813110",
-        //1、非警情分流推送服务_自贡
+      //110对接--海能达
+      "PoliceHND": {
+        "GXDWDM": "",
+        "GXDWMC": "",
+        "GXDWDH": "",
+        //1、110To12345非警情工单推送服务_泸州市
         //   receive-工单受理
-        "token1_token": "bada6a9c72a999bb898d7a59a972ad07",
-        "token1_dcsm": "8f3c9b13cbc1c657141d16820241c29e409fce6e6de0aa57d35e502b21c86787ea524983d6128963428f157521048a7a0b08dbe42d6331b49438a984f3af5a2c",
-        "token1_sm2_public": "lQJMKgYVUBEgTkGuuL/zG4b2b21uGvhNTfkDKC35oLNHY0+kKxt7spm+eI4qILl35tdQUFRWrzR2N8EGI1wMQQ==",
-        "token1_sm2_private": "LLorycLfinuSi7wo7+6xxBGY+MzX0x4sUVjsdQ9aKcI=",
-        "token1_sm4": "BK7+c6b8b54CYRkYKBXC50kFKRaPZRHbILzjGW4D21mR0BU2NcTRcTdhtY0fSTu0Vj3nkinTGSpP83FbGpmwAWYwXhOKy4fxbMKYkmbM0rTC0ROcy4QdugfPu0qwWbteeYkB4DNlqdQXqG34tmhMhbk=",
-        "token1_sm4_mw": "f648198789274a5d",
-
-        //4、警务警情分流推送服务_自贡
+        "token1_token": "0f618c93ef9ed78893b89c9bb96afb3b",
+        "token1_dcsm": "2c46129f7aaa5e4e5a67cc5480e998c6559de2226d8eb25aecf1f82c7a250b5a5989c45d4c14a40f43dc4fd67c51174f74e61c6030d3e2dc4a5a3d751015744a",
+        "token1_sm2_public": "PD4s4mSsVUkBp8+0S/f1W3w+XHixZhD46tYy+i+E6IuS7dr0rrNGaXRxHQXDYNkrGh07X6poiaTsr5yVoOy59Q==",
+        "token1_sm2_private": "qc2I3iC4+XNIhBCFwgMzyY90Rub8Nevvkn5VO81KRM4=",
+        "token1_sm4": "BOhXRjBPDG01dhEu4JhfYLF+smG+9VkpqzbK29lwKhAnq7Euzg/Q9arTq+0MfbFHpe5LmbMYMKLoCjm0vV1H6G0b8ikCI0G1HSVf4+kl1Ln6DRuYT5FrXPdDN9KXKQquhoMj5nbUNZ3MvLzuPYqP8ss=",
+        "token1_sm4_mw": "9288339614909d07",
+
+        //2、110To12345警情结果查询服务_泸州市
         //   receive-工单办结
-        "token4_token": "09b6a9b17ffeb5bb095f0838e84a8fba",
-        "token4_dcsm": "aaab2cbfe5d26d33e12877532bbeb8bb23ac4a0ac3263ad86853cb4057a18219f68c1df1cdc8cf8c48a73a84d5702bfd0497b13b89de8a6d6c7ed8ce732b01aa",
-        "token4_sm2_public": "OYYK5ZWip+5JxFG2RS68mqNLVaiyhH0FpLwhXkEZ1EPU8DB1BdpkXBwDtqA/JAIBZYA2d3BU4yZsHhIJphQe1g==",
-        "token4_sm2_private": "g4ZQ0jxiKkESIsZhUfPhDPtDjTClKUpBEzBxiiik94I=",
-        "token4_sm4": "BKXb5pl2iP5UcYgfhN3SS6VbPJwqxF6dtcQM374vuoQOg1kxE2kBli635PGWFEkj9Wsx3E8vtHpbZ70AWQD/ccwzhNs49TokhhEUTldYcA6AgHGzDxAVuU8ntjF5+JMwFmEXxQQvNekz/pSU39FyaCg=",
-        "token4_sm4_mw": "031d622715f70b73",
-
-        //3、警务警情分流查询服务_自贡
+        "token2_token": "aa99d9caaba549ec5899588a9a3b8cba",
+        "token2_dcsm": "ab72cff222b753f20e4490f5d54df27592183db102ecee07cd4347888128f55a07169905aa5a8aaf836f727fdd5d034dd0a71991eebb921c044fe24fbf6de408",
+        "token2_sm2_public": "MZuNf+aHITp5FW8aixY/IanFxeTPmVJpnlJTkZtNB5SMWlnQPk65UXeh9gPiVauZd3UK4zFOmaLR8cUdhEGZxw==",
+        "token2_sm2_private": "WDr5r0/4Rnx6ZPowsVlv9ln60EThIUe+kiZZbCy91SI=",
+        "token2_sm4": "BFLZ2wVnIC+7M0a/GydXF8pGtG6OlJkFhYtaS9Fqp4p+kiK44xxUfdHCIntt+iD+wa8l4Yrjs+DqlYDeWdmQyUfqikKXhQ7pe98mMYba+k4E1To8bKmrAtJpa586mNYRm193nBJ8kkcoKbtTgJx/+Cw=",
+        "token2_sm4_mw": "9bec2e8d9f726760",
+
+        //3、获取12345系统推送到110系统的警情信息_泸州市
         //   send-工单受理
-        "token3_token": "8885591a4806298a9490b9996a7db852",
-        "token3_dcsm": "4d5f1111a3a2eeaa62ba7f66106826b10b933e7f91148ad0729cd4942284b00eb3594300080a0b3b10f498c1dc29702a4e9975e2b2e7d36730661ff7cbe67cbd",
-        "token3_sm2_public": "bY3NNUQvgAUU5vAEJIUs72AmEFiz16whcjllvGZ+AFPsXVORLBpOXM9AtAD9tsAKRbc+EKuC6+Agjii+zcvrrA==",
-        "token3_sm2_private": "CCVxR/Zzzdp8YHFuDG//Ii6PPFV80xNkBTSIfwVAZKI=",
-        "token3_sm4": "BEJTmlXmmz5Ya7fIsUaxvwvxZkNgtQehgTHwg2ry9WvX5gVbpqoAqjPaa4L0MEr34WhP27b2OkAmCbUiBqEjHaXnhCeGaVhrsSUS5F8jErjdPiwLaOBdznZ0stgUM2iroiMMJ3ly8jwgdzXTcOXrYWY=",
-        "token3_sm4_mw": "83ccd61c6347fc3e",
-
-        //2、非警情分流查询服务_自贡
+        "token3_token": "0f618c93ef9ed78893b89c9bb96afb3b",
+        "token3_dcsm": "2c46129f7aaa5e4e5a67cc5480e998c6559de2226d8eb25aecf1f82c7a250b5a5989c45d4c14a40f43dc4fd67c51174f74e61c6030d3e2dc4a5a3d751015744a",
+        "token3_sm2_public": "PD4s4mSsVUkBp8+0S/f1W3w+XHixZhD46tYy+i+E6IuS7dr0rrNGaXRxHQXDYNkrGh07X6poiaTsr5yVoOy59Q==",
+        "token3_sm2_private": "qc2I3iC4+XNIhBCFwgMzyY90Rub8Nevvkn5VO81KRM4=",
+        "token3_sm4": "BOhXRjBPDG01dhEu4JhfYLF+smG+9VkpqzbK29lwKhAnq7Euzg/Q9arTq+0MfbFHpe5LmbMYMKLoCjm0vV1H6G0b8ikCI0G1HSVf4+kl1Ln6DRuYT5FrXPdDN9KXKQquhoMj5nbUNZ3MvLzuPYqP8ss=",
+        "token3_sm4_mw": "9288339614909d07",
+
+        //4、获取110系统推送的非警务警情在12345系统里的处置情况_泸州市
         //   send-工单办结
-        "token2_token": "8b0781faefaaa9b0aa68bb86bd89e707",
-        "token2_dcsm": "25d38cdc5425925402a1a0eecd7710f27c72000b53b2455d2fe18b4d05ab72e708f67cf76db6189582d5de0624b185eb3b7137a9c9f7a97c1337a6c22256b902",
-        "token2_sm2_public": "H6ah9BfDoljorFrBHq0OO5yf/RHyOl5ymg6Cq9A7WM0L2zvilubeUoAh0QmXDhf9R1+RQXJx6H7nmNeid7F4Jg==",
-        "token2_sm2_private": "i7OvIClxbVQcYCZN9Yt6AGFxk9rTEc8meMgeBsBz/Us=",
-        "token2_sm4": "BAUonoV323NiorKanUIYbDitrypu+HHYhq9m/bova/I2RaWm08uIMbpjSaEFbSqyGzn+2Iot8977du6BmJ5V9wivAvAk+k3PyIINOJgkoSJCPVirJeBZNgtvqYVUpyXWihCYTMAR9gjHggx6KXDh718=",
-        "token2_sm4_mw": "8b086445fca73abc",
+        "token4_token": "0f618c93ef9ed78893b89c9bb96afb3b",
+        "token4_dcsm": "2c46129f7aaa5e4e5a67cc5480e998c6559de2226d8eb25aecf1f82c7a250b5a5989c45d4c14a40f43dc4fd67c51174f74e61c6030d3e2dc4a5a3d751015744a",
+        "token4_sm2_public": "PD4s4mSsVUkBp8+0S/f1W3w+XHixZhD46tYy+i+E6IuS7dr0rrNGaXRxHQXDYNkrGh07X6poiaTsr5yVoOy59Q==",
+        "token4_sm2_private": "qc2I3iC4+XNIhBCFwgMzyY90Rub8Nevvkn5VO81KRM4=",
+        "token4_sm4": "BOhXRjBPDG01dhEu4JhfYLF+smG+9VkpqzbK29lwKhAnq7Euzg/Q9arTq+0MfbFHpe5LmbMYMKLoCjm0vV1H6G0b8ikCI0G1HSVf4+kl1Ln6DRuYT5FrXPdDN9KXKQquhoMj5nbUNZ3MvLzuPYqP8ss=",
+        "token4_sm4_mw": "9288339614909d07",
 
         //5、从公安网侧获取12345政务服务热线平台知识库列表
         //   send-知识库列表

src/DataSharing.Host/config/appsettings.json

@@ -320,46 +320,46 @@
         "IsSend": true
       },
 
-      //110对接--大成均图
-      "PoliceDCJT": {
-        "GXDWDM": "510300000000",
-        "GXDWMC": "自贡市公安局",
-        "GXDWDH": "0813110",
-        //1、非警情分流推送服务_自贡
+      //110对接--海能达
+      "PoliceHND": {
+        "GXDWDM": "",
+        "GXDWMC": "",
+        "GXDWDH": "",
+        //1、110To12345非警情工单推送服务_泸州市
         //   receive-工单受理
-        "token1_token": "bada6a9c72a999bb898d7a59a972ad07",
-        "token1_dcsm": "8f3c9b13cbc1c657141d16820241c29e409fce6e6de0aa57d35e502b21c86787ea524983d6128963428f157521048a7a0b08dbe42d6331b49438a984f3af5a2c",
-        "token1_sm2_public": "lQJMKgYVUBEgTkGuuL/zG4b2b21uGvhNTfkDKC35oLNHY0+kKxt7spm+eI4qILl35tdQUFRWrzR2N8EGI1wMQQ==",
-        "token1_sm2_private": "LLorycLfinuSi7wo7+6xxBGY+MzX0x4sUVjsdQ9aKcI=",
-        "token1_sm4": "BK7+c6b8b54CYRkYKBXC50kFKRaPZRHbILzjGW4D21mR0BU2NcTRcTdhtY0fSTu0Vj3nkinTGSpP83FbGpmwAWYwXhOKy4fxbMKYkmbM0rTC0ROcy4QdugfPu0qwWbteeYkB4DNlqdQXqG34tmhMhbk=",
-        "token1_sm4_mw": "f648198789274a5d",
-
-        //4、警务警情分流推送服务_自贡
+        "token1_token": "0f618c93ef9ed78893b89c9bb96afb3b",
+        "token1_dcsm": "2c46129f7aaa5e4e5a67cc5480e998c6559de2226d8eb25aecf1f82c7a250b5a5989c45d4c14a40f43dc4fd67c51174f74e61c6030d3e2dc4a5a3d751015744a",
+        "token1_sm2_public": "PD4s4mSsVUkBp8+0S/f1W3w+XHixZhD46tYy+i+E6IuS7dr0rrNGaXRxHQXDYNkrGh07X6poiaTsr5yVoOy59Q==",
+        "token1_sm2_private": "qc2I3iC4+XNIhBCFwgMzyY90Rub8Nevvkn5VO81KRM4=",
+        "token1_sm4": "BOhXRjBPDG01dhEu4JhfYLF+smG+9VkpqzbK29lwKhAnq7Euzg/Q9arTq+0MfbFHpe5LmbMYMKLoCjm0vV1H6G0b8ikCI0G1HSVf4+kl1Ln6DRuYT5FrXPdDN9KXKQquhoMj5nbUNZ3MvLzuPYqP8ss=",
+        "token1_sm4_mw": "9288339614909d07",
+
+        //2、110To12345警情结果查询服务_泸州市
         //   receive-工单办结
-        "token4_token": "09b6a9b17ffeb5bb095f0838e84a8fba",
-        "token4_dcsm": "aaab2cbfe5d26d33e12877532bbeb8bb23ac4a0ac3263ad86853cb4057a18219f68c1df1cdc8cf8c48a73a84d5702bfd0497b13b89de8a6d6c7ed8ce732b01aa",
-        "token4_sm2_public": "OYYK5ZWip+5JxFG2RS68mqNLVaiyhH0FpLwhXkEZ1EPU8DB1BdpkXBwDtqA/JAIBZYA2d3BU4yZsHhIJphQe1g==",
-        "token4_sm2_private": "g4ZQ0jxiKkESIsZhUfPhDPtDjTClKUpBEzBxiiik94I=",
-        "token4_sm4": "BKXb5pl2iP5UcYgfhN3SS6VbPJwqxF6dtcQM374vuoQOg1kxE2kBli635PGWFEkj9Wsx3E8vtHpbZ70AWQD/ccwzhNs49TokhhEUTldYcA6AgHGzDxAVuU8ntjF5+JMwFmEXxQQvNekz/pSU39FyaCg=",
-        "token4_sm4_mw": "031d622715f70b73",
-
-        //3、警务警情分流查询服务_自贡
+        "token2_token": "aa99d9caaba549ec5899588a9a3b8cba",
+        "token2_dcsm": "ab72cff222b753f20e4490f5d54df27592183db102ecee07cd4347888128f55a07169905aa5a8aaf836f727fdd5d034dd0a71991eebb921c044fe24fbf6de408",
+        "token2_sm2_public": "MZuNf+aHITp5FW8aixY/IanFxeTPmVJpnlJTkZtNB5SMWlnQPk65UXeh9gPiVauZd3UK4zFOmaLR8cUdhEGZxw==",
+        "token2_sm2_private": "WDr5r0/4Rnx6ZPowsVlv9ln60EThIUe+kiZZbCy91SI=",
+        "token2_sm4": "BFLZ2wVnIC+7M0a/GydXF8pGtG6OlJkFhYtaS9Fqp4p+kiK44xxUfdHCIntt+iD+wa8l4Yrjs+DqlYDeWdmQyUfqikKXhQ7pe98mMYba+k4E1To8bKmrAtJpa586mNYRm193nBJ8kkcoKbtTgJx/+Cw=",
+        "token2_sm4_mw": "9bec2e8d9f726760",
+
+        //3、获取12345系统推送到110系统的警情信息_泸州市
         //   send-工单受理
-        "token3_token": "8885591a4806298a9490b9996a7db852",
-        "token3_dcsm": "4d5f1111a3a2eeaa62ba7f66106826b10b933e7f91148ad0729cd4942284b00eb3594300080a0b3b10f498c1dc29702a4e9975e2b2e7d36730661ff7cbe67cbd",
-        "token3_sm2_public": "bY3NNUQvgAUU5vAEJIUs72AmEFiz16whcjllvGZ+AFPsXVORLBpOXM9AtAD9tsAKRbc+EKuC6+Agjii+zcvrrA==",
-        "token3_sm2_private": "CCVxR/Zzzdp8YHFuDG//Ii6PPFV80xNkBTSIfwVAZKI=",
-        "token3_sm4": "BEJTmlXmmz5Ya7fIsUaxvwvxZkNgtQehgTHwg2ry9WvX5gVbpqoAqjPaa4L0MEr34WhP27b2OkAmCbUiBqEjHaXnhCeGaVhrsSUS5F8jErjdPiwLaOBdznZ0stgUM2iroiMMJ3ly8jwgdzXTcOXrYWY=",
-        "token3_sm4_mw": "83ccd61c6347fc3e",
-
-        //2、非警情分流查询服务_自贡
+        "token3_token": "0f618c93ef9ed78893b89c9bb96afb3b",
+        "token3_dcsm": "2c46129f7aaa5e4e5a67cc5480e998c6559de2226d8eb25aecf1f82c7a250b5a5989c45d4c14a40f43dc4fd67c51174f74e61c6030d3e2dc4a5a3d751015744a",
+        "token3_sm2_public": "PD4s4mSsVUkBp8+0S/f1W3w+XHixZhD46tYy+i+E6IuS7dr0rrNGaXRxHQXDYNkrGh07X6poiaTsr5yVoOy59Q==",
+        "token3_sm2_private": "qc2I3iC4+XNIhBCFwgMzyY90Rub8Nevvkn5VO81KRM4=",
+        "token3_sm4": "BOhXRjBPDG01dhEu4JhfYLF+smG+9VkpqzbK29lwKhAnq7Euzg/Q9arTq+0MfbFHpe5LmbMYMKLoCjm0vV1H6G0b8ikCI0G1HSVf4+kl1Ln6DRuYT5FrXPdDN9KXKQquhoMj5nbUNZ3MvLzuPYqP8ss=",
+        "token3_sm4_mw": "9288339614909d07",
+
+        //4、获取110系统推送的非警务警情在12345系统里的处置情况_泸州市
         //   send-工单办结
-        "token2_token": "8b0781faefaaa9b0aa68bb86bd89e707",
-        "token2_dcsm": "25d38cdc5425925402a1a0eecd7710f27c72000b53b2455d2fe18b4d05ab72e708f67cf76db6189582d5de0624b185eb3b7137a9c9f7a97c1337a6c22256b902",
-        "token2_sm2_public": "H6ah9BfDoljorFrBHq0OO5yf/RHyOl5ymg6Cq9A7WM0L2zvilubeUoAh0QmXDhf9R1+RQXJx6H7nmNeid7F4Jg==",
-        "token2_sm2_private": "i7OvIClxbVQcYCZN9Yt6AGFxk9rTEc8meMgeBsBz/Us=",
-        "token2_sm4": "BAUonoV323NiorKanUIYbDitrypu+HHYhq9m/bova/I2RaWm08uIMbpjSaEFbSqyGzn+2Iot8977du6BmJ5V9wivAvAk+k3PyIINOJgkoSJCPVirJeBZNgtvqYVUpyXWihCYTMAR9gjHggx6KXDh718=",
-        "token2_sm4_mw": "8b086445fca73abc",
+        "token4_token": "0f618c93ef9ed78893b89c9bb96afb3b",
+        "token4_dcsm": "2c46129f7aaa5e4e5a67cc5480e998c6559de2226d8eb25aecf1f82c7a250b5a5989c45d4c14a40f43dc4fd67c51174f74e61c6030d3e2dc4a5a3d751015744a",
+        "token4_sm2_public": "PD4s4mSsVUkBp8+0S/f1W3w+XHixZhD46tYy+i+E6IuS7dr0rrNGaXRxHQXDYNkrGh07X6poiaTsr5yVoOy59Q==",
+        "token4_sm2_private": "qc2I3iC4+XNIhBCFwgMzyY90Rub8Nevvkn5VO81KRM4=",
+        "token4_sm4": "BOhXRjBPDG01dhEu4JhfYLF+smG+9VkpqzbK29lwKhAnq7Euzg/Q9arTq+0MfbFHpe5LmbMYMKLoCjm0vV1H6G0b8ikCI0G1HSVf4+kl1Ln6DRuYT5FrXPdDN9KXKQquhoMj5nbUNZ3MvLzuPYqP8ss=",
+        "token4_sm4_mw": "9288339614909d07",
 
         //5、从公安网侧获取12345政务服务热线平台知识库列表
         //   send-知识库列表

src/DataSharing.Police110/HaiNengDa110/DsPoliceSendChainAlarmHnd.cs

@@ -150,10 +150,16 @@ namespace DataSharing.Police110.HaiNengDa110
         [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(50)")]
         public string AreaCode { get; set; }
 
+        /// <summary>
+        /// 工单ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工单ID", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string OrderId { get; set; }
+
         /// <summary>
         /// 工单编号
         /// </summary>
         [SugarColumn(ColumnDescription = "工单编号", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string OrderId { get; set; }
+        public string No { get; set; }
     }
 }

src/DataSharing.Police110/HaiNengDa110/DsPoliceSendChainDealHnd.cs

@@ -10,11 +10,17 @@ namespace DataSharing.Police110.HaiNengDa110
     [Description(" 海能达办理结果表-发送")]
     public class DsPoliceSendChainDealHnd : CreationModificationEntity
     {
+        /// <summary>
+        /// 工单ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工单ID", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string OrderId { get; set; }
+
         /// <summary>
         /// 工单编号
         /// </summary>
         [SugarColumn(ColumnDescription = "工单编号", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string OrderId { get; set; }
+        public string No { get; set; }
 
         /// <summary>
         /// 接警单编号

src/DataSharing.Police110/HaiNengDa110/HndService.cs

@@ -64,7 +64,7 @@ namespace DataSharing.Police110.HaiNengDa110
                 if (!string.IsNullOrEmpty(orderDto.AcceptorId))
                     registerNo = orderDto.AcceptorId.Substring(orderDto.AcceptorId.Length - 6);
             }
-            var Content = orderDto.Content.Length > 1900 ? orderDto.Content.Substring(0, 300) : orderDto.Content;
+            var Content = orderDto.Content.Length > 1900 ? orderDto.Content.Substring(0, 1900) : orderDto.Content;
             var policeTypeCode = "01";
             if (!string.IsNullOrEmpty(orderDto.HotspotId))
                 policeTypeCode = orderDto.HotspotId.Length > 8 ? orderDto.HotspotId.Substring(0, 7) : orderDto.HotspotId;
@@ -91,7 +91,8 @@ namespace DataSharing.Police110.HaiNengDa110
                 AlarmReceptionType = "0",
                 AreaCode = orderDto.AreaCode.Substring(0, 6),
                 CallPoliceAddress = orderDto.FullAddress,
-                OrderId = orderDto.Id
+                OrderId = orderDto.Id,
+                No = orderDto.No
             };
 
             policeSend.FromGender = orderDto.FromGender switch
@@ -110,37 +111,37 @@ namespace DataSharing.Police110.HaiNengDa110
 
             //这里网泸州110待推送表写入数据
             #region 接受数据汇聚 工单基础信息
-            var order = orderDto;
-            var gender = "";
-            if (order.FromGender == EGender.Female)
-                gender = "女";
-            if (order.FromGender == EGender.Male)
-                gender = "男";
-            LZ110ZBasicInfoDto basicInfoDto = new LZ110ZBasicInfoDto()
-            {
-                FlowID = order.Id,
-                Code = order.No,
-                PoliceCode = order.ExternalId,
-                AreaName = order.AreaCode.Substring(0, 6),
-                AddDate = order.CreationTime.ToString("yyyy/MM/dd HH:mm:ss"),
-                FromTel = order.FromPhone,
-                CallerName = order.FromName,
-                Gender = gender,
-                ContactTel = order.Contact,
-                IDCard = order.LicenceNo,
-                TelHome = "",
-                Address = order.Province + order.City + order.County + order.Street,
-                WorkUnit = "",
-                Title = order.Title,
-                PurTypeName = order.AcceptType,
-                FromName = order.SourceChannel,
-                ConTypeName = order.HotspotSpliceName,
-                Content = order.Content,
-                IsSecrecy = order.IsSecret == true ? "1" : "0"
-            };
-            var GDJCXXInfoObject = EncryptHandler.AES(basicInfoDto);
-
-            await InitSendData(order.Id, order.No, "1", LZ110Defaults.InteractiveBasicInfo, JsonConvert.SerializeObject(basicInfoDto), JsonConvert.SerializeObject(GDJCXXInfoObject), cancellationToken);
+            //var order = orderDto;
+            //var gender = "";
+            //if (order.FromGender == EGender.Female)
+            //    gender = "女";
+            //if (order.FromGender == EGender.Male)
+            //    gender = "男";
+            //LZ110ZBasicInfoDto basicInfoDto = new LZ110ZBasicInfoDto()
+            //{
+            //    FlowID = order.Id,
+            //    Code = order.No,
+            //    PoliceCode = order.ExternalId,
+            //    AreaName = order.AreaCode.Substring(0, 6),
+            //    AddDate = order.CreationTime.ToString("yyyy/MM/dd HH:mm:ss"),
+            //    FromTel = order.FromPhone,
+            //    CallerName = order.FromName,
+            //    Gender = gender,
+            //    ContactTel = order.Contact,
+            //    IDCard = order.LicenceNo,
+            //    TelHome = "",
+            //    Address = order.Province + order.City + order.County + order.Street,
+            //    WorkUnit = "",
+            //    Title = order.Title,
+            //    PurTypeName = order.AcceptType,
+            //    FromName = order.SourceChannel,
+            //    ConTypeName = order.HotspotSpliceName,
+            //    Content = order.Content,
+            //    IsSecrecy = order.IsSecret == true ? "1" : "0"
+            //};
+            //var GDJCXXInfoObject = EncryptHandler.AES(basicInfoDto);
+
+            //await InitSendData(order.Id, order.No, "1", LZ110Defaults.InteractiveBasicInfo, JsonConvert.SerializeObject(basicInfoDto), JsonConvert.SerializeObject(GDJCXXInfoObject), cancellationToken);
             #endregion
 
             //查询是否有此工单，如果没有新增此工单
@@ -157,107 +158,7 @@ namespace DataSharing.Police110.HaiNengDa110
         public async Task InitPoliceSendChainDealAsync(OrderFlowDto dto, CancellationToken cancellationToken)
         {
             var order = dto.Order;
-            //工单流转办理
-            //工单延期申请
-            //工单办理结果
-            //工单办理状态
             var checkData = await _policeSendChainDealHndRepository.AnyAsync(p => p.AlarmReceiptNumber == order.ExternalId && p.DisposalType == "2", cancellationToken);
-            #region 接受数据 工单流转信息
-            var nodeName = "派单组";
-            var nodeType = "2";
-            if (!string.IsNullOrEmpty(order.ActualHandleOrgName) && order.ActualHandleOrgName != "001")
-            {
-                if (order.ActualHandleOrgName.Length == 6)
-                {
-                    nodeName = "一级部门受理";
-                    nodeType = "4";
-                }
-                else if (order.ActualHandleOrgName.Length == 9)
-                {
-                    nodeName = "二级部门办理";
-                    nodeType = "4";
-                }
-                else if (order.ActualHandleOrgName.Length == 12)
-                {
-                    nodeName = "三级部门办理";
-                    nodeType = "4";
-                }
-            }
-
-            LZ110ZFlowedDto flowedDto = new LZ110ZFlowedDto()
-            {
-                RunID = dto.WorkflowTrace.Id,
-                FlowID = order.Id,
-                Code = order.No,
-                NodeName = nodeName,
-                NodeType = nodeType,
-                HandleBMName = order.ActualHandleOrgName,
-                HandleUserName = order.ActualHandlerName,
-                HandleTime = order.ActualHandleTime.HasValue == true ? order.ActualHandleTime.Value.ToString("yyyy/MM/dd HH:mm:ss") : DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"),
-                HandleOpinion = order.ActualOpinion,
-                IsPolice = "0",
-                PoliceCode = order.ExternalId,
-                HandleState = string.Empty
-            };
-
-            var GdblztInfoObject = EncryptHandler.AES(flowedDto);
-            await InitSendData(order.Id, order.No, "1", LZ110Defaults.InteractiveFlowed, JsonConvert.SerializeObject(flowedDto), JsonConvert.SerializeObject(GdblztInfoObject), cancellationToken);
-            #endregion
-
-            #region 接受数据 工单办理结果
-
-            LZ110ZHandResultDto handResultDto = new LZ110ZHandResultDto()
-            {
-                Code = order.No,
-                HandleUserName = order.ActualHandlerName,
-                HandleBMName = order.ActualHandleOrgName,
-                HandleTime = order.FiledTime.HasValue == true ? order.FiledTime.Value.ToString("yyyy/MM/dd HH:mm:ss") : DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"),
-                HandleOpinion = order.FileOpinion,
-                HandleState = checkData != null ? "2" : "1",
-                PoliceCode = order.ExternalId,
-            };
-
-            var GDBLJGInfoObject = EncryptHandler.AES(handResultDto);
-            await InitSendData(order.Id, order.No, "1", LZ110Defaults.InteractiveHandResult, JsonConvert.SerializeObject(handResultDto), JsonConvert.SerializeObject(GDBLJGInfoObject), cancellationToken);
-
-            #endregion
-
-            #region 接受数据 工单办理状态
-            LZ110ZUpdateStatusDto updateStatusDto = new LZ110ZUpdateStatusDto()
-            {
-                Code = order.No,
-                FlowID = order.Id,
-                PoliceCode = order.ExternalId,
-                HandleState = checkData != null ? "3" : "5",
-            };
-            var GDBLZTInfoObject = EncryptHandler.AES(updateStatusDto);
-            await InitSendData(order.Id, order.No, "1", LZ110Defaults.InteractiveUpdateStatus, JsonConvert.SerializeObject(updateStatusDto), JsonConvert.SerializeObject(GDBLZTInfoObject), cancellationToken);
-
-            #endregion
-
-            #region 接受数据 工单延期申请
-            if (dto.OrderSearchDelay != null)
-            {
-                var orderSearchDelay = dto.OrderSearchDelay;
-                LZ110ZExtensionRequestDto extensionRequestDto = new LZ110ZExtensionRequestDto()
-                {
-                    FlowID = order.Id,
-                    Code = order.No,
-                    ApplyBMName = orderSearchDelay.ApplyOrgName,
-                    ApplyUserName = orderSearchDelay.EmployeeName,
-                    ApplyTime = orderSearchDelay.ApplyDelayTime.ToString("yyyy/MM/dd HH:mm:ss"),
-                    ApplyTimeLimit = orderSearchDelay.DelayNum.ToString(),
-                    ApplyContent = orderSearchDelay.DelayReason,
-                    FPID = orderSearchDelay.Id,
-                    RunID = orderSearchDelay.WorkflowId,
-                    PoliceCode = order.ExternalId
-                };
-                var GDYQSQInfoObject = EncryptHandler.AES(extensionRequestDto);
-                await InitSendData(order.Id, order.No, "1", LZ110Defaults.InteractiveExtensionRequest, JsonConvert.SerializeObject(extensionRequestDto), JsonConvert.SerializeObject(GDYQSQInfoObject), cancellationToken);
-
-            }
-
-            #endregion
 
             var data = await _policeSendChainDealHndRepository.GetAsync(p => p.OrderId == dto.Order.Id && p.DisposalType == "1", cancellationToken);
             var actualOpinion = dto.Order.ActualOpinion.Length > 1500 ? dto.Order.ActualOpinion.Substring(0, 1500) : dto.Order.ActualOpinion;
@@ -288,7 +189,8 @@ namespace DataSharing.Police110.HaiNengDa110
                     FeedbackUnitName = dto.Order.ActualHandleOrgName,
                     WarehousingTime = DateTime.Now,
                     DisposalType = "1",
-                    OrderId = dto.Order.Id
+                    OrderId = dto.Order.Id,
+                    No = dto.Order.No
                 };
                 await _policeSendChainDealHndRepository.AddAsync(data, cancellationToken);
             }
@@ -345,7 +247,8 @@ namespace DataSharing.Police110.HaiNengDa110
                     ReturnOpinion = actualOpinion,
                     ReturnTime = orderDto.ActualHandleTime,
                     WarehousingTime = DateTime.Now,
-                    DisposalType = "2"
+                    DisposalType = "2",
+                    No = orderDto.No
                 };
                 await _policeSendChainDealHndRepository.AddAsync(dataPolice, cancellationToken);
             }
@@ -397,6 +300,7 @@ namespace DataSharing.Police110.HaiNengDa110
                     DisposalType = "3",
                     CreatorName = dto.VisitName,
                     WarehousingTime = DateTime.Now,
+                    No = dto.No
                 };
                 await _policeSendChainDealHndRepository.AddAsync(checkData, cancellationToken);
             }
@@ -510,17 +414,17 @@ namespace DataSharing.Police110.HaiNengDa110
             if (!checkData)
             {
                 //泸州110签收
-                LZ110ZUpdateStatusDto lusm = new LZ110ZUpdateStatusDto()
-                {
-                    Code = orderDto.No,
-                    FlowID = orderDto.Id,
-                    PoliceCode = orderDto.ExternalId,
-                    HandleState = "1",
-                };
-                var GDYQSQInfoObject = EncryptHandler.AES(lusm);
-                await InitSendData(orderDto.Id, orderDto.No, "1", LZ110Defaults.InteractiveUpdateStatus, JsonConvert.SerializeObject(lusm), JsonConvert.SerializeObject(GDYQSQInfoObject), cancellationToken);
-
-
+                //LZ110ZUpdateStatusDto lusm = new LZ110ZUpdateStatusDto()
+                //{
+                //    Code = orderDto.No,
+                //    FlowID = orderDto.Id,
+                //    PoliceCode = orderDto.ExternalId,
+                //    HandleState = "1",
+                //};
+                //var GDYQSQInfoObject = EncryptHandler.AES(lusm);
+                //await InitSendData(orderDto.Id, orderDto.No, "1", LZ110Defaults.InteractiveUpdateStatus, JsonConvert.SerializeObject(lusm), JsonConvert.SerializeObject(GDYQSQInfoObject), cancellationToken);
+
+                //泸州110签收 跨网交互平台
                 var dataPolice = new DsPoliceSendChainDealHnd()
                 {
                     OrderId = orderDto.Id,

src/DataSharing.Share/Dtos/Police110/HaiNengDa110/ChainAlarm_HND.cs

@@ -7,8 +7,8 @@ namespace DataSharing.Share.Dtos.Police110.HaiNengDa110
         /// <summary>
         /// 12345标识
         /// </summary>
-        [JsonPropertyName("FLOWID")]
-        [MDisplayName("12345标识")]
+        [JsonPropertyName("工单ID")]
+        [MDisplayName("工单ID")]
         public string OrderId { get; set; }
 
         /// <summary>
@@ -174,4 +174,124 @@ namespace DataSharing.Share.Dtos.Police110.HaiNengDa110
         [VRequired]
         public string AreaCode { get; set; }
     }
+
+    /// <summary>
+    /// 道枢受理工单表
+    /// </summary>
+    public class ChainAlarm_HNDNewDto
+    {
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string FLOWID { get; set; }
+        /// <summary>
+        /// 流水号
+        /// </summary>
+        public string LSH { get; set; }
+
+        /// <summary>
+        /// 接警员编号
+        /// </summary>
+        public string JJYBH { get; set; }
+
+        /// <summary>
+        /// 接警单编号
+        /// </summary>
+        public string JJDBH { get; set; }
+
+        /// <summary>
+        /// 报警电话
+        /// </summary>
+        public string BJDH { get; set; }
+
+        /// <summary>
+        /// 报警电话用户名
+        /// </summary>
+        public string BJDHYHM { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string LXDH { get; set; }
+
+        /// <summary>
+        /// 报警地址
+        /// </summary>
+        public string BJDZ { get; set; }
+
+        /// <summary>
+        /// 警情类别代码
+        /// </summary>
+        public string JQLBDM { get; set; }
+
+        /// <summary>
+        /// 警情类别名称
+        /// </summary>
+        public string JQLBMC { get; set; }
+
+        /// <summary>
+        /// 报警内容
+        /// </summary>
+        public string BJNR { get; set; }
+
+        /// <summary>
+        /// 管辖单位代码
+        /// </summary>
+        public string GXDWDM { get; set; }
+
+        /// <summary>
+        /// 管辖单位名称
+        /// </summary>
+        public string GXDWMC { get; set; }
+
+        /// <summary>
+        /// 管辖单位电话
+        /// </summary>
+        public string GXDWDH { get; set; }
+
+        /// <summary>
+        /// 报警时间
+        /// </summary>
+        public DateTime? BJSJ { get; set; }
+
+        /// <summary>
+        /// 推送时间
+        /// </summary>
+        public DateTime? TSSJ { get; set; }
+
+        /// <summary>
+        /// 接警单位代码
+        /// </summary>
+        public string JJDWDM { get; set; }
+
+        /// <summary>
+        /// 接警单位名称
+        /// </summary>
+        public string JJDWMC { get; set; }
+
+        /// <summary>
+        /// 接警类型
+        /// </summary>
+        public string JJLX { get; set; }
+
+        /// <summary>
+        /// 行政区划代码
+        /// </summary>
+        public string XZQHDM { get; set; }
+
+        /// <summary>
+        /// 是否保密
+        /// </summary>
+        public string SFBM { get; set; }
+
+        /// <summary>
+        /// 报警人性别代码
+        /// </summary>
+        public string BJRXBDM { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string Title { get; set; }
+    }
 }

src/DataSharing.Share/Dtos/Police110/HaiNengDa110/ChainDeal_HND.cs

@@ -7,8 +7,8 @@ namespace DataSharing.Share.Dtos.Police110.HaiNengDa110
         /// <summary>
         /// 12345标识
         /// </summary>
-        [JsonPropertyName("FLOWID")]
-        [MDisplayName("12345标识")]
+        [JsonPropertyName("工单ID")]
+        [MDisplayName("工单ID")]
         public string OrderId { get; set; }
 
         /// <summary>
@@ -119,4 +119,103 @@ namespace DataSharing.Share.Dtos.Police110.HaiNengDa110
         [JsonPropertyName("TSSJ")]
         public string WarehousingTime { get; set; }
     }
+
+    public class ChainDeal_HNDNewDto
+    {
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string FLOWID { get; set; }
+
+        /// <summary>
+        /// 接警单编号
+        /// </summary>
+        public string JJDBH { get; set; }
+
+        /// <summary>
+        /// 反馈时间
+        /// </summary>
+        public DateTime? FKSJ { get; set; }
+
+        /// <summary>
+        /// 出警处置情况
+        /// </summary>
+        public string CJCZQK { get; set; }
+
+        /// <summary>
+        /// 警情处理结果说明
+        /// </summary>
+        public string JQCLJGSM { get; set; }
+
+        /// <summary>
+        /// 反馈人员编号
+        /// </summary>
+        public string FKYBH { get; set; }
+
+        /// <summary>
+        /// 反馈人员姓名
+        /// </summary>
+        public string FKYXM { get; set; }
+
+        /// <summary>
+        /// 反馈单位代码
+        /// </summary>
+        public string FKDWDM { get; set; }
+
+        /// <summary>
+        /// 反馈单位名称
+        /// </summary>
+        public string FKDWMC { get; set; }
+
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        public DateTime? HFSJ { get; set; }
+
+        /// <summary>
+        /// 电话回访核实情况
+        /// </summary>
+        public string DHHFHSQK { get; set; }
+
+        /// <summary>
+        /// 回访结果
+        /// </summary>
+        public string CLJGDM { get; set; }
+
+        /// <summary>
+        /// 回访内容
+        /// </summary>
+        public string CLJGMC { get; set; }
+
+        /// <summary>
+        /// 退回接警员
+        /// </summary>
+        public string HANDLEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 退回部门
+        /// </summary>
+        public string HANDLEBMNAME { get; set; }
+
+        /// <summary>
+        /// 退回原因
+        /// </summary>
+        public string HANDLEOPINION { get; set; }
+
+        /// <summary>
+        /// 退回时间
+        /// </summary>
+        public DateTime? HANDLETIME { get; set; }
+
+        /// <summary>
+        /// 调用原因 1-反馈，2-退回 3-回访
+        /// </summary>
+        public string DYYY { get; set; }
+
+        /// <summary>
+        /// 入库时间
+        /// </summary>
+        public DateTime? TSSJ { get; set; }
+
+    }
 }

src/DataSharing.Share/Dtos/Police110/HaiNengDa110/OpenData.cs

@@ -0,0 +1,17 @@
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.Police110.HaiNengDa110
+{
+    public class OpenData
+    {
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string FlowID { get; set; }
+
+        /// <summary>
+        /// 调用原因 1-反馈，2-退回 3-回访
+        /// </summary>
+        public string DYYY { get; set; }
+    }
+}