diff --git a/New_College.Api/Controllers/Front/NewsInfoController.cs b/New_College.Api/Controllers/Front/NewsInfoController.cs index e5ff98b..eb90b39 100644 --- a/New_College.Api/Controllers/Front/NewsInfoController.cs +++ b/New_College.Api/Controllers/Front/NewsInfoController.cs @@ -59,7 +59,7 @@ namespace New_College.Api.Controllers.Front try { var list = new List(); - var query = (await d_NewsInfo.Query(e => e.IsDelete == false && e.CategoryId == request.CategoryId, " CreateTime desc")).Take(request.Top).OrderByDescending(s => s.Id); + var query = (await d_NewsInfo.Query(e => e.IsDelete == false && e.CategoryId == request.CategoryId && e.ProvinceCode == request.provinceCode, " CreateTime desc")).Take(request.Top).OrderByDescending(s => s.Id); list = query.Select(s => new NewsInfoResponse { CoverImg = s.CoverImg, @@ -99,7 +99,8 @@ namespace New_College.Api.Controllers.Front var pageresponse = new PageModel(); try { - var pageinfo = await d_NewsInfo.QueryPage(w => w.CategoryId == request.CategoryId, request.PageIndex, request.PageSize, "CreateTime desc"); + /// + var pageinfo = await d_NewsInfo.QueryPage(w => w.CategoryId == request.CategoryId&&w.ProvinceCode==request.provinceCode, request.PageIndex, request.PageSize, "CreateTime desc"); if (pageinfo.data.Any()) { pageresponse.data = pageinfo.data.Select(s => new NewsInfoResponse() diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index 63492e9..753d14b 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -500,6 +500,11 @@ + + + 省份编号 + + @@ -3469,6 +3474,11 @@ 退出重新登录时传此值 + + + + + 状态:0、未启用,1、启用,2、禁用 diff --git a/New_College.Model/Models/D_NewsInfo.cs b/New_College.Model/Models/D_NewsInfo.cs index d521b77..7ce4ff4 100644 --- a/New_College.Model/Models/D_NewsInfo.cs +++ b/New_College.Model/Models/D_NewsInfo.cs @@ -12,6 +12,11 @@ namespace New_College.Model.Models /// /// public string Author { get; set; } + + /// + /// 省份编号 + /// + public string ProvinceCode { get; set; } public string Title { get; set; } public string CoverImg { get; set; } diff --git a/New_College.Model/Request/NewsPageRequest.cs b/New_College.Model/Request/NewsPageRequest.cs index 1ba3292..cd16ae1 100644 --- a/New_College.Model/Request/NewsPageRequest.cs +++ b/New_College.Model/Request/NewsPageRequest.cs @@ -8,5 +8,7 @@ namespace New_College.Model.Request public class NewsPageRequest : BasePageRequest { public int CategoryId { get; set; } + + public string provinceCode { get; set; } = "370000"; } } diff --git a/New_College.Model/Request/NewsRequest.cs b/New_College.Model/Request/NewsRequest.cs index 5163588..125635b 100644 --- a/New_College.Model/Request/NewsRequest.cs +++ b/New_College.Model/Request/NewsRequest.cs @@ -10,5 +10,10 @@ namespace New_College.Model.Request public int CategoryId { get; set; } + /// + /// + /// + public string provinceCode { get; set; } = "370000"; + } } diff --git a/New_College.Tasks/HostedService/JobTimedSpiderService.cs b/New_College.Tasks/HostedService/JobTimedSpiderService.cs index 3756d63..6841cd5 100644 --- a/New_College.Tasks/HostedService/JobTimedSpiderService.cs +++ b/New_College.Tasks/HostedService/JobTimedSpiderService.cs @@ -47,6 +47,7 @@ namespace New_College.Tasks Author = c.author, CategoryId = 1, CreateBy = "spdier", + ProvinceCode = "370000", CreateId = 1, CreateTime = c.pubtime, Detail = c.detail,