11

gx_api/GxPress/Api/GxPress.Api/ExceptionMiddleware.cs

@@ -40,12 +40,12 @@ namespace GxPress.Api
                 if (context.User != null)
                 {
                     var ty = _contextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.Role);
-                    if (ty != null && ty.Value.Equals("Admin"))
+                    if (ty != null && !ty.Value.Equals("Admin"))
                     {
                         var userId = _contextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier);
                         if (int.TryParse(userId?.Value, out var accountId))
                         {
-                           await _apiLogService.DataSave(context, 1, accountId);
+                            await _apiLogService.DataSave(context, 1, accountId);
                         }
                     }
                     // watch.Stop();

gx_api/GxPress/Model/GxPress.Entity/User.cs

@@ -224,6 +224,13 @@ namespace GxPress.Entity
         /// 登录时间
         /// </summary>
         /// <value></value>
+        [DataColumn]
         public DateTime LoginTime { get; set; }
+        /// <summary>
+        /// 省份
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string Province { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/Visit/Visit.cs

@@ -14,7 +14,7 @@ namespace GxPress.Entity.Visit
         [DataColumn]
         public int UserId { get; set; }
         /// <summary>
-        /// 类型ID 类型1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情
+        /// 类型ID 文章100,话题2,收藏3,笔记4,通知5,站内信6,小组7,收藏文件夹12,笔记文件夹13,工作流审批14,文件300,图片301,会议纪要8,会议详情500,财务报表601,人事报表602,出版报表603,书籍20,课程30,音频40,期刊50,视频60,名栏90,公众号110,刊期120
         /// </summary>
         /// <value></value>
         [DataColumn]

gx_api/GxPress/Model/GxPress.Entity/tede2/Media/Media.cs

@@ -89,11 +89,7 @@ namespace GxPress.Entity.tede2.Media
         /// </summary>
         [DataColumn]
         public int Sort { get; set; }
-        /// <summary>
-        /// 文章阅读量
-        /// </summary>
-        [DataColumn]
-        public int ReadCount { get; set; }
+
         /// <summary>
         /// 是否置顶
         /// </summary>
@@ -225,11 +221,34 @@ namespace GxPress.Entity.tede2.Media
         /// <value></value>
         [DataColumn]
         public string JournalsYear { get; set; }
-          /// <summary>
+        /// <summary>
         /// 刊期期数
         /// </summary>
         /// <value></value>
         [DataColumn]
         public int JournalsCategory { get; set; }
+        /// <summary>
+        /// 收藏次数
+        /// </summary>
+        [DataColumn]
+        public int CollectCount { get; set; }
+        /// <summary>
+        /// 转发数量
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int RetransmissionCount { get; set; }
+        /// <summary>
+        /// 浏览量
+        /// </summary>
+        [DataColumn]
+        public int ReadCount { get; set; }
+        /// <summary>
+        /// 评论数量
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+
+        public int CommentCount { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.EnumConst/AllTypeConst.cs

@@ -3,7 +3,7 @@ using System.ComponentModel;
 namespace GxPress.EnumConst
 {
     /// <summary>
-    /// 文件夹类型  1文章 2话题 3 收藏 4笔记 5通知 6站内信  7小组 8 会议详情  14工作流审批 300 文件 400会议纪要
+    /// 文件夹类型  文章100,话题2,收藏3,笔记4,通知5,站内信6,小组7,收藏文件夹12,笔记文件夹13,工作流审批14,文件300,图片301,会议纪要8,会议详情500,财务报表601,人事报表602,出版报表603,书籍20,课程30,音频40,期刊50,视频60,名栏90,公众号110,刊期120
     /// </summary>
     public enum AllTypeConst
     {

gx_api/GxPress/Service/GxPress.Service.Implement/PlatformData/PlatformDataService.cs

@@ -0,0 +1,20 @@
+using GxPress.Repository.Interface;
+using GxPress.Service.Interface.PlatformData;
+
+namespace GxPress.Service.Implement.PlatformData
+{
+    public class PlatformDataService : IPlatformDataService
+    {
+        private readonly IUserRepository userRepository;
+        public PlatformDataService(IUserRepository userRepository)
+        {
+            this.userRepository = userRepository;
+        }
+
+        // public async Task<PlatformDataResult> GetPlatformDataAsync()
+        // {
+        //     var result = new PlatformDataResult();
+        //     result.PlatformOperationDataResult = new PlatformOperationDataResult();
+        // }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Interface/PlatformData/IPlatformDataService.cs

@@ -0,0 +1,7 @@
+namespace GxPress.Service.Interface.PlatformData
+{
+    public interface IPlatformDataService:IService
+    {
+         
+    }
+}