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

@@ -2,6 +2,7 @@
 using DataSharing.Police110.DaoShu110;
 using DataSharing.Police110.DCJT110;
 using DataSharing.Police110.Encryption;
+using DataSharing.Province;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.HotlineSetting;
@@ -33,7 +34,7 @@ namespace DataSharing.Host.Controllers.Police110
     /// 公司：大成均图
     /// 市州：自贡、雅安
     /// </summary>
-    public class PoliceDCJTController : BaseController
+    public class PoliceDCJTController : BaseOkController
     {
         #region 注入
         private readonly IMapper _mapper;
@@ -232,12 +233,9 @@ namespace DataSharing.Host.Controllers.Police110
             string jsonResult = ModelToJson(apiR);
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
-
-            var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             #endregion
 
-            return OpenResponse.Ok(resp);
+            return OpenResponse.Ok(base64);
         }
 
         #endregion
@@ -319,14 +317,14 @@ namespace DataSharing.Host.Controllers.Police110
                 apiR = DCJTDeResponse<string>.Failed("接口异常");
             }
 
+            #region 处理返回数据
             // 返回数据转Json
             string jsonResult = ModelToJson(apiR);
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+            #endregion
 
-            var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
-            return OpenResponse.Ok(resp);
+            return OpenResponse.Ok(base64);
         }
 
         #endregion
@@ -401,9 +399,15 @@ namespace DataSharing.Host.Controllers.Police110
                             apiR = DCJTDeResponse<string>.Failed(null);
                         else
                         {
-                            var dto = _mapper.Map<IReadOnlyList<ChainAlarm_DCJT>>(listData);
+                            var dto = _mapper.Map<IReadOnlyList<ChainAlarm_DCJTNew>>(listData);
+                            var daoShuDe = DCJTDeResponse<IReadOnlyList<ChainAlarm_DCJTNew>>.Succeed(dto, "调用成功");
                             // 返回数据
-                            apiR = DCJTDeResponse<string>.Succeed(System.Text.Json.JsonSerializer.Serialize(dto), "调用成功");
+                            string jsonResultok = System.Text.Json.JsonSerializer.Serialize(daoShuDe, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+                            jsonResultok = System.Text.RegularExpressions.Regex.Unescape(jsonResultok);
+                            // 加密：json通过sm4加密转base64
+                            string base64ok = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResultok);
+                            return OpenResponse.Ok(base64ok);
+
                         }
                     }
                 }
@@ -413,14 +417,14 @@ namespace DataSharing.Host.Controllers.Police110
                 apiR = DCJTDeResponse<string>.Failed("接口异常");
             }
 
+            #region 处理返回数据
             // 返回数据转Json
             string jsonResult = ModelToJson(apiR);
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+            #endregion
 
-            var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
-            return OpenResponse.Ok(resp);
+            return OpenResponse.Ok(base64);
         }
 
         #endregion
@@ -502,9 +506,14 @@ namespace DataSharing.Host.Controllers.Police110
                             apiR = DCJTDeResponse<string>.Failed(null);
                         else
                         {
-                            var dto = _mapper.Map<IReadOnlyList<ChainDeal_DCJT>>(listData);
+                            var dto = _mapper.Map<IReadOnlyList<ChainDeal_DCJTNew>>(listData);
+                            var daoShuDe = DCJTDeResponse<IReadOnlyList<ChainDeal_DCJTNew>>.Succeed(dto, "调用成功");
                             // 返回数据
-                            apiR = DCJTDeResponse<string>.Succeed(System.Text.Json.JsonSerializer.Serialize(dto), "调用成功");
+                            string jsonResultok = System.Text.Json.JsonSerializer.Serialize(daoShuDe, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+                            jsonResultok = System.Text.RegularExpressions.Regex.Unescape(jsonResultok);
+                            // 加密：json通过sm4加密转base64
+                            string base64ok = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResultok);
+                            return OpenResponse.Ok(base64ok);
                         }
                     }
                 }
@@ -514,14 +523,14 @@ namespace DataSharing.Host.Controllers.Police110
                 apiR = DCJTDeResponse<string>.Failed("接口异常");
             }
 
+            #region 处理返回数据
             // 返回数据转Json
             string jsonResult = ModelToJson(apiR);
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+            #endregion
 
-            var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
-            return OpenResponse.Ok(resp);
+            return OpenResponse.Ok(base64);
         }
 
         #endregion
@@ -612,14 +621,14 @@ namespace DataSharing.Host.Controllers.Police110
                 apiR = DCJTDeResponse<string>.Failed("接口异常");
             }
 
+            #region 处理返回数据
             // 返回数据转Json
             string jsonResult = ModelToJson(apiR);
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+            #endregion
 
-            var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
-            return OpenResponse.Ok(resp);
+            return OpenResponse.Ok(base64);
         }
 
         #endregion
@@ -687,14 +696,14 @@ namespace DataSharing.Host.Controllers.Police110
                 apiR = DCJTDeResponse<string>.Failed("接口异常");
             }
 
+            #region 处理返回数据
             // 返回数据转Json
             string jsonResult = ModelToJson(apiR);
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
+            #endregion
 
-            var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
-            return OpenResponse.Ok(resp);
+            return OpenResponse.Ok(base64);
         }
 
         #endregion

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

@@ -235,8 +235,6 @@ namespace DataSharing.Host.Controllers.Police110
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
             _logger.LogInformation($"输出：" + $"\r\n\r\nbase64：{base64}\r\nJson：{jsonResult}");
-            //var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            //resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             #endregion
 
             return OpenResponse.Ok(base64);
@@ -624,8 +622,6 @@ namespace DataSharing.Host.Controllers.Police110
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
-            //var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            //resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(base64);
         }
 
@@ -699,8 +695,6 @@ namespace DataSharing.Host.Controllers.Police110
             // 加密：json通过sm4加密转base64
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
-            //var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            //resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(base64);
         }
 

src/DataSharing.Share/Dtos/Police110/DCJT110/ChainAlarm_DCJT.cs

@@ -165,4 +165,168 @@ namespace DataSharing.Share.Dtos.Police110.DaoShu110
         public string AreaCode { get; set; }
 
     }
+
+    /// <summary>
+    /// 大成均图受理工单表
+    /// </summary>
+    public class ChainAlarm_DCJTNew
+    {
+        /// <summary>
+        /// 流水号
+        /// </summary>
+        [JsonPropertyName("LSH")]
+        [MDisplayName("流水号")]
+        [VRequired]
+        public string SerialNumber { get; set; }
+
+        /// <summary>
+        /// 接警员编号
+        /// </summary>
+        [JsonPropertyName("JJYBH")]
+        [MDisplayName("接警员编号")]
+        [VRequired]
+        public string RegisterNo { get; set; }
+
+        /// <summary>
+        /// 接警员姓名
+        /// </summary>
+        [JsonPropertyName("JJYXM")]
+        [MDisplayName("接警员姓名")]
+        public string RegisterName { get; set; }
+
+        /// <summary>
+        /// 接警单编号
+        /// </summary>
+        [JsonPropertyName("JJDBH")]
+        [MDisplayName("接警单编号")]
+        [VRequired]
+        public string AlarmReceiptNumber { get; set; }
+
+        /// <summary>
+        /// 报警电话
+        /// </summary>
+        [JsonPropertyName("BJDH")]
+        [MDisplayName("报警电话")]
+        [VRequired]
+        public string CallPoliceNumber { get; set; }
+
+        /// <summary>
+        /// 报警人性别
+        /// </summary>
+        [JsonPropertyName("BJRXB")]
+        [MDisplayName("报警人性别")]
+        [VRequired]
+        public string FromGender { get; set; }
+
+        /// <summary>
+        /// 报警电话用户名
+        /// </summary>
+        [JsonPropertyName("BJDHYHM")]
+        [MDisplayName("报警电话用户名")]
+        [VRequired]
+        public string CallPoliceName { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [JsonPropertyName("LXDH")]
+        [MDisplayName("联系电话")]
+        [VRequired]
+        public string PhoneNumber { get; set; }
+
+        /// <summary>
+        /// 报警地址
+        /// </summary>
+        [JsonPropertyName("BJDZ")]
+        [MDisplayName("报警地址")]
+        [VRequired]
+        public string CallPoliceAddress { get; set; }
+
+        /// <summary>
+        /// 警情类别代码
+        /// </summary>
+        [JsonPropertyName("JQLBDM")]
+        public string PoliceTypeCode { get; set; }
+
+        /// <summary>
+        /// 警情类别名称
+        /// </summary>
+        [JsonPropertyName("JQLBMC")]
+        public string PoliceTypeName { get; set; }
+
+        /// <summary>
+        /// 报警内容
+        /// </summary>
+        [JsonPropertyName("BJNR")]
+        [MDisplayName("报警内容")]
+        [VRequired]
+        public string CallPoliceContent { get; set; }
+
+        /// <summary>
+        /// 管辖单位代码
+        /// </summary>
+        [JsonPropertyName("GXDWDM")]
+        public string JurisdictionalUnitCode { get; set; }
+
+        /// <summary>
+        /// 管辖单位名称
+        /// </summary>
+        [JsonPropertyName("GXDWMC")]
+        public string JurisdictionalUnitName { get; set; }
+
+        /// <summary>
+        /// 管辖单位电话
+        /// </summary>
+        [JsonPropertyName("GXDWDH")]
+        public string JurisdictionalUnitNumber { get; set; }
+
+        /// <summary>
+        /// 报警时间
+        /// </summary>
+        [JsonPropertyName("BJSJ")]
+        [MDisplayName("报警时间")]
+        [VRequired]
+        public DateTime? CallPoliceTime { get; set; }
+
+        /// <summary>
+        /// 推送时间
+        /// </summary>
+        [JsonPropertyName("TSSJ")]
+        [MDisplayName("推送时间")]
+        [VRequired]
+        public DateTime? PushTime { get; set; }
+
+        /// <summary>
+        /// 接警单位代码
+        /// </summary>
+        [JsonPropertyName("JJDWDM")]
+        [MDisplayName("接警单位代码")]
+        [VRequired]
+        public string AlarmReceivingUnitCode { get; set; }
+
+        /// <summary>
+        /// 接警单位名称
+        /// </summary>
+        [JsonPropertyName("JJDWMC")]
+        [MDisplayName("接警单位名称")]
+        [VRequired]
+        public string AlarmReceivingUnitName { get; set; }
+
+        /// <summary>
+        /// 接警类型
+        /// </summary>
+        [JsonPropertyName("JJLX")]
+        [MDisplayName("接警类型")]
+        [VRequired]
+        public string AlarmReceptionType { get; set; }
+
+        /// <summary>
+        /// 行政区划代码
+        /// </summary>
+        [JsonPropertyName("XZQHDM")]
+        [MDisplayName("行政区划代码")]
+        [VRequired]
+        public string AreaCode { get; set; }
+
+    }
 }

src/DataSharing.Share/Dtos/Police110/DCJT110/ChainDeal_DCJT.cs

@@ -121,4 +121,121 @@ namespace DataSharing.Share.Dtos.Police110.DaoShu110
         [VRequired]
         public string WarehousingTime { get; set; }
     }
+
+    public class ChainDeal_DCJTNew
+    {
+        /// <summary>
+        /// 接警单编号
+        /// </summary>
+        [JsonPropertyName("JJDBH")]
+        [MDisplayName("接警单编号")]
+        [VRequired]
+        public string AlarmReceiptNumber { get; set; }
+
+        /// <summary>
+        /// 处置类型 1正常 2退回 3回访 4警情签收状态  5是结果签收状态 
+        /// </summary>
+        [JsonPropertyName("CZLX")]
+        [MDisplayName("处置类型")]
+        [VRequired]
+        public string DisposalType { get; set; }
+
+        /// <summary>
+        /// 反馈时间
+        /// </summary>
+        [JsonPropertyName("FKSJ")]
+        public DateTime? FeedbackTime { get; set; }
+
+        /// <summary>
+        /// 出警处置情况
+        /// </summary>
+        [JsonPropertyName("CJCZQK")]
+        public string DisposalSituation { get; set; }
+
+        /// <summary>
+        /// 警情处理结果说明
+        /// </summary>
+        [JsonPropertyName("JQCLJGSM")]
+        public string ResultDescription { get; set; }
+
+        /// <summary>
+        /// 反馈人员编号
+        /// </summary>
+        [JsonPropertyName("FKYBH")]
+        public string FeedbackPersonNumber { get; set; }
+
+        /// <summary>
+        /// 反馈人员姓名
+        /// </summary>
+        [JsonPropertyName("FKYXM")]
+        public string FeedbackPersonName { get; set; }
+
+        /// <summary>
+        /// 反馈单位代码
+        /// </summary>
+        [JsonPropertyName("FKDWDM")]
+        public string FeedbackUnitCode { get; set; }
+
+        /// <summary>
+        /// 反馈单位名称
+        /// </summary>
+        [JsonPropertyName("FKDWMC")]
+        public string FeedbackUnitName { get; set; }
+
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        [JsonPropertyName("HFSJ")]
+        public DateTime? RevisitTime { get; set; }
+
+        /// <summary>
+        /// 电话回访核实情况
+        /// </summary>
+        [JsonPropertyName("DHHFHSQK")]
+        public string CheckingContent { get; set; }
+
+        /// <summary>
+        /// 回访结果
+        /// </summary>
+        [JsonPropertyName("CLJGDM")]
+        public string VisitResult { get; set; }
+
+        /// <summary>
+        /// 回访内容
+        /// </summary>
+        [JsonPropertyName("CLJGMC")]
+        public string VisitContent { get; set; }
+
+        /// <summary>
+        /// 退回接警员
+        /// </summary>
+        [JsonPropertyName("HANDLEUSERNAME")]
+        public string ReturnName { get; set; }
+
+        /// <summary>
+        /// 退回部门
+        /// </summary>
+        [JsonPropertyName("HANDLEBMNAME")]
+        public string ReturnUnit { get; set; }
+
+        /// <summary>
+        /// 退回原因
+        /// </summary>
+        [JsonPropertyName("HANDLEOPINION")]
+        public string ReturnOpinion { get; set; }
+
+        /// <summary>
+        /// 退回时间
+        /// </summary>
+        [JsonPropertyName("HANDLETIME")]
+        public DateTime? ReturnTime { get; set; }
+
+        /// <summary>
+        /// 入库时间
+        /// </summary>
+        [JsonPropertyName("TSSJ")]
+        [MDisplayName("入库时间")]
+        [VRequired]
+        public DateTime? WarehousingTime { get; set; }
+    }
 }