增加院校分数线与专业分数线

New_College.Api/Controllers/Back/D_PlanMajorScoreLineController.cs

@@ -1,76 +0,0 @@
-using New_College.IServices;
-using New_College.Model;
-using New_College.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace New_College.Api.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    [Authorize(Permissions.Name)]
-    public class D_PlanMajorScoreLineController : ControllerBase
-    {
-        /// <summary>
-        /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
-        /// </summary>
-        private readonly ID_PlanMajorScoreLineServices _d_PlanMajorScoreLineServices;
-
-        public D_PlanMajorScoreLineController(ID_PlanMajorScoreLineServices D_PlanMajorScoreLineServices)
-        {
-            _d_PlanMajorScoreLineServices = D_PlanMajorScoreLineServices;
-        }
-
-        [HttpGet]
-        public async Task<MessageModel<PageModel<D_PlanMajorScoreLine>>> Get(int page = 1, string key = "", int intPageSize = 50)
-        {
-            if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
-            {
-                key = "";
-            }
-
-            Expression<Func<D_PlanMajorScoreLine, bool>> whereExpression = a => a.Id > 0;
-
-            return new MessageModel<PageModel<D_PlanMajorScoreLine>>()
-            {
-                msg = "获取成功",
-                success = true,
-                response = await _d_PlanMajorScoreLineServices.QueryPage(whereExpression, page, intPageSize)
-            };
-
-        }
-
-        [HttpGet("{id}")]
-        public async Task<MessageModel<D_PlanMajorScoreLine>> Get(int id = 0)
-        {
-            return new MessageModel<D_PlanMajorScoreLine>()
-            {
-                msg = "获取成功",
-                success = true,
-                response = await _d_PlanMajorScoreLineServices.QueryById(id)
-            };
-        }
-
-        [HttpPost]
-        public async Task<MessageModel<string>> Post([FromBody] D_PlanMajorScoreLine request)
-        {
-            var data = new MessageModel<string>();
-
-            var id = await _d_PlanMajorScoreLineServices.Add(request);
-            data.success = id > 0;
-
-            if (data.success)
-            {
-                data.response = id.ObjToString();
-                data.msg = "添加成功";
-            }
-
-            return data;
-        }
-
-
-    }
-}

New_College.Api/Controllers/Back/D_QualificationLineController.cs

@@ -1,76 +0,0 @@
-using New_College.IServices;
-using New_College.Model;
-using New_College.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace New_College.Api.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    [Authorize(Permissions.Name)]
-    public class D_QualificationLineController : ControllerBase
-    {
-        /// <summary>
-        /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
-        /// </summary>
-        private readonly ID_QualificationLineServices _d_QualificationLineServices;
-
-        public D_QualificationLineController(ID_QualificationLineServices D_QualificationLineServices)
-        {
-            _d_QualificationLineServices = D_QualificationLineServices;
-        }
-
-        [HttpGet]
-        public async Task<MessageModel<PageModel<D_QualificationLine>>> Get(int page = 1, string key = "", int intPageSize = 50)
-        {
-            if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
-            {
-                key = "";
-            }
-
-            Expression<Func<D_QualificationLine, bool>> whereExpression = a => a.Id > 0;
-
-            return new MessageModel<PageModel<D_QualificationLine>>()
-            {
-                msg = "获取成功",
-                success = true,
-                response = await _d_QualificationLineServices.QueryPage(whereExpression, page, intPageSize)
-            };
-
-        }
-
-        [HttpGet("{id}")]
-        public async Task<MessageModel<D_QualificationLine>> Get(int id = 0)
-        {
-            return new MessageModel<D_QualificationLine>()
-            {
-                msg = "获取成功",
-                success = true,
-                response = await _d_QualificationLineServices.QueryById(id)
-            };
-        }
-
-        [HttpPost]
-        public async Task<MessageModel<string>> Post([FromBody] D_QualificationLine request)
-        {
-            var data = new MessageModel<string>();
-
-            var id = await _d_QualificationLineServices.Add(request);
-            data.success = id > 0;
-
-            if (data.success)
-            {
-                data.response = id.ObjToString();
-                data.msg = "添加成功";
-            }
-
-            return data;
-        }
-
-
-    }
-}

New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs

@@ -0,0 +1,88 @@
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using New_College.Model.ViewModels;
+using New_College.Services;
+using System.Linq;
+using SqlSugar;
+
+namespace New_College.Api.Controllers
+{
+
+    /// <summary>
+    /// 专业分数线
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    [Authorize]
+    public class PlanMajorScoreLineController : ControllerBase
+    {
+        /// <summary>
+        /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+        /// </summary>
+        private readonly ID_PlanMajorScoreLineServices _d_PlanMajorScoreLineServices;
+
+        public PlanMajorScoreLineController(ID_PlanMajorScoreLineServices D_PlanMajorScoreLineServices)
+        {
+            _d_PlanMajorScoreLineServices = D_PlanMajorScoreLineServices;
+        }
+
+
+        /// <summary>
+        /// 获取学校专业分数线
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<List<PlanMajorScoreLineResponse>>> Get([FromQuery] PlanMajorScoreLineRequest request)
+        {
+            if (request.Uid <= 0)
+            {
+                return new MessageModel<List<PlanMajorScoreLineResponse>>()
+                {
+                    success = false,
+                    msg = "uid必传"
+                };
+            }
+            Expression<Func<D_PlanMajorScoreLine, bool>> expression = Expressionable.Create<D_PlanMajorScoreLine>()
+           .And(c => c.UId == request.Uid)
+           .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
+            .AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
+           .ToExpression();
+            var response = (await _d_PlanMajorScoreLineServices.Query(expression))
+                .Select(c => new PlanMajorScoreLineResponse()
+                {
+                    BatchName = c.BatchName,
+                    UId = request.Uid,
+                    LowScore = c.LowScore,
+                    LowScoreRank = c.LowScoreRank,
+                    AvgScore = c.AvgScore,
+                    Years = c.Years,
+                    FirstType = c.FirstType,
+                    HighScore = c.HighScore,
+                    Major = c.Major,
+                    MajorGroup = c.MajorGroup,
+                    Remark = c.Remark,
+                    SelectSubject = c.SelectSubject,
+
+                }).ToList();
+            return new MessageModel<List<PlanMajorScoreLineResponse>>()
+            {
+                msg = "获取成功",
+                success = true,
+                response = response
+            };
+
+        }
+
+
+
+
+    }
+}

New_College.Api/Controllers/Back/QualificationLineController.cs

@@ -0,0 +1,82 @@
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+
+namespace New_College.Api.Controllers
+{
+
+
+    /// <summary>
+    /// 院校投档线
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    [Authorize]
+    public class QualificationLineController : ControllerBase
+    {
+        /// <summary>
+        /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+        /// </summary>
+        private readonly ID_QualificationLineServices _d_QualificationLineServices;
+
+        public QualificationLineController(ID_QualificationLineServices D_QualificationLineServices)
+        {
+            _d_QualificationLineServices = D_QualificationLineServices;
+        }
+
+
+
+        /// <summary>
+        /// 获取院校各年份省控线
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<List<QualificationLineResponse>>> Get([FromQuery] QualificationLineRequest request)
+        {
+            if (request.Uid <= 0)
+            {
+                return new MessageModel<List<QualificationLineResponse>>()
+                {
+                    success = false,
+                    msg = "uid必传"
+
+                };
+            }
+
+            Expression<Func<D_QualificationLine, bool>> expression = Expressionable.Create<D_QualificationLine>()
+                .And(c => c.UId == request.Uid)
+                .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
+                 .AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
+                .ToExpression();
+            var response = (await _d_QualificationLineServices.Query(expression))
+                .Select(c => new QualificationLineResponse()
+                {
+                    BatchName = c.BatchName,
+                    UId = request.Uid,
+                    LowScore = c.LowScore,
+                    LowScoreRank = c.LowScoreRank,
+                    ProvinceScore = c.ProvinceScore,
+                    RecruitType = c.RecruitType,
+                    Years = c.Years,
+                }).ToList();
+            return new MessageModel<List<QualificationLineResponse>>()
+            {
+                msg = "获取成功",
+                success = true,
+                response = response
+            };
+        }
+
+
+
+    }
+}

New_College.Api/Controllers/Front/LibraryController.cs

@@ -112,7 +112,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<MessageModel<PageModel<UniversityResult>>> GetUniversitys([FromQuery] UniversityQuery query)
+        public async Task<MessageModel<PageModel<UniversityResult>>> GetUniversitys([FromBody] UniversityQuery query)
         {
             var result = await iD_LongIdMapServices.GetUniversitys(query);
             if (result.data == null || result.data.Count <= 0)

New_College.Api/New_College.Model.xml

@@ -726,6 +726,16 @@
             最低分
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.D_PlanMajorScoreLine.PlanCount">
+            <summary>
+            招生计划人数
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_PlanMajorScoreLine.MajorGroup">
+            <summary>
+            专业组
+            </summary>
+        </member>
         <member name="P:New_College.Model.Models.D_PlanMajorScoreLine.LowScoreRank">
             <summary>
             最低分排名
@@ -736,11 +746,6 @@
             生源地
             </summary>
         </member>
-        <member name="P:New_College.Model.Models.D_PlanMajorScoreLine.MajorGroup">
-            <summary>
-            专业组
-            </summary>
-        </member>
         <member name="T:New_College.Model.Models.D_QualificationLine">
              <summary>
             各个省份投档资格线
@@ -3290,6 +3295,56 @@
             
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.UId">
+            <summary>
+            院校Id
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.Years">
+            <summary>
+            年份
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.BatchName">
+            <summary>
+            批次
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.SelectSubject">
+            <summary>
+            选科要求
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.FirstType">
+            <summary>
+            一级学科
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.AvgScore">
+            <summary>
+            平均分
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.HighScore">
+            <summary>
+            最高分
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.LowScore">
+            <summary>
+            最低分
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.LowScoreRank">
+            <summary>
+            最低分排名
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanMajorScoreLineResponse.MajorGroup">
+            <summary>
+            专业组
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.CategoryInfoQuery.Type">
             <summary>
             测评类型
@@ -5505,6 +5560,11 @@
             硕士数
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.UniversityResult.Web">
+            <summary>
+            官网
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.UniversityResult.Id">
             <summary>
             主键id
@@ -6265,6 +6325,41 @@
             
             </summary>
         </member>
+        <member name="P:New_College.Model.QualificationLineResponse.UId">
+            <summary>
+            院校Id
+            </summary>
+        </member>
+        <member name="P:New_College.Model.QualificationLineResponse.Years">
+            <summary>
+            年份
+            </summary>
+        </member>
+        <member name="P:New_College.Model.QualificationLineResponse.BatchName">
+            <summary>
+            批次
+            </summary>
+        </member>
+        <member name="P:New_College.Model.QualificationLineResponse.LowScore">
+            <summary>
+            最低分
+            </summary>
+        </member>
+        <member name="P:New_College.Model.QualificationLineResponse.LowScoreRank">
+            <summary>
+            最低分排名
+            </summary>
+        </member>
+        <member name="P:New_College.Model.QualificationLineResponse.ProvinceScore">
+            <summary>
+            省控线
+            </summary>
+        </member>
+        <member name="P:New_College.Model.QualificationLineResponse.RecruitType">
+            <summary>
+            招生类型
+            </summary>
+        </member>
         <member name="P:New_College.Model.SeVolunterInitializationDto.Policy">
             <summary>
             

New_College.Api/New_College.xml

@@ -127,21 +127,45 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="F:New_College.Api.Controllers.D_PlanMajorScoreLineController._d_PlanMajorScoreLineServices">
-            <summary>
-            服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
-            </summary>
-        </member>
-        <member name="F:New_College.Api.Controllers.D_QualificationLineController._d_QualificationLineServices">
-            <summary>
-            服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
-            </summary>
-        </member>
         <member name="F:New_College.Api.Controllers.D_ScoreLineController._d_ScoreLineServices">
             <summary>
             服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
             </summary>
         </member>
+        <member name="T:New_College.Api.Controllers.PlanMajorScoreLineController">
+            <summary>
+            专业分数线
+            </summary>
+        </member>
+        <member name="F:New_College.Api.Controllers.PlanMajorScoreLineController._d_PlanMajorScoreLineServices">
+            <summary>
+            服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+            </summary>
+        </member>
+        <member name="M:New_College.Api.Controllers.PlanMajorScoreLineController.Get(New_College.Model.ViewModels.PlanMajorScoreLineRequest)">
+            <summary>
+            获取学校专业分数线
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="T:New_College.Api.Controllers.QualificationLineController">
+            <summary>
+            院校投档线
+            </summary>
+        </member>
+        <member name="F:New_College.Api.Controllers.QualificationLineController._d_QualificationLineServices">
+            <summary>
+            服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+            </summary>
+        </member>
+        <member name="M:New_College.Api.Controllers.QualificationLineController.Get(New_College.Model.QualificationLineRequest)">
+            <summary>
+            获取院校各年份省控线
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="F:New_College.Api.Controllers.Sys_TenantController._sys_TenantServices">
             <summary>
             服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下

New_College.Model/Models/D_PlanMajorScoreLine.cs

@@ -78,6 +78,16 @@ namespace New_College.Model.Models
         /// </summary>
         public int LowScore { get; set; }
 
+        /// <summary>
+        /// 招生计划人数
+        /// </summary>
+        public int PlanCount { get; set; }
+
+        /// <summary>
+        /// 专业组
+        /// </summary>
+        public string MajorGroup { get; set; }
+
         /// <summary>
         /// 最低分排名
         /// </summary>
@@ -88,10 +98,6 @@ namespace New_College.Model.Models
         /// </summary>
         public string Location { get; set; }
 
-        /// <summary>
-        /// 专业组
-        /// </summary>
-        public string MajorGroup { get; set; }
 
 
     }

New_College.Model/ViewModels/PlanMajorScoreLineViewModel.cs

@@ -0,0 +1,88 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model.ViewModels
+{
+    public class PlanMajorScoreLineRequest
+    {
+        public int Uid { get; set; }
+
+        public int? Year { get; set; }
+
+        public string BatchName { get; set; }
+
+    }
+
+
+    public class PlanMajorScoreLineResponse
+    {
+
+        /// <summary>
+        /// 院校Id
+        /// </summary>
+        public int UId { get; set; }
+
+
+        /// <summary>
+        /// 年份
+        /// </summary>
+        public int Years { get; set; }
+
+
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string BatchName { get; set; }
+
+        /// <summary>
+        /// 选科要求
+        /// </summary>
+        public string SelectSubject { get; set; }
+
+
+        /// <summary>
+        /// 一级学科
+        /// </summary>
+
+        public string FirstType { get; set; }
+
+
+        public string Major { get; set; }
+
+
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 平均分
+        /// </summary>
+        public string AvgScore { get; set; }
+
+        /// <summary>
+        /// 最高分
+        /// </summary>
+        public string HighScore { get; set; }
+
+        /// <summary>
+        /// 最低分
+        /// </summary>
+        public int LowScore { get; set; }
+
+        /// <summary>
+        /// 最低分排名
+        /// </summary>
+        public int LowScoreRank { get; set; }
+
+
+
+        /// <summary>
+        /// 专业组
+        /// </summary>
+        public string MajorGroup { get; set; }
+
+
+
+    }
+}

New_College.Model/ViewModels/QualificationLineViewModel.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model
+{
+    public class QualificationLineRequest 
+    {
+        public int Uid { get; set; }
+
+
+        public int? Year { get; set; }
+
+        public string BatchName { get; set; }
+
+    }
+
+    public class QualificationLineResponse
+    {
+
+        /// <summary>
+        /// 院校Id
+        /// </summary>
+        public int UId { get; set; }
+
+        /// <summary>
+        /// 年份
+        /// </summary>
+        public int Years { get; set; }
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string BatchName { get; set; }
+        /// <summary>
+        /// 最低分
+        /// </summary>
+        public int LowScore { get; set; }
+
+        /// <summary>
+        /// 最低分排名
+        /// </summary>
+        public int LowScoreRank { get; set; }
+        /// <summary>
+        /// 省控线
+        /// </summary>
+        public int ProvinceScore { get; set; }
+        /// <summary>
+        /// 招生类型
+        /// </summary>
+        public string RecruitType { get; set; }
+
+    }
+
+
+}

New_College.Model/ViewModels/Result/UniversityResult.cs

@@ -6,6 +6,10 @@ namespace New_College.Model.ViewModels
 {
     public class UniversityResult
     {
+        /// <summary>
+        /// 官网
+        /// </summary>
+        public string Web { get; set; }
         /// <summary>
         /// 主键id
         /// </summary>

New_College.Model/ViewModels/Result/VolunteerResult.cs

@@ -137,7 +137,7 @@ namespace New_College.Model.ViewModels
         ///// 批次Id
         ///// </summary>
         //public string BatchtypeId { get; set; }
-
+        public string Web { get; set; }
         public string AscriptionName { get; set; }
     }
 

New_College.Services/D_LongIdMapServices.cs

@@ -324,6 +324,7 @@ namespace New_College.Services
                 DoctorateCount = university.Doctorate_Count,
                 MasterCount = university.Master_Count,
                 AcademicianCount = university.Academician_Count,
+                 Web=university.Web,
                 //  IsCollection = false,
                 Description = ClearHtmlHelper.SHTML(university.Description),
                 LongSchoolId = (await _dal.Query(x => x.IsDelete == false && x.table == "D_University" && x.newid == university.Id)).Select(x => x.longid).FirstOrDefault()

New_College.sln

@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "New_College.ConsoleApp", "N
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "New_College.AdminMvc", "New_College.AdminMvc\New_College.AdminMvc.csproj", "{06D885F3-6352-4BF6-B826-DEA742DFFBD7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "New_Spider", "New_Spider\New_Spider.csproj", "{E23857BF-DFBB-49DD-A86A-1B2932F6D33B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "New_Spider", "New_Spider\New_Spider.csproj", "{E23857BF-DFBB-49DD-A86A-1B2932F6D33B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution