1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminPlatformDataController.cs

@@ -45,5 +45,33 @@ namespace GxPress.Api.AdminControllers
             result.ContentSaleProportionResults = await platformDataService.GetContentSaleProportionResults();
             return result;
         }
+        /// <summary>
+        /// 内容数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("content-data")]
+        public async Task<ContentDataResult> GetContentDataResult()
+        {
+            var result = new ContentDataResult();
+            result.PlatformContentDataInfoResult = await platformDataService.GetPlatformContentDataInfoResults();
+            result.ContentTypeDistributingResult = await platformDataService.GetContentTypeDistributingResults();
+            result.ContentOlogyDistributingResult = new List<ContentOlogyDistributingResult>();
+            result.PayContentstatisticsResult = await platformDataService.GetPayContentstatisticsResult();
+            result.ContentIncreaseResult = await platformDataService.GetContentIncreaseResult();
+            return result;
+        }
+        /// <summary>
+        /// 访问数据
+        /// /// </summary>
+        /// <returns></returns>
+        [HttpGet("visit-data")]
+        public async Task<VisitDataResult> GetVisitDataResult()
+        {
+            var result = new VisitDataResult();
+            result.PlatformAccumulativeVisitResult = await platformDataService.GetPlatformAccumulativeVisitResult();
+            result.VisitPortResult = new List<VisitPortResult>();
+            result.PlatformTodayVisitResult = await platformDataService.GetPlatformTodayVisitResult();
+            return result;
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Result/DataCenter/ContentDataResult.cs

@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+
+namespace GxPress.Result.DataCenter
+{
+    /// <summary>
+    /// 内容数据
+    /// </summary>
+    public class ContentDataResult
+    {
+        /// <summary>
+        /// 平台内容数据
+        /// </summary>
+        /// <value></value>
+        public List<PlatformContentDataInfoResult> PlatformContentDataInfoResult { get; set; }
+        /// <summary>
+        /// 内容类型分布图
+        /// </summary>
+        public List<ContentTypeDistributingResult> ContentTypeDistributingResult { get; set; }
+        /// <summary>
+        /// 内容科学分布图
+        /// </summary>
+        public List<ContentOlogyDistributingResult> ContentOlogyDistributingResult { get; set; }
+        /// <summary>
+        /// 收费内容统计图
+        /// </summary>
+        public PayContentstatisticsResult PayContentstatisticsResult { get; set; }
+        /// <summary>
+        /// 内容增长情况图
+        /// </summary>
+        public ContentIncreaseResult ContentIncreaseResult { get; set; }
+    }
+    /// <summary>
+    /// 平台内容数据
+    /// </summary>
+    public class PlatformContentDataInfoResult
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        /// <value></value>
+        public string Type { get; set; }
+        /// <summary>
+        /// 值
+        /// </summary>
+        /// <value></value>
+        public int Value { get; set; }
+        /// <summary>
+        /// item
+        /// </summary>
+        /// <value></value>
+        public List<PlatformContentDataInfoItemResult> Item { get; set; }
+    }
+    /// <summary>
+    /// 平台内容数据Item
+    /// </summary>
+    public class PlatformContentDataInfoItemResult
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        /// <value></value>
+        public string Type { get; set; }
+        /// <summary>
+        /// 值
+        /// </summary>
+        /// <value></value>
+        public int Value { get; set; }
+    }
+}

gx_api/GxPress/Model/GxPress.Result/DataCenter/PlatformDataResult.cs

@@ -290,6 +290,32 @@ namespace GxPress.Result.DataCenter
         public int CommentCount { get; set; }
     }
     /// <summary>
+    /// 同比上周
+    /// </summary>
+    public class PlatformWeekVisitResult
+    {
+        /// <summary>
+        /// 访问数量
+        /// </summary>
+        /// <value></value>
+        public int VisitRatio { get; set; }
+        /// <summary>
+        /// 收藏
+        /// </summary>
+        /// <value></value>
+        public int CollctionRatio { get; set; }
+        /// <summary>
+        /// 转发
+        /// </summary>
+        /// <value></value>
+        public int RetransmissionRatio { get; set; }
+        /// <summary>
+        /// 评论
+        /// </summary>
+        /// <value></value>
+        public int CommentRatio { get; set; }
+    }
+    /// <summary>
     /// 访问终端统计
     /// </summary>
     public class VisitPortResult

gx_api/GxPress/Model/GxPress.Result/DataCenter/VisitDataResult.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace GxPress.Result.DataCenter
+{
+    /// <summary>
+    /// 访问数据
+    /// </summary>
+    public class VisitDataResult
+    {
+        /// <summary>
+        ///  平台累计访问数据(次)
+        /// </summary>
+        public PlatformAccumulativeVisitResult PlatformAccumulativeVisitResult { get; set; }
+        /// <summary>
+        ///  今日访问数据
+        /// </summary>
+        public PlatformAccumulativeVisitResult PlatformTodayVisitResult { get; set; }
+        /// <summary>
+        /// 访问终端统计
+        /// </summary>
+        public List<VisitPortResult> VisitPortResult { get; set; }
+    }
+
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/Media/MediaRepository.cs

@@ -303,7 +303,10 @@ namespace GxPress.Repository.Implement.Media
         public async Task<int> CountAsync(string beginTime, string endTime)
         {
             return await _repository.CountAsync(Q.WhereDate(nameof(Entity.tede2.Media.Media.CreatedDate), ">=", beginTime).WhereDate(nameof(Entity.tede2.Media.Media.CreatedDate), "<=", endTime));
-
+        }
+        public async Task<int> CountAsync(SqlKata.Query query)
+        {
+            return await _repository.CountAsync(query);
         }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/Media/IMediaRepository.cs

@@ -27,5 +27,6 @@ namespace GxPress.Repository.Interface.Media
 
         Task<PagedList<Entity.tede2.Media.Media>> GetAllAsync(MediaSearchRequest request);
         Task<int> CountAsync(string beginTime, string endTiem);
+        Task<int> CountAsync(SqlKata.Query query);
     }
 }

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

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Dapper;
+using Datory;
+using GxPress.Common.Tools;
+using GxPress.EnumConst;
+using GxPress.Result.DataCenter;
+
+namespace GxPress.Service.Implement.PlatformData
+{
+    public partial class PlatformDataService
+    {
+        /// <summary>
+        /// 内容数据
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<PlatformContentDataInfoResult>> GetPlatformContentDataInfoResults()
+        {
+            var connectionString = ConfigHelper.GetValue("Database:ConnectionString");
+            var database = new Database(DatabaseType.MySql, connectionString);
+            var connection = database.GetConnection();
+            var nowTime = DateTime.Now.ToString("yyyy-MM-dd");
+            var sql = $@"SELECT 
+                            (SELECT 
+                                    COUNT(1)
+                                FROM
+                                    tede_media) AS SumContentCount,
+                            (SELECT 
+                                    COUNT(1)
+                                FROM
+                                    tede_media
+                                WHERE
+                                    CreatedDate > '{nowTime}') AS NewContentCount,
+                            (SELECT 
+                                    COUNT(1)
+                                FROM
+                                    tede_media
+                                WHERE
+                                IsChecked=1 and IsDelete=0) AS OnlineContentCount,
+                                (SELECT 
+                                    COUNT(1)
+                                FROM
+                                    tede_media
+                                WHERE
+                                FreeProportion>0) AS PayContentCount";
+            var model = await connection.QueryFirstAsync<PlatformContentDataResult>(sql);
+            var result = new List<PlatformContentDataInfoResult>();
+            for (int i = 0; i < 4; i++)
+            {
+                if (i == 0)
+                {
+                    var dto = new PlatformContentDataInfoResult();
+                    dto.Type = "内容总量(条)";
+                    dto.Value = model.SumContentCount;
+                    result.Add(dto);
+                }
+                if (i == 1)
+                {
+                    var dto = new PlatformContentDataInfoResult();
+                    dto.Type = "今日新增内容量(条)";
+                    dto.Value = model.NewContentCount;
+                    result.Add(dto);
+                }
+                if (i == 2)
+                {
+                    var dto = new PlatformContentDataInfoResult();
+                    dto.Type = "在线出版量(条)";
+                    dto.Value = model.OnlineContentCount;
+                    result.Add(dto);
+                }
+                if (i == 3)
+                {
+                    var dto = new PlatformContentDataInfoResult();
+                    dto.Type = "付费内容量(条)";
+                    dto.Value = model.PayContentCount;
+                    result.Add(dto);
+                }
+                result[i].Item = await GetPlatformContentDataInfoItemResults(i);
+            }
+            return result;
+        }
+
+        public async Task<List<PlatformContentDataInfoItemResult>> GetPlatformContentDataInfoItemResults(int typeId)
+        {
+            var query = Q.NewQuery();
+            if (typeId == 1)
+            {
+                var nowTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
+                query.WhereDate(nameof(Entity.tede2.Media.Media.CreatedDate), ">=", nowTime);
+                query.WhereDate(nameof(Entity.tede2.Media.Media.CreatedDate), "<=", DateTime.Now);
+            }
+            if (typeId == 2)
+            {
+                query.Where(nameof(Entity.tede2.Media.Media.IsChecked), true);
+            }
+            if (typeId == 3)
+            {
+                query.Where(nameof(Entity.tede2.Media.Media.FreeProportion), ">", 0);
+            }
+            var result = new List<PlatformContentDataInfoItemResult>();
+            foreach (ResourceTypeConst item in Enum.GetValues(typeof(ResourceTypeConst)))
+            {
+                query.Where(nameof(Entity.tede2.Media.Media.MediaType), item.GetHashCode());
+                var model = new PlatformContentDataInfoItemResult();
+                model.Type = item.GetDescriptionOriginal();
+                model.Value = await mediaRepository.CountAsync(query);
+                result.Add(model);
+            }
+            foreach (AttachTypeConst item in Enum.GetValues(typeof(AttachTypeConst)))
+            {
+                var model = new PlatformContentDataInfoItemResult();
+                model.Type = item.GetDescriptionOriginal();
+                query.Where(nameof(Entity.tede2.Media.Media.AttachType), item.GetHashCode());
+                model.Value = await mediaRepository.CountAsync(query);
+                result.Add(model);
+            }
+            return result;
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+using System;
+using System.Threading.Tasks;
+using Dapper;
+using Datory;
+using GxPress.Common.Tools;
+using GxPress.Result.DataCenter;
+
+namespace GxPress.Service.Implement.PlatformData
+{
+    public partial class PlatformDataService
+    {
+        /// <summary>
+        ///  平台累计访问数据(次)
+        /// </summary>
+        /// <returns></returns>
+        public async Task<PlatformAccumulativeVisitResult> GetPlatformTodayVisitResult()
+        {
+            var nowTime = DateTime.Now.ToString("yyyy-MM-dd");
+            var sql = $@"SELECT 
+                                (SELECT 
+                                        COUNT(1)
+                                    FROM
+                                        tede_visit
+                                    WHERE
+                                        CreatedDate > '{nowTime}') AS VisitCount,
+                                (SELECT 
+                                        COUNT(1)
+                                    FROM
+                                        tede_analyze
+                                    WHERE
+                                        AnalyzeType = 3
+                                            AND CreatedDate > '{nowTime}') AS RetransmissionCount,
+                                (SELECT 
+                                        COUNT(1)
+                                    FROM
+                                        tede_analyze
+                                    WHERE
+                                        AnalyzeType = 4
+                                            AND CreatedDate > '{nowTime}') AS CollctionCount,
+                                (SELECT 
+                                        COUNT(1)
+                                    FROM
+                                        tede_comment
+                                    WHERE
+                                        CreatedDate > '{nowTime}') AS CommentCount";
+            var connectionString = ConfigHelper.GetValue("Database:ConnectionString");
+            var database = new Database(DatabaseType.MySql, connectionString);
+            var connection = database.GetConnection();
+            return await connection.QueryFirstAsync<PlatformAccumulativeVisitResult>(sql);
+        }
+    }
+}

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

@@ -13,7 +13,7 @@ using GxPress.Service.Interface.PlatformData;
 
 namespace GxPress.Service.Implement.PlatformData
 {
-    public class PlatformDataService : IPlatformDataService
+    public partial class PlatformDataService : IPlatformDataService
     {
         private readonly IUserRepository userRepository;
 
@@ -194,7 +194,7 @@ namespace GxPress.Service.Implement.PlatformData
                 model.Value = await connection.ExecuteScalarAsync<int>(sql);
                 result.Add(model);
             }
-            foreach (ResourceTypeConst item in Enum.GetValues(typeof(AttachTypeConst)))
+            foreach (AttachTypeConst item in Enum.GetValues(typeof(AttachTypeConst)))
             {
                 var model = new ContentTypeDistributingResult();
                 model.Name = item.GetDescriptionOriginal();
@@ -226,7 +226,7 @@ namespace GxPress.Service.Implement.PlatformData
                 sql = $"select count(1) from tede_media where MediaType={item.GetHashCode()} and FreeProportion=0";
                 result.PageBdata.Add(await connection.ExecuteScalarAsync<int>(sql));
             }
-            foreach (ResourceTypeConst item in Enum.GetValues(typeof(AttachTypeConst)))
+            foreach (AttachTypeConst item in Enum.GetValues(typeof(AttachTypeConst)))
             {
                 result.Title.Add(item.GetDescriptionOriginal());
                 var sql = $"select count(1) from tede_media where AttachId={item.GetHashCode()} and FreeProportion>0";

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

@@ -71,5 +71,15 @@ namespace GxPress.Service.Interface.PlatformData
         /// </summary>
         /// <returns></returns>
         Task<List<ContentSaleProportionResult>> GetContentSaleProportionResults();
+        /// <summary>
+        /// 内容数据
+        /// </summary>
+        /// <returns></returns>
+        Task<List<PlatformContentDataInfoResult>> GetPlatformContentDataInfoResults();
+        /// <summary>
+        ///  平台累计访问数据(次)
+        /// </summary>
+        /// <returns></returns>
+         Task<PlatformAccumulativeVisitResult> GetPlatformTodayVisitResult();
     }
 }