yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add data

develop
old易 2024-01-02 17:09:10 +08:00
parent 9369273746
commit 8f13d2b5ed
11 changed files with 612 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -284,18 +284,16 @@ namespace New_College.Api.Controllers.Front
var data = new MessageModel<string>();
if (request.VId > 0)
{
var model = await _VolunteerTableServices.QueryById(request.VId);
_unitOfWork.BeginTran();
data.success = await _VolunteerTableServices.Update(new U_VolunteerTable()
{
BatchName = request.BatchName,
ModifyTime = DateTime.Now,
CustomerId = request.CustomerId,
Id = request.VId,
Score = request.Score,
SubjectClaim = request.SubjectClaim,
Type = request.Type,
//VolunteerTableName = request.VolunteerTableName
});
if (!string.IsNullOrWhiteSpace(request.BatchName)) { model.BatchName = request.BatchName; }
if (!string.IsNullOrWhiteSpace(request.SubjectClaim)) { model.SubjectClaim = request.SubjectClaim; }
if (!string.IsNullOrWhiteSpace(request.Type)) { model.Type = request.Type; }
if (!string.IsNullOrWhiteSpace(request.VolunteerTableName)) { model.VolunteerTableName = request.VolunteerTableName; }
if (request.CustomerId > 0) { model.CustomerId = request.CustomerId; }
if (request.Score > 0) { model.Score = request.Score; }
model.ModifyTime = DateTime.Now;
data.success = await _VolunteerTableServices.Update(model);
//删掉之前的志愿表，更新新的匹配进来
var itemids = (await _VolunteerTableDetailServices.Query(c => c.VolunteerTableId == request.VId)).Select(c => (object)c.Id).ToArray();
var status = await _VolunteerTableDetailServices.DeleteByIds(itemids);

3
New_College.Api/Controllers/HealthCheckController.cs
View File

@ -16,6 +16,7 @@ namespace New_College.Controllers
private readonly IT_EnrollmentPlaneServices t_EnrollmentPlane;
private readonly ID_LongIdMapServices d_LongIdMapServices;
public HealthCheckController(IT_EnrollmentPlaneServices t_EnrollmentPlaneServices, ID_LongIdMapServices d_LongIdMapServices)
{
t_EnrollmentPlane = t_EnrollmentPlaneServices;
@ -66,7 +67,7 @@ namespace New_College.Controllers
return d_LongIdMapServices.Import();
// return d_LongIdMapServices.UpdateUniveristyInf();
}
}

240
New_College.Api/New_College.Model.xml
View File

@ -1236,6 +1236,11 @@
院校图片列表地址
</summary>
</member>
<member name="P:New_College.Model.Models.D_Universityimg.VRUrl">
<summary>
VR地址
</summary>
</member>
<member name="P:New_College.Model.Models.D_UniversityRank.UniversityName">
<summary>
院校名称
@ -2642,6 +2647,241 @@
满分
</summary>
</member>
<member name="T:New_College.Model.Models.T_TbSNeedDataInfo">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.EnrollmentType">
<summary>
招生类型
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.EnrollmentCode">
<summary>
全国统一招生代码
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.UniversityName">
<summary>
院校名称
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MajorCode">
<summary>
专业代码
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MajorName">
<summary>
专业名称
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.Nature">
<summary>
办学性质
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.Remark">
<summary>
注意事项
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.FirstType">
<summary>
专业大类
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23subject">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._24subject">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23Count">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._Score">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23Score">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23ScoreLine">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23SchoolScore">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23SchoolScoreLine">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23SchoolAvgScore">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23SchoolAvgLine">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._22Count">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._22Score">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._22ScoreLine">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._21Count">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._21Score">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._21ScoreLine">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._20Count">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._20Score">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._20ScoreLine">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.AcademicYear">
<summary>
学制
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.Fee">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.Province">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.City">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.Ownership">
<summary>
主管部门
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.LnstitutionalLevel">
<summary>
院校水平
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.ProfessionalAssessment">
<summary>
专业评估
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MastersDegree">
<summary>
硕士点
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MastersMajor">
<summary>
硕士专业
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.PhDPoint">
<summary>
博士点
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.PhDMajor">
<summary>
博士专业
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MjaorLevel">
<summary>
专业水平
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.EducationCategory">
<summary>
本/专
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.UniversityRank">
<summary>
院校排名
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MajorRank">
<summary>
专业排名
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MajorRankPercentage">
<summary>
专业占比
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MajorCount">
<summary>
专业数量
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.VRUrl">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.EmploymentQuality">
<summary>
就业质量
</summary>
</member>
<member name="T:New_College.Model.Models.UserRole">
<summary>
用户跟角色关联表

1
New_College.IServices/ID_LongIdMapServices.cs
View File

@ -15,6 +15,7 @@ namespace New_College.IServices
{
Task<bool> Import();
Task<bool> UpdateUniveristyInf();
Task<PageModel<UniversityResult>> GetUniversitys(UniversityQuery query);
Task<List<uniMajorInfoResult>> uniGetMajorInfo(MajorcategoryQuery query);

12
New_College.IServices/IT_TbSNeedDataInfoServices.cs Normal file
View File

@ -0,0 +1,12 @@
using New_College.IServices.BASE;
using New_College.Model.Models;
namespace New_College.IServices
{
/// <summary>
/// IT_TbSNeedDataInfoServices
/// </summary>
public interface IT_TbSNeedDataInfoServices :IBaseServices<T_TbSNeedDataInfo>
{
}
}

6
New_College.Model/Models/D_Universityimg.cs
View File

@ -17,5 +17,11 @@ namespace New_College.Model.Models
/// </summary>
[SugarColumn(ColumnDataType = "longtext", Length = int.MaxValue, IsNullable = true)]
public string ImgList { get; set; }
/// <summary>
/// VR地址
/// </summary>
[SugarColumn(ColumnDataType = "nvarchar", Length = 300, IsNullable = true)]
public string VRUrl { get; set; }
}
}

242
New_College.Model/Models/T_TbSNeedDataInfo.cs Normal file
View File

@ -0,0 +1,242 @@
using SqlSugar;
namespace New_College.Model.Models
{
/// <summary>
///
/// </summary>
//[SugarTable("T_TbSNeedDataInfo")]
public class T_TbSNeedDataInfo
{
/// <summary>
/// 招生类型
/// </summary>
[SugarColumn(ColumnName="EnrollmentType" )]
public string EnrollmentType { get; set; }
/// <summary>
/// 全国统一招生代码
/// </summary>
[SugarColumn(ColumnName="EnrollmentCode" )]
public string EnrollmentCode { get; set; }
/// <summary>
/// 院校名称
/// </summary>
[SugarColumn(ColumnName="UniversityName" )]
public string UniversityName { get; set; }
/// <summary>
/// 专业代码
/// </summary>
[SugarColumn(ColumnName="MajorCode" )]
public string MajorCode { get; set; }
/// <summary>
/// 专业名称
/// </summary>
[SugarColumn(ColumnName="MajorName" )]
public string MajorName { get; set; }
/// <summary>
/// 办学性质
/// </summary>
[SugarColumn(ColumnName="Nature" )]
public string Nature { get; set; }
/// <summary>
/// 注意事项
/// </summary>
[SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; }
/// <summary>
/// 专业大类
/// </summary>
[SugarColumn(ColumnName="FirstType" )]
public string FirstType { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23subject" )]
public string _23subject { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_24subject" )]
public string _24subject { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23Count" )]
public string _23Count { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_Score" )]
public string _Score { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23Score" )]
public string _23Score { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23ScoreLine" )]
public string _23ScoreLine { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23SchoolScore" )]
public string _23SchoolScore { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23SchoolScoreLine" )]
public string _23SchoolScoreLine { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23SchoolAvgScore" )]
public string _23SchoolAvgScore { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_23SchoolAvgLine" )]
public string _23SchoolAvgLine { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_22Count" )]
public string _22Count { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_22Score" )]
public string _22Score { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_22ScoreLine" )]
public string _22ScoreLine { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_21Count" )]
public string _21Count { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_21Score" )]
public string _21Score { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_21ScoreLine" )]
public string _21ScoreLine { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_20Count" )]
public string _20Count { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_20Score" )]
public string _20Score { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="_20ScoreLine" )]
public string _20ScoreLine { get; set; }
/// <summary>
/// 学制
/// </summary>
[SugarColumn(ColumnName="AcademicYear" )]
public string AcademicYear { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="Fee" )]
public string Fee { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="Province" )]
public string Province { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="City" )]
public string City { get; set; }
/// <summary>
/// 主管部门
/// </summary>
[SugarColumn(ColumnName="Ownership" )]
public string Ownership { get; set; }
/// <summary>
/// 院校水平
/// </summary>
[SugarColumn(ColumnName="LnstitutionalLevel" )]
public string LnstitutionalLevel { get; set; }
/// <summary>
/// 专业评估
/// </summary>
[SugarColumn(ColumnName="ProfessionalAssessment" )]
public string ProfessionalAssessment { get; set; }
/// <summary>
/// 硕士点
/// </summary>
[SugarColumn(ColumnName="MastersDegree" )]
public string MastersDegree { get; set; }
/// <summary>
/// 硕士专业
/// </summary>
[SugarColumn(ColumnName="MastersMajor" )]
public string MastersMajor { get; set; }
/// <summary>
/// 博士点
/// </summary>
[SugarColumn(ColumnName="PhDPoint" )]
public string PhDPoint { get; set; }
/// <summary>
/// 博士专业
/// </summary>
[SugarColumn(ColumnName="PhDMajor" )]
public string PhDMajor { get; set; }
/// <summary>
/// 专业水平
/// </summary>
[SugarColumn(ColumnName="MjaorLevel" )]
public string MjaorLevel { get; set; }
/// <summary>
/// 本/专
/// </summary>
[SugarColumn(ColumnName="EducationCategory" )]
public string EducationCategory { get; set; }
/// <summary>
/// 院校排名
/// </summary>
[SugarColumn(ColumnName="UniversityRank" )]
public string UniversityRank { get; set; }
/// <summary>
/// 专业排名
/// </summary>
[SugarColumn(ColumnName="MajorRank" )]
public string MajorRank { get; set; }
/// <summary>
/// 专业占比
/// </summary>
[SugarColumn(ColumnName="MajorRankPercentage" )]
public string MajorRankPercentage { get; set; }
/// <summary>
/// 专业数量
/// </summary>
[SugarColumn(ColumnName="MajorCount" )]
public string MajorCount { get; set; }
/// <summary>
///
/// </summary>
[SugarColumn(ColumnName="VRUrl" )]
public string VRUrl { get; set; }
/// <summary>
/// 就业质量
/// </summary>
[SugarColumn(ColumnName="EmploymentQuality" )]
public string EmploymentQuality { get; set; }
}
}

12
New_College.Repository/BASE/IT_TbSNeedDataInfoRepository.cs Normal file
View File

@ -0,0 +1,12 @@
using New_College.IRepository.Base;
using New_College.Model.Models;
namespace New_College.IRepository
{
/// <summary>
/// IT_TbSNeedDataInfoRepository
/// </summary>
public interface IT_TbSNeedDataInfoRepository : IBaseRepository<T_TbSNeedDataInfo>
{
}
}

17
New_College.Repository/BASE/T_TbSNeedDataInfoRepository.cs Normal file
View File

@ -0,0 +1,17 @@
using New_College.IRepository;
using New_College.IRepository.UnitOfWork;
using New_College.Model.Models;
using New_College.Repository.Base;
namespace New_College.Repository
{
/// <summary>
/// T_TbSNeedDataInfoRepository
/// </summary>
public class T_TbSNeedDataInfoRepository : BaseRepository<T_TbSNeedDataInfo>, IT_TbSNeedDataInfoRepository
{
public T_TbSNeedDataInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}
}

61
New_College.Services/D_LongIdMapServices.cs
View File

@ -24,6 +24,7 @@ using StackExchange.Redis;
using New_College.Repository;
using NPOI.Util.ArrayExtensions;
using System.Threading;
using Org.BouncyCastle.Asn1.Tsp;
namespace New_College.Services
{
@ -55,6 +56,7 @@ namespace New_College.Services
private readonly ID_QualificationLineRepository d_QualificationLineRepository;
private readonly ID_PlanMajorDescRepository d_PlanMajorDescRepository;
private readonly ID_PlanMajorDescProRepository d_PlanMajorDescProRepository;
private readonly IT_TbSNeedDataInfoRepository t_TbSNeedDataInfoRepository;
public D_LongIdMapServices(IBaseRepository<D_LongIdMap> dal
, ID_MajorCategoryRepository ID_MajorCategoryRepository
, ID_MajorClassRepository ID_MajorClassRepository
@ -80,7 +82,8 @@ namespace New_College.Services
ID_PlanMajorScoreLineRepository d_PlanMajorScoreLineRepository,
ID_QualificationLineRepository d_QualificationLineRepository,
ID_PlanMajorDescRepository d_PlanMajorDescRepository,
ID_PlanMajorDescProRepository d_PlanMajorDescProRepository)
ID_PlanMajorDescProRepository d_PlanMajorDescProRepository,
IT_TbSNeedDataInfoRepository tbSNeedDataInfoRepository)
{
this._dal = dal;
d_MajorCategoryRepository = ID_MajorCategoryRepository;
@ -109,6 +112,7 @@ namespace New_College.Services
this.d_QualificationLineRepository = d_QualificationLineRepository;
this.d_PlanMajorDescRepository = d_PlanMajorDescRepository;
this.d_PlanMajorDescProRepository = d_PlanMajorDescProRepository;
t_TbSNeedDataInfoRepository = tbSNeedDataInfoRepository;
}
/// <summary>
@ -337,7 +341,7 @@ namespace New_College.Services
list.Add(new pcMajorInfoResult()
{
Name = item.Name,
children = scond.Where(e=>e.children.Any()).ToList()
children = scond.Where(e => e.children.Any()).ToList()
});
}
}
@ -1854,9 +1858,9 @@ namespace New_College.Services
{
var updatemodel = universitymodel.FirstOrDefault();
var category = undetail.result.categories.ToList();
if (category.Contains("医药"))
{
updatemodel.Type = UniversityTypeRelsove.GetTypeName("医药");
//if (category.Contains("医药"))
//{
// updatemodel.Type = UniversityTypeRelsove.GetTypeName("医药");
//updatemodel.Web = undetail.result.webSite;
//updatemodel.Address = undetail.result.address[0].address;
@ -1866,11 +1870,11 @@ namespace New_College.Services
//updatemodel.Rank = a.ranking;
//updatemodel.Build_Date = undetail.result.createdYear;
//updatemodel.Description = undetail.result.introduction;
//updatemodel.Master_Count = undetail.result.pointsOfShuo.Any() ? undetail.result.pointsOfShuo[0].number : 0;
//updatemodel.Doctorate_Count = undetail.result.pointsOfBo.Any() ? undetail.result.pointsOfBo[0].number : 0;
updatemodel.Master_Count = undetail.result.pointsOfShuo.Any() ? undetail.result.pointsOfShuo[0].number : 0;
updatemodel.Doctorate_Count = undetail.result.pointsOfBo.Any() ? undetail.result.pointsOfBo[0].number : 0;
//updatemodel.Type = UniversityTypeRelsove.GetTypeName((undetail.result.categories.Any() ? undetail.result.categories[0] : ""));
await d_UniversityRepository.Update(updatemodel);
}
// }
}
});
@ -1909,6 +1913,47 @@ namespace New_College.Services
/// <summary>
/// 更新学校基础信息
/// </summary>
/// <returns></returns>
public async Task<bool> UpdateUniveristyInf()
{
var tbinfo = await t_TbSNeedDataInfoRepository.Query();
// var plist = await this._PlanMajorDescRepository.Query(c => c.Location == "山东省" && c.Years == 2023);
var info = await d_UniversityRepository.Query();
var infoimg = await d_UniversityimgRepository.Query();
info.ForEach(async a =>
{
if (tbinfo.Where(e => e.UniversityName == a.Name).Any())
{
var baseinfo = tbinfo.Where(e => e.UniversityName == a.Name).FirstOrDefault();
var imginfo = infoimg.FirstOrDefault(o => o.UniversityId == a.Id);
if (!string.IsNullOrWhiteSpace(baseinfo.VRUrl)&& imginfo!=null)
{
imginfo.VRUrl = baseinfo.VRUrl;
await d_UniversityimgRepository.Update(imginfo);
}
if (baseinfo.LnstitutionalLevel != null)
{
a.Sff = baseinfo.LnstitutionalLevel.Contains("211") ? 0 : 1;
a.Syl = baseinfo.LnstitutionalLevel.Contains("双一流") ? 0 : 1;
a.QJJH = baseinfo.LnstitutionalLevel.Contains("强基") ? 0 : 1;
a.Nhef = baseinfo.LnstitutionalLevel.Contains("985") ? 0 : 1;
}
//a.Doctorate_Count = int.Parse(baseinfo.PhDPoint);
//a.Master_Count = int.Parse(baseinfo.MastersDegree);
a.Nature = baseinfo.Nature.Contains("公办") ? 0 : baseinfo.Nature.Contains("民办") ? 1 : baseinfo.Nature.Contains("中外合作") ? 2 : baseinfo.Nature.Contains("港澳台") ? 3 : -1;
a.Subject_Level = baseinfo.EducationCategory == "本科" ? 0 : 1;
await d_UniversityRepository.Update(a);
}
});
return true;
}

18
New_College.Services/T_TbSNeedDataInfoServices.cs Normal file
View File

@ -0,0 +1,18 @@

using New_College.IServices;
using New_College.Model.Models;
using New_College.Services.BASE;
using New_College.IRepository.Base;
namespace New_College.Services
{
public class T_TbSNeedDataInfoServices : BaseServices<T_TbSNeedDataInfo>, IT_TbSNeedDataInfoServices
{
private readonly IBaseRepository<T_TbSNeedDataInfo> _dal;
public T_TbSNeedDataInfoServices(IBaseRepository<T_TbSNeedDataInfo> dal)
{
this._dal = dal;
base.BaseDal = dal;
}
}
}