src/Sharing.Api/config/appsettings.Development.json

@@ -10,7 +10,7 @@
     "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://hotline.fw.com" ]
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": true,
+    "ApplyDbMigrations": false,
     "ApplySeed": false
   },
   "MqConfiguration": {

src/Sharing.DaoShu110/Controllers/PoliceDSController.cs

@@ -21,6 +21,8 @@ namespace Sharing.DaoShu110.Controllers
         private readonly ICapPublisher _capPublisher;
         private readonly IPoliceReceiveChainAlarmDsRepository _policeReceiveChainAlarmDsRepository;
         private readonly IPoliceReceiveChainDealDsRepository _policeReceiveChainDealDsRepository;
+        private readonly IPoliceSendChainAlarmDsRepository _policeSendChainAlarmDsRepository;
+        private readonly IPoliceSendChainDealDsRepository _policeSendChainDealDsRepository;
 
         /// <summary>
         /// 
@@ -31,12 +33,16 @@ namespace Sharing.DaoShu110.Controllers
         /// <param name="policeReceiveChainDealDsRepository"></param>
         public PoliceDSController(IMapper mapper, ICapPublisher capPublisher,
             IPoliceReceiveChainAlarmDsRepository policeReceiveChainAlarmDsRepository,
-            IPoliceReceiveChainDealDsRepository policeReceiveChainDealDsRepository)
+            IPoliceReceiveChainDealDsRepository policeReceiveChainDealDsRepository,
+            IPoliceSendChainAlarmDsRepository policeSendChainAlarmDsRepository,
+            IPoliceSendChainDealDsRepository policeSendChainDealDsRepository)
         {
             _mapper = mapper;
             _capPublisher = capPublisher;
             _policeReceiveChainAlarmDsRepository = policeReceiveChainAlarmDsRepository;
             _policeReceiveChainDealDsRepository = policeReceiveChainDealDsRepository;
+            _policeSendChainAlarmDsRepository = policeSendChainAlarmDsRepository;
+            _policeSendChainDealDsRepository = policeSendChainDealDsRepository;
         }
 
         #region receive-工单受理
@@ -92,9 +98,6 @@ namespace Sharing.DaoShu110.Controllers
                     {
                         #region 写入本地数据库
                         var data = _mapper.Map<PoliceReceiveChainAlarmDs>(chainAlarm);
-                        data.DataInsertTime = DateTime.Now;
-                        data.DataState = 1;
-                        data.DataSyncTime = DateTime.Now;
                         if (!string.IsNullOrEmpty(await _policeReceiveChainAlarmDsRepository.AddAsync(data)))
                         {
                             result.rcode = 0;
@@ -197,9 +200,6 @@ namespace Sharing.DaoShu110.Controllers
                     {
                         #region 写入本地数据库
                         var data = _mapper.Map<PoliceReceiveChainDealDs>(chainDeal);
-                        data.DataInsertTime = DateTime.Now;
-                        data.DataState = 1;
-                        data.DataSyncTime = DateTime.Now;
                         if (!string.IsNullOrEmpty(await _policeReceiveChainDealDsRepository.AddAsync(data)))
                         {
                             result.rcode = 0;
@@ -242,190 +242,161 @@ namespace Sharing.DaoShu110.Controllers
 
         #endregion
 
-        //#region send-工单受理
+        #region send-工单受理
 
-        ///// <summary>
-        ///// 工单受理
-        ///// </summary>
-        ///// <returns></returns>
-        //[Route("service/api/ds/12345To110/chainAlarm")]
-        //[HttpPost]
-        //public async Task<HttpResponseMessage> ChainAlarm_Send()
-        //{
-        //    CToken_DaoShu cToken = new CToken_DaoShu();
-        //    string dcsm = cToken.token3_dcsm;
-        //    string sm4 = cToken.token3_sm4_mw;
+        /// <summary>
+        /// 工单受理
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("service/api/ds/12345To110/chainAlarm")]
+        [AllowAnonymous]
+        public async Task<HttpResponseMessage> ChainAlarm_Send()
+        {
+            //{"startDate":"2023-04-01 10:43:17","endDate":"2023-04-17 10:43:17"}
+            //gzWXSn3A2ZW9u3k9yrHdEqE5zRzto/Rud6LZ6JRJ1k59ou5nWABc8t8fR/sWU89lGweFQMsZkefowEBYzArADnSXjbKwfQj19UoF5RN/0mI=
+            CToken_DaoShu cToken = new CToken_DaoShu();
+            string sm4 = cToken.token3_sm4_mw;
 
-        //    IApiResultR apiR = null;
-        //    try
-        //    {
-        //        // 验证dcsm
-        //        string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), dcsm);
-        //        if (false == string.IsNullOrEmpty(dcsmMsg))
-        //        {
-        //            apiR = ApiResultR.Failed(dcsmMsg);
-        //        }
-        //        else
-        //        {
-        //            string base64String = await CComm.getStreamBase64(HttpContext.Request);
-        //            string startDate = "", endDate = "";
-        //            if (false == string.IsNullOrEmpty(base64String))
-        //            {
-        //                // 解密：base64通过sm4解密转json
-        //                string jsonRes = Sm4Crypto.Decrypt_ECB_Base64(sm4, base64String);
-        //                // json 转 实体类
-        //                ChainAlarm_DS chainAlarm = System.Text.Json.JsonSerializer.Deserialize<ChainAlarm_DS>(jsonRes);
-        //                if (null == chainAlarm)
-        //                {
-        //                    chainAlarm = new ChainAlarm_DS();
-        //                }
-        //                startDate = chainAlarm.startDate;
-        //                endDate = chainAlarm.endDate;
-        //            }
+            IApiResultR apiR;
+            try
+            {
+                // 验证dcsm
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token3_dcsm);
+                if (false == string.IsNullOrEmpty(dcsmMsg))
+                {
+                    apiR = ApiResultR.Failed(dcsmMsg);
+                }
+                else
+                {
+                    string base64String = await CComm.getStreamBase64(HttpContext.Request);
+                    string startDate = "", endDate = "";
+                    if (false == string.IsNullOrEmpty(base64String))
+                    {
+                        // 解密：base64通过sm4解密转json
+                        string jsonRes = Sm4Crypto.Decrypt_ECB_Base64(sm4, base64String);
+                        // json 转 实体类
+                        OpenData openData = System.Text.Json.JsonSerializer.Deserialize<OpenData>(jsonRes);
+                        if (null == openData)
+                        {
+                            openData = new OpenData();
+                        }
+                        startDate = openData.StartDate;
+                        endDate = openData.EndDate;
+                    }
 
-        //            bool bRun = true;
+                    var listData = await _policeSendChainAlarmDsRepository.Queryable()
+                             .WhereIF(!string.IsNullOrEmpty(startDate), p => p.CallPoliceTime >= Convert.ToDateTime(startDate))
+                             .WhereIF(!string.IsNullOrEmpty(endDate), p => p.CallPoliceTime >= Convert.ToDateTime(endDate))
+                             .OrderBy(p => p.CallPoliceTime)
+                             .Take(50)
+                             .ToListAsync();
 
-        //            if (string.IsNullOrEmpty(startDate) == false && CComm.IsDate(startDate) == false)
-        //            {
-        //                bRun = false;
-        //                apiR = ApiResultR.Failed("【开始时间】不是日期格式 yyyy-MM-dd HH:mm:ss");
-        //            }
-        //            if (string.IsNullOrEmpty(endDate) == false && CComm.IsDate(endDate) == false)
-        //            {
-        //                bRun = false;
-        //                apiR = ApiResultR.Failed("【结束时间】不是日期格式 yyyy-MM-dd HH:mm:ss");
-        //            }
+                    if (null == listData)
+                        apiR = ApiResultR.Failed();
+                    else
+                    {
+                        var dto = _mapper.Map<IReadOnlyList<ChainAlarm_DS>>(listData);
+                        // 返回数据
+                        apiR = ApiResultR.Succeed(System.Text.Json.JsonSerializer.Serialize(dto));
+                    }
 
-        //            if (bRun)
-        //            {
-        //                DataTable dtData = Hotline.BLL.Order.Police.COrder.chainAlarm_ds(startDate, endDate);
-        //                if (null == dtData)
-        //                {
-        //                    apiR = ApiResultR.Failed();
-        //                }
-        //                else
-        //                {
-        //                    // 更新状态
-        //                    Hotline.BLL.Order.Police.COrder.updatechainAlarm_ds(dtData);
-        //                    // 返回数据
-        //                    apiR = ApiResultR.Succeed(dtData);
-        //                }
-        //            }
-        //        }
-        //    }
-        //    catch (System.Exception ex)
-        //    {
-        //        apiR = ApiResultR.Failed("接口异常");
-        //    }
+                }
+            }
+            catch (System.Exception)
+            {
+                apiR = ApiResultR.Failed("接口异常");
+            }
 
-        //    // 返回数据转Json
-        //    string jsonResult = CJson.modelToJson(apiR);
-        //    // 加密：json通过sm4加密转base64
-        //    string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+            // 返回数据转Json
+            string jsonResult = CJson.modelToJson(apiR);
+            // 加密：json通过sm4加密转base64
+            string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
-        //    var resp = new HttpResponseMessage(HttpStatusCode.OK);
-        //    resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
-        //    return resp;
-        //}
+            var resp = new HttpResponseMessage(HttpStatusCode.OK);
+            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            return resp;
+        }
 
-        //#endregion
+        #endregion
 
-        //#region send-工单办结
+        #region send-工单办结
 
-        ///// <summary>
-        ///// 工单办结
-        ///// </summary>
-        ///// <returns></returns>
-        //[Route("service/api/ds/12345To110/chainDeal")]
-        //[HttpPost]
-        //public async Task<HttpResponseMessage> ChainDeal_Send()
-        //{
-        //    // 测试JSON
-        //    // {"JJDBH":"510300202304070001202304070001","CZLX":"1"}
+        /// <summary>
+        /// 工单办结
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("service/api/ds/12345To110/chainDeal")]
+        [AllowAnonymous]
+        public async Task<HttpResponseMessage> ChainDeal_Send()
+        {
+            // 测试JSON
+            // {"JJDBH":"510300202304070001202304070001","CZLX":"1"}
 
-        //    // 测试Base64
-        //    // 6iTxDt+SA4luce9A0nT+th33Ji9vhqrffmcF8p+YbV3Jkc1wetlS7DMZM0xgxpYJxep4I9AvUkcC8kUH39M0BQ==
+            // 测试Base64
+            // 6RB6Hat8dpBfvCTtEpwotd/MlonxdmqZaa3TcLaua/xcjFv1SZJzKZPrhgsux63Gq/DXxtAQ25buLsI1fgFv3g==
 
-        //    CToken_DaoShu cToken = new CToken_DaoShu();
-        //    string dcsm = cToken.token2_dcsm;
-        //    string sm4 = cToken.token2_sm4_mw;
+            CToken_DaoShu cToken = new CToken_DaoShu();
+            string sm4 = cToken.token2_sm4_mw;
 
-        //    IApiResultR apiR = null;
-        //    try
-        //    {
-        //        // 验证dcsm
-        //        string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), dcsm);
-        //        if (false == string.IsNullOrEmpty(dcsmMsg))
-        //        {
-        //            apiR = ApiResultR.Failed(dcsmMsg);
-        //        }
-        //        else
-        //        {
-        //            string base64String = await CComm.getStreamBase64(HttpContext.Request);
-        //            string JJDBH = "", CZLX = "";
-        //            string startDate = "", endDate = "";
-        //            if (false == string.IsNullOrEmpty(base64String))
-        //            {
-        //                // 解密：base64通过sm4解密转json
-        //                string jsonRes = Sm4Crypto.Decrypt_ECB_Base64(sm4, base64String);
-        //                // json 转 实体类
-        //                ChainDeal_DS chainDeal = System.Text.Json.JsonSerializer.Deserialize<ChainDeal_DS>(jsonRes);
-        //                if (null == chainDeal)
-        //                {
-        //                    chainDeal = new ChainDeal_DS();
-        //                }
-        //                JJDBH = chainDeal.JJDBH;
-        //                CZLX = chainDeal.CZLX;
-        //                startDate = chainDeal.startDate;
-        //                endDate = chainDeal.endDate;
-        //            }
+            IApiResultR apiR;
+            try
+            {
+                // 验证dcsm
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token2_dcsm);
+                if (false == string.IsNullOrEmpty(dcsmMsg))
+                {
+                    apiR = ApiResultR.Failed(dcsmMsg);
+                }
+                else
+                {
+                    string base64String = await CComm.getStreamBase64(HttpContext.Request);
 
-        //            bool bRun = true;
+                    OpenData openData = new OpenData();
+                    if (false == string.IsNullOrEmpty(base64String))
+                    {
+                        // 解密：base64通过sm4解密转json
+                        string jsonRes = Sm4Crypto.Decrypt_ECB_Base64(sm4, base64String);
+                        // json 转 实体类
+                        openData = System.Text.Json.JsonSerializer.Deserialize<OpenData>(jsonRes);
 
-        //            if (string.IsNullOrEmpty(startDate) == false && CComm.IsDate(startDate) == false)
-        //            {
-        //                bRun = false;
-        //                apiR = ApiResultR.Failed("【开始时间】不是日期格式 yyyy-MM-dd HH:mm:ss");
-        //            }
-        //            if (string.IsNullOrEmpty(endDate) == false && CComm.IsDate(endDate) == false)
-        //            {
-        //                bRun = false;
-        //                apiR = ApiResultR.Failed("【结束时间】不是日期格式 yyyy-MM-dd HH:mm:ss");
-        //            }
+                    }
 
-        //            if (bRun)
-        //            {
-        //                DataTable dtData = Hotline.BLL.Order.Police.COrder.chainDealSearch_ds(startDate, endDate, JJDBH, CZLX);
-        //                if (null == dtData)
-        //                {
-        //                    apiR = ApiResultR.Failed();
-        //                }
-        //                else
-        //                {
-        //                    // 更新状态
-        //                    Hotline.BLL.Order.Police.COrder.updatechainDeal_ds(dtData);
-        //                    // 返回数据
-        //                    apiR = ApiResultR.Succeed(dtData);
-        //                }
-        //            }
-        //        }
-        //    }
-        //    catch (System.Exception ex)
-        //    {
-        //        apiR = ApiResultR.Failed("接口异常");
-        //    }
+                    var listData = await _policeSendChainDealDsRepository.Queryable()
+                             .WhereIF(!string.IsNullOrEmpty(openData.StartDate), p => p.WarehousingTime >= Convert.ToDateTime(openData.StartDate))
+                             .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)
+                             .OrderBy(p => p.WarehousingTime)
+                             .Take(50)
+                             .ToListAsync();
 
-        //    // 返回数据转Json
-        //    string jsonResult = CJson.modelToJson(apiR);
-        //    // 加密：json通过sm4加密转base64
-        //    string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+                    if (null == listData)
+                        apiR = ApiResultR.Failed();
+                    else
+                    {
+                        var dto = _mapper.Map<IReadOnlyList<ChainDeal_DS>>(listData);
+                        // 返回数据
+                        apiR = ApiResultR.Succeed(System.Text.Json.JsonSerializer.Serialize(dto));
+                    }
 
-        //    var resp = new HttpResponseMessage(HttpStatusCode.OK);
-        //    resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
-        //    return resp;
-        //}
+                }
+            }
+            catch (System.Exception)
+            {
+                apiR = ApiResultR.Failed("接口异常");
+            }
 
-        //#endregion
+            // 返回数据转Json
+            string jsonResult = CJson.modelToJson(apiR);
+            // 加密：json通过sm4加密转base64
+            string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+
+            var resp = new HttpResponseMessage(HttpStatusCode.OK);
+            resp.Content = new StringContent(base64, System.Text.Encoding.UTF8, "text/plain");
+            return resp;
+        }
+
+        #endregion
 
         //#region send-知识库列表
 
@@ -433,8 +404,8 @@ namespace Sharing.DaoShu110.Controllers
         ///// 查询知识库列表
         ///// </summary>
         ///// <returns></returns>
-        //[Route("service/api/ds/get_knowledge_info")]
-        //[HttpPost]
+        //[HttpPost("service/api/ds/get_knowledge_info")]
+        //[AllowAnonymous]
         //public async Task<HttpResponseMessage> Get_Knowledge_Info()
         //{
         //    // 测试Json
@@ -446,14 +417,13 @@ namespace Sharing.DaoShu110.Controllers
         //    // 93ObxWa6vhYID1pe3rx0ThmtcsgBLXGqvIYCMM8iUwPpItcJamHEbCHDV62/5tDIG7LZfbQCYscMo05nhdfdoQKo0xVndLdYFCsp6s291efskazkOkKJlTsM8iK4mdwj
 
         //    CToken_DaoShu cToken = new CToken_DaoShu();
-        //    string dcsm = cToken.token5_dcsm;
         //    string sm4 = cToken.token5_sm4_mw;
 
         //    IApiResultR apiR = null;
         //    try
         //    {
         //        // 验证dcsm
-        //        string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), dcsm);
+        //        string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token5_dcsm);
         //        if (false == string.IsNullOrEmpty(dcsmMsg))
         //        {
         //            apiR = ApiResultR.Failed(dcsmMsg);
@@ -524,8 +494,8 @@ namespace Sharing.DaoShu110.Controllers
         ///// 查询知识库内容
         ///// </summary>
         ///// <returns></returns>
-        //[Route("service/api/ds/get_knowledge_content")]
-        //[HttpPost]
+        //[HttpPost("service/api/ds/get_knowledge_content")]
+        // [AllowAnonymous]
         //public async Task<HttpResponseMessage> Get_Knowledge_Content()
         //{
         //    // 测试JSON

src/Sharing.DaoShu110/Dtos/ChainAlarm_DS.cs

@@ -149,14 +149,5 @@ namespace Sharing.DaoShu110.Dtos
         [VRequired]
         public string AreaCode { get; set; }
 
-        /// <summary>
-        /// 开始时间
-        /// </summary>
-        public string startDate { get; set; }
-
-        /// <summary>
-        /// 结束时间
-        /// </summary>
-        public string endDate { get; set; }
     }
 }

src/Sharing.DaoShu110/Dtos/ChainDeal_DS.cs

@@ -119,16 +119,6 @@ namespace Sharing.DaoShu110.Dtos
         [JsonPropertyName("CZLX")]
         [MDisplayName("处置类型")]
         [VRequired]
-        public string DisposalType { get; set; }
-
-        /// <summary>
-        /// 开始时间
-        /// </summary>
-        public string startDate { get; set; }
-
-        /// <summary>
-        /// 结束时间
-        /// </summary>
-        public string endDate { get; set; }
+        public int DisposalType { get; set; }
     }
 }

src/Sharing.DaoShu110/Dtos/OpenData.cs

@@ -0,0 +1,49 @@
+using System.Text.Json.Serialization;
+
+namespace Sharing.DaoShu110.Dtos
+{
+    public class OpenData
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [JsonPropertyName("startDate")]
+        public string StartDate { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [JsonPropertyName("endDate")]
+        public string EndDate { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [JsonPropertyName("createTimeBegin")]
+        public string CreateTimeBegin { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [JsonPropertyName("createTimeEnd")]
+        public string CreateTimeEnd { get; set; }
+
+        /// <summary>
+        /// 知识唯一标识
+        /// </summary>
+        [JsonPropertyName("id")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 接警单编号
+        /// </summary>
+        [JsonPropertyName("JJDBH")]
+        public string AlarmReceiptNumber { get; set; }
+
+        /// <summary>
+        /// 处置类型 1正常 2退回 3回访
+        /// </summary>
+        [JsonPropertyName("CZLX")]
+        public int DisposalType { get; set; } = 1;
+    }
+}

src/Sharing.DaoShu110/Extensions/CToken_DaoShu.cs

@@ -10,110 +10,61 @@
     /// </summary>
     public class CToken_DaoShu
     {
-        public CToken_DaoShu()
-        {
-            #region 宜宾Token
-
-            token1_token = CToken_Yibin.token1_token;
-            token1_dcsm = CToken_Yibin.token1_dcsm;
-            token1_sm2_public = CToken_Yibin.token1_sm2_public;
-            token1_sm2_private = CToken_Yibin.token1_sm2_private;
-            token1_sm4 = CToken_Yibin.token1_sm4;
-            token1_sm4_mw = CToken_Yibin.token1_sm4_mw;
-
-            token2_token = CToken_Yibin.token2_token;
-            token2_dcsm = CToken_Yibin.token2_dcsm;
-            token2_sm2_public = CToken_Yibin.token2_sm2_public;
-            token2_sm2_private = CToken_Yibin.token2_sm2_private;
-            token2_sm4 = CToken_Yibin.token2_sm4;
-            token2_sm4_mw = CToken_Yibin.token2_sm4_mw;
-
-            token3_token = CToken_Yibin.token3_token;
-            token3_dcsm = CToken_Yibin.token3_dcsm;
-            token3_sm2_public = CToken_Yibin.token3_sm2_public;
-            token3_sm2_private = CToken_Yibin.token3_sm2_private;
-            token3_sm4 = CToken_Yibin.token3_sm4;
-            token3_sm4_mw = CToken_Yibin.token3_sm4_mw;
-
-            token4_token = CToken_Yibin.token4_token;
-            token4_dcsm = CToken_Yibin.token4_dcsm;
-            token4_sm2_public = CToken_Yibin.token4_sm2_public;
-            token4_sm2_private = CToken_Yibin.token4_sm2_private;
-            token4_sm4 = CToken_Yibin.token4_sm4;
-            token4_sm4_mw = CToken_Yibin.token4_sm4_mw;
-
-            token5_token = CToken_Yibin.token5_token;
-            token5_dcsm = CToken_Yibin.token5_dcsm;
-            token5_sm2_public = CToken_Yibin.token5_sm2_public;
-            token5_sm2_private = CToken_Yibin.token5_sm2_private;
-            token5_sm4 = CToken_Yibin.token5_sm4;
-            token5_sm4_mw = CToken_Yibin.token5_sm4_mw;
-
-            token6_token = CToken_Yibin.token6_token;
-            token6_dcsm = CToken_Yibin.token6_dcsm;
-            token6_sm2_public = CToken_Yibin.token6_sm2_public;
-            token6_sm2_private = CToken_Yibin.token6_sm2_private;
-            token6_sm4 = CToken_Yibin.token6_sm4;
-            token6_sm4_mw = CToken_Yibin.token6_sm4_mw;
-
-            #endregion
-        }
-
         #region 初始化
 
         //1、非警情分流推送服务_德阳市
         //   receive-工单受理
-        public string token1_token = "";
-        public string token1_dcsm = "";
-        public string token1_sm2_public = "";
-        public string token1_sm2_private = "";
-        public string token1_sm4 = "";
-        public string token1_sm4_mw = "";  // 使用sm2解密 /sm2/decode sm2：传入sm2_private 和 data：传入sm4
+        public string token1_token = CToken_Yibin.token1_token;
+        public string token1_dcsm = CToken_Yibin.token1_dcsm;
+        public string token1_sm2_public = CToken_Yibin.token1_sm2_public;
+        public string token1_sm2_private = CToken_Yibin.token1_sm2_private;
+        public string token1_sm4 = CToken_Yibin.token1_sm4;
+        public string token1_sm4_mw = CToken_Yibin.token1_sm4_mw;
 
         //4、警务警情分流推送服务_自贡市
         //   receive-工单办结
-        public string token4_token = "";
-        public string token4_dcsm = "";
-        public string token4_sm2_public = "";
-        public string token4_sm2_private = "";
-        public string token4_sm4 = "";
-        public string token4_sm4_mw = "";
+        public string token4_token = CToken_Yibin.token4_token;
+        public string token4_dcsm = CToken_Yibin.token4_dcsm;
+        public string token4_sm2_public = CToken_Yibin.token4_sm2_public;
+        public string token4_sm2_private = CToken_Yibin.token4_sm2_private;
+        public string token4_sm4 = CToken_Yibin.token4_sm4;
+        public string token4_sm4_mw = CToken_Yibin.token4_sm4_mw;
 
         //3、警务警情分流查询服务_自贡市
         //   send-工单受理
-        public string token3_token = "";
-        public string token3_dcsm = "";
-        public string token3_sm2_public = "";
-        public string token3_sm2_private = "";
-        public string token3_sm4 = "";
-        public string token3_sm4_mw = "";
+        public string token3_token = CToken_Yibin.token3_token;
+        public string token3_dcsm = CToken_Yibin.token3_dcsm;
+        public string token3_sm2_public = CToken_Yibin.token3_sm2_public;
+        public string token3_sm2_private = CToken_Yibin.token3_sm2_private;
+        public string token3_sm4 = CToken_Yibin.token3_sm4;
+        public string token3_sm4_mw = CToken_Yibin.token3_sm4_mw;
 
         //2、非警情分流查询服务_自贡市
         //   send-工单办结
-        public string token2_token = "";
-        public string token2_dcsm = "";
-        public string token2_sm2_public = "";
-        public string token2_sm2_private = "";
-        public string token2_sm4 = "";
-        public string token2_sm4_mw = "";
+        public string token2_token = CToken_Yibin.token2_token;
+        public string token2_dcsm = CToken_Yibin.token2_dcsm;
+        public string token2_sm2_public = CToken_Yibin.token2_sm2_public;
+        public string token2_sm2_private = CToken_Yibin.token2_sm2_private;
+        public string token2_sm4 = CToken_Yibin.token2_sm4;
+        public string token2_sm4_mw = CToken_Yibin.token2_sm4_mw;
 
         //5、从公安网侧获取12345政务服务热线平台知识库列表
         //   send-知识库列表
-        public string token5_token = "";
-        public string token5_dcsm = "";
-        public string token5_sm2_public = "";
-        public string token5_sm2_private = "";
-        public string token5_sm4 = "";
-        public string token5_sm4_mw = "";
+        public string token5_token = CToken_Yibin.token5_token;
+        public string token5_dcsm = CToken_Yibin.token5_dcsm;
+        public string token5_sm2_public = CToken_Yibin.token5_sm2_public;
+        public string token5_sm2_private = CToken_Yibin.token5_sm2_private;
+        public string token5_sm4 = CToken_Yibin.token5_sm4;
+        public string token5_sm4_mw = CToken_Yibin.token5_sm4_mw;
 
         //6、从公安网侧获取12345政务服务热线平台知识内容
         //   send-知识库内容
-        public string token6_token = "";
-        public string token6_dcsm = "";
-        public string token6_sm2_public = "";
-        public string token6_sm2_private = "";
-        public string token6_sm4 = "";
-        public string token6_sm4_mw = "";
+        public string token6_token = CToken_Yibin.token6_token;
+        public string token6_dcsm = CToken_Yibin.token6_dcsm;
+        public string token6_sm2_public = CToken_Yibin.token6_sm2_public;
+        public string token6_sm2_private = CToken_Yibin.token6_sm2_private;
+        public string token6_sm4 = CToken_Yibin.token6_sm4;
+        public string token6_sm4_mw = CToken_Yibin.token6_sm4_mw;
 
         #endregion
     }

src/Sharing.Repository/DaoShu110/PoliceSendChainAlarmDsRepository.cs

@@ -0,0 +1,15 @@
+using Sharing.DaoShu110;
+using Sharing.DaoShu110.Dtos;
+using SqlSugar;
+using XF.Domain.Dependency;
+
+namespace Sharing.Repository.DaoShu110
+{
+    public class PoliceSendChainAlarmDsRepository : BaseRepository<PoliceSendChainAlarmDs>, IPoliceSendChainAlarmDsRepository, IScopeDependency
+    {
+        public PoliceSendChainAlarmDsRepository(ISugarUnitOfWork<SharingDbContext> uow) : base(uow)
+        {
+
+        }
+    }
+}

src/Sharing.Repository/DaoShu110/PoliceSendChainDealDsRepository.cs

@@ -0,0 +1,15 @@
+using Sharing.DaoShu110;
+using Sharing.DaoShu110.Dtos;
+using SqlSugar;
+using XF.Domain.Dependency;
+
+namespace Sharing.Repository.DaoShu110
+{
+    public class PoliceSendChainDealDsRepository : BaseRepository<PoliceSendChainDealDs>, IPoliceSendChainDealDsRepository, IScopeDependency
+    {
+        public PoliceSendChainDealDsRepository(ISugarUnitOfWork<SharingDbContext> uow) : base(uow)
+        {
+
+        }
+    }
+}

src/Sharing/DaoShu110/IPoliceSendChainAlarmDsRepository.cs

@@ -0,0 +1,9 @@
+using Sharing.DaoShu110.Dtos;
+using XF.Domain.Repository;
+
+namespace Sharing.DaoShu110
+{
+    public interface IPoliceSendChainAlarmDsRepository : IRepository<PoliceSendChainAlarmDs>
+    {
+    }
+}

src/Sharing/DaoShu110/IPoliceSendChainDealDsRepository.cs

@@ -0,0 +1,9 @@
+using Sharing.DaoShu110.Dtos;
+using XF.Domain.Repository;
+
+namespace Sharing.DaoShu110
+{
+    public interface IPoliceSendChainDealDsRepository : IRepository<PoliceSendChainDealDs>
+    {
+    }
+}

src/Sharing/DaoShu110/PoliceReceiveChainAlarmDs.cs

@@ -121,29 +121,5 @@ namespace Sharing.DaoShu110.Dtos
         /// </summary>
         [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(50)")]
         public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 入库时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "入库时间")]
-        public DateTime? DataInsertTime { get; set; }
-
-        /// <summary>
-        /// 同步时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步时间")]
-        public DateTime? DataSyncTime { get; set; }
-
-        /// <summary>
-        /// 状态 0:待处理 1:成功 2:失败
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public int DataState { get; set; } = 0;
-
-        /// <summary>
-        /// 工单编号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "工单编号", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string OrderId { get; set; }
     }
 }

src/Sharing/DaoShu110/PoliceReceiveChainDealDs.cs

@@ -108,8 +108,8 @@ namespace Sharing.DaoShu110.Dtos
         /// <summary>
         /// 处置类型 1正常 2退回 3回访
         /// </summary>
-        [SugarColumn(ColumnDescription = "处置类型", ColumnDataType = "varchar(2)")]
-        public string DisposalType { get; set; }
+        [SugarColumn(ColumnDescription = "处置类型")]
+        public int DisposalType { get; set; }
 
         /// <summary>
         /// 入库时间
@@ -117,28 +117,5 @@ namespace Sharing.DaoShu110.Dtos
         [SugarColumn(ColumnDescription = "入库时间")]
         public DateTime? WarehousingTime { get; set; }
 
-        /// <summary>
-        /// 入库时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "入库时间")]
-        public DateTime? DataInsertTime { get; set; }
-
-        /// <summary>
-        /// 同步时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步时间")]
-        public DateTime? DataSyncTime { get; set; }
-
-        /// <summary>
-        /// 状态 0待处理 1成功 2失败
-        /// </summary>
-        [SugarColumn(ColumnDescription = "状态")]
-        public int DataState { get; set; }
-
-        /// <summary>
-        /// 工单编号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "工单编号", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string OrderId { get; set; }
     }
 }

src/Sharing/DaoShu110/PoliceSendChainAlarmDs.cs

@@ -0,0 +1,125 @@
+using SqlSugar;
+using XF.Domain.Repository;
+
+namespace Sharing.DaoShu110.Dtos
+{
+    /// <summary>
+    /// 道枢受理工单表
+    /// </summary>
+    public class PoliceSendChainAlarmDs : CreationModificationEntity
+    {
+        /// <summary>
+        /// 流水号   
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接警单编号", ColumnDataType = "varchar(35)")]
+        public string SerialNumber { get; set; }
+
+        /// <summary>
+        /// 接警员编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接警员编号", ColumnDataType = "varchar(30)")]
+        public string RegisterNo { get; set; }
+
+        /// <summary>
+        /// 接警单编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接警单编号", ColumnDataType = "varchar(35)")]
+        public string AlarmReceiptNumber { get; set; }
+
+        /// <summary>
+        /// 报警电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "报警电话", ColumnDataType = "varchar(20)")]
+        public string CallPoliceNumber { get; set; }
+
+        /// <summary>
+        /// 报警电话用户名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "报警电话用户名", ColumnDataType = "varchar(20)")]
+        public string CallPoliceName { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "联系电话", ColumnDataType = "varchar(20)")]
+        public string PhoneNumber { get; set; }
+
+        /// <summary>
+        /// 报警地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "报警地址", ColumnDataType = "varchar(200)")]
+        public string CallPoliceAddress { get; set; }
+
+        /// <summary>
+        /// 警情类别代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "警情类别代码", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string PoliceTypeCode { get; set; }
+
+        /// <summary>
+        /// 警情类别名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "警情类别名称", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string PoliceTypeName { get; set; }
+
+        /// <summary>
+        /// 报警内容
+        /// </summary>
+        [SugarColumn(ColumnDescription = "报警内容", ColumnDataType = "varchar(2000)")]
+        public string CallPoliceContent { get; set; }
+
+        /// <summary>
+        /// 管辖单位代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "管辖单位代码", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string JurisdictionalUnitCode { get; set; }
+
+        /// <summary>
+        /// 管辖单位名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "管辖单位名称", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string JurisdictionalUnitName { get; set; }
+
+        /// <summary>
+        /// 管辖单位电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "管辖单位电话", ColumnDataType = "varchar(20)", IsNullable = true)]
+        public string JurisdictionalUnitNumber { get; set; }
+
+        /// <summary>
+        /// 报警时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "报警时间")]
+        public DateTime? CallPoliceTime { get; set; }
+
+        /// <summary>
+        /// 推送时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "推送时间")]
+        public DateTime? PushTime { get; set; }
+
+        /// <summary>
+        /// 接警单位代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接警单位代码", ColumnDataType = "varchar(50)")]
+        public string AlarmReceivingUnitCode { get; set; }
+
+        /// <summary>
+        /// 接警单位名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接警单位名称", ColumnDataType = "varchar(50)")]
+        public string AlarmReceivingUnitName { get; set; }
+
+        /// <summary>
+        /// 接警类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接警类型", ColumnDataType = "varchar(50)")]
+        public string AlarmReceptionType { get; set; }
+
+        /// <summary>
+        /// 行政区划代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(50)")]
+        public string AreaCode { get; set; }
+    }
+}

src/Sharing/DaoShu110/PoliceSendChainDealDs.cs

@@ -0,0 +1,121 @@
+using SqlSugar;
+using XF.Domain.Repository;
+
+namespace Sharing.DaoShu110.Dtos
+{
+    /// <summary>
+    /// 道枢办理结果表
+    /// </summary>
+    public class PoliceSendChainDealDs : CreationModificationEntity
+    {
+        /// <summary>
+        /// 接警单编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接警单编号", ColumnDataType = "varchar(50)")]
+        public string AlarmReceiptNumber { get; set; }
+
+        /// <summary>
+        /// 反馈时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "反馈时间", IsNullable = true)]
+        public DateTime? FeedbackTime { get; set; }
+
+        /// <summary>
+        /// 出警处置情况
+        /// </summary>
+        [SugarColumn(ColumnDescription = "出警处置情况", ColumnDataType = "varchar(2000)", IsNullable = true)]
+        public string DisposalSituation { get; set; }
+
+        /// <summary>
+        /// 警情处理结果说明
+        /// </summary>
+        /// </summary>
+        [SugarColumn(ColumnDescription = "警情处理结果说明", ColumnDataType = "varchar(2000)", IsNullable = true)]
+        public string ResultDescription { get; set; }
+
+        /// <summary>
+        /// 反馈人员编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "反馈人员编号", ColumnDataType = "varchar(30)", IsNullable = true)]
+        public string FeedbackPersonNumber { get; set; }
+
+        /// <summary>
+        /// 反馈人员姓名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "反馈人员姓名", ColumnDataType = "varchar(30)", IsNullable = true)]
+        public string FeedbackPersonName { get; set; }
+
+        /// <summary>
+        /// 反馈单位代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "反馈单位代码", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string FeedbackUnitCode { get; set; }
+
+        /// <summary>
+        /// 反馈单位名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "反馈单位名称", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string FeedbackUnitName { get; set; }
+
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "回访时间", IsNullable = true)]
+        public DateTime? RevisitTime { get; set; }
+
+        /// <summary>
+        /// 电话回访核实情况
+        /// </summary>
+        [SugarColumn(ColumnDescription = "电话回访核实情况", ColumnDataType = "varchar(2000)", IsNullable = true)]
+        public string CheckingContent { get; set; }
+
+        /// <summary>
+        /// 回访结果
+        /// </summary>
+        [SugarColumn(ColumnDescription = "回访结果", ColumnDataType = "varchar(20)", IsNullable = true)]
+        public string VisitResult { get; set; }
+
+        /// <summary>
+        /// 回访内容
+        /// </summary>
+        [SugarColumn(ColumnDescription = "回访内容", ColumnDataType = "varchar(2000)", IsNullable = true)]
+        public string VisitContent { get; set; }
+
+        /// <summary>
+        /// 退回接警员
+        /// </summary>
+        [SugarColumn(ColumnDescription = "退回接警员", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string ReturnName { get; set; }
+
+        /// <summary>
+        /// 退回部门
+        /// </summary>
+        [SugarColumn(ColumnDescription = "退回部门", ColumnDataType = "varchar(50)", IsNullable = true)]
+        public string ReturnUnit { get; set; }
+
+        /// <summary>
+        /// 退回原因
+        /// </summary>
+        [SugarColumn(ColumnDescription = "退回原因", ColumnDataType = "varchar(2000)", IsNullable = true)]
+        public string ReturnOpinion { get; set; }
+
+        /// <summary>
+        /// 退回时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "退回时间", IsNullable = true)]
+        public DateTime? ReturnTime { get; set; }
+
+        /// <summary>
+        /// 处置类型 1正常 2退回 3回访
+        /// </summary>
+        [SugarColumn(ColumnDescription = "处置类型")]
+        public int DisposalType { get; set; }
+
+        /// <summary>
+        /// 入库时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入库时间")]
+        public DateTime? WarehousingTime { get; set; }
+
+    }
+}