Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -19,6 +19,7 @@ using Hotline.Users;
 using MapsterMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using Tr.Sdk;
 using Tr.Sdk.Blacklist;
 using Tr.Sdk.Tels;
@@ -256,6 +257,7 @@ namespace Hotline.Api.Controllers
         [HttpPost("receivecallrecord")]
         public async Task<OpenResponse> ReceiveCallRecord([FromBody] ReceiveCallRecordDto dto)
         {
+            _logger.LogInformation($"收到通话记录结果回传：{JsonConvert.SerializeObject(dto)}");
             var model = _mapper.Map<TrCallRecord>(dto);
             model.Duration = 0;
             model.RingTimes = 0;

src/Hotline/Permissions/EPermission.cs

@@ -1908,6 +1908,53 @@ namespace Hotline.Permissions
         #endregion
 
 
+        #endregion
+
+        #region 司法行政行政监督管理(12,00,00)
+        /// <summary>
+        /// 司法行政行政监督管理
+        /// </summary>
+        [Display(GroupName = "司法行政行政监督管理",Name = "司法行政行政监督管理",Description = "司法行政行政监督管理")]
+        SiFaManage = 120000,
+
+        #region 司法工单中心
+        /// <summary>
+        /// 司法工单中心
+        /// </summary>
+        [Display(GroupName = "司法行政行政监督管理",Name ="司法工单中心",Description ="司法工单中心")]
+        SiFaOrderCenter = 120100,
+
+        #endregion
+
+        #region 司法数据统计
+        /// <summary>
+        /// 司法数据统计
+        /// </summary>
+        [Display(GroupName = "司法行政行政监督管理",Name ="数据统计",Description ="司法数据统计")]
+        SiFaDataStatistics = 120200,
+        /// <summary>
+        /// 事件分类统计
+        /// </summary>
+        [Display(GroupName ="司法数据统计",Name ="事件分类统计",Description ="事件分类统计")]
+        SiFaEventClassStatistics = 120201,
+        /// <summary>
+        /// 执法部门办件统计
+        /// </summary>
+        [Display(GroupName ="司法数据统计",Name ="执法部门办件统计",Description ="执法部门办件统计")]
+        SiFaEnforcementOrgHandleStatistics = 120202,
+        /// <summary>
+        /// 区域分类统计
+        /// </summary>
+        [Display(GroupName ="司法数据统计",Name ="区域分类统计",Description ="区域分类统计")]
+        SiFaAreaClassStatistics = 120203,
+        /// <summary>
+        /// 数据大屏
+        /// </summary>
+        [Display(GroupName ="司法数据统计",Name ="数据大屏",Description ="数据大屏")]
+        SiFaScreenData = 120204,
+        #endregion
+
+
         #endregion
 
         #region 公用（99，00,00）