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

调整认证方式

develop
old易 2024-09-28 14:41:31 +08:00
parent d2b24a77c5
commit 0a1a80e7cc
3 changed files with 116 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,11 +74,11 @@ namespace New_College.Controllers
// await d_LongIdMapServices.PlanNeedProSync("山东省", 2024, "综合", "普通类二段"); // await d_LongIdMapServices.PlanNeedProSync("山东省", 2024, "综合", "普通类二段");
await d_LongIdMapServices.SyncnewNeedProSData("山东省", 2024, "综合", "普通类二段"); //await d_LongIdMapServices.SyncnewNeedProSData("山东省", 2024, "综合", "普通类二段");
// await v_CustomerInfoServices.CustomeBillExport(); // await v_CustomerInfoServices.CustomeBillExport();
//await d_LongIdMapServices.UpdatePlanProInf("山东省"); await d_LongIdMapServices.UpdatePlanProInf("山东省");
return true; return true;

2
New_College.Api/appsettings.json
View File

@ -117,7 +117,7 @@
], ],
"Audience": { "Audience": {
"Secret": "sdfsdfsrty25634kkhllghtdgdfss345t678fs", //不要太短，16位+ "Secret": "sdfsdfsrty25634kkhllghtdgdfss345t678fs", //不要太短，16位+
"SecretFile": "C:\\my-file\\new_college.audience.secret.txt", //安全。内容就是Secret "SecretFile": "", //安全。内容就是Secret
"Issuer": "New_College", "Issuer": "New_College",
"Audience": "wr" "Audience": "wr"
}, },

117
New_College.Services/D_LongIdMapServices.cs
View File

@ -2484,7 +2484,7 @@ namespace New_College.Services
public async Task<bool> UpdatePlanProInf(string Location) public async Task<bool> UpdatePlanProInf(string Location)
{ {
//var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location); var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location && e.BatchName == "普通类二段");
var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false); var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false); // var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
@ -2523,33 +2523,34 @@ namespace New_College.Services
#region ***********************更新相关参数*************************** #region ***********************更新相关参数***************************
//var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); //var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
//var pronew = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Location == Location && e.Years == 2024 && e.BatchName == "本科"); // var pronew = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Location == Location && e.Years == 2023 && e.BatchName == "普通类二段");
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location); var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location);
//tbinfo.ForEach(o => tbinfo.ForEach(o =>
//{ {
// //if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) //if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
//{ {
// if (o._21Score == "0") if (o._21Score == "0" || o._21Score == null)
// { {
// o._21Score = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0"; o._21Score = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
// o._21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0"; o._21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
// o._21Count = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; o._21Count = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
// } }
// if (o._22Score == "0") if (o._22Score == "0" || o._22Score == null)
// { {
// o._22Score = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0"; o._22Score = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
// o._22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0"; o._22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
// o._22Count = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; o._22Count = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
// } }
// if (o._23Score == "0") if (o._23Score == "0" || o._23Score == null)
// { {
// o._23Score = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0"; o.MajorName = o.MajorName.Contains("(") ? o.MajorName.Split("(")[0] : o.MajorName;
// o._23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0"; o._23Score = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
// o._23Count = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; o._23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank : 0;
// } o._23Count = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
//} }
}
//o._23Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString(); //o._23Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString();
//o._23ScoreLine = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScoreRank; //o._23ScoreLine = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScoreRank;
//o._Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString(); //o._Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString();
@ -2610,8 +2611,8 @@ namespace New_College.Services
// } // }
//} //}
//}); });
// await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
#endregion #endregion
@ -2650,38 +2651,38 @@ namespace New_College.Services
#region 更新专业计划信息 #region 更新专业计划信息
//var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2024 && c.IsDelete == false); //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2024 && c.IsDelete == false);
var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2024 && c.IsDelete == false && c.Id >= 3407221); //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2024 && c.IsDelete == false && c.Id >= 3407221);
plist.ForEach(p => //plist.ForEach(p =>
{
//var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault();
//if (newmodel != null)
//{ //{
var universitymodel = universitylist.Where(e => e.Id == p.UId).FirstOrDefault(); // //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault();
if (universitymodel != null) // //if (newmodel != null)
{ // //{
p.CityName = universitymodel.Area_Name; // var universitymodel = universitylist.Where(e => e.Id == p.UId).FirstOrDefault();
p.EducationCategory = universitymodel.Subject_Level == 0 ? "本科" : "专科"; // if (universitymodel != null)
p.EnrollmentCode = universitymodel.UniversityCode; // {
// p.EnrollmentType = newmodel.EnrollmentType; // p.CityName = universitymodel.Area_Name;
//p.SchoolType=newmodel.sch // p.EducationCategory = universitymodel.Subject_Level == 0 ? "本科" : "专科";
//p.FirstType = universitymodel.FirstType; // p.EnrollmentCode = universitymodel.UniversityCode;
p.Nature = universitymodel.Nature == 0 ? "公办" : universitymodel.Nature == 1 ? "民办" : universitymodel.Nature == 2 ? "中外合作办学" : universitymodel.Nature == 3 ? "港澳台" : "独立学院"; // // p.EnrollmentType = newmodel.EnrollmentType;
p.AreaName = universitymodel.Area_Name; // //p.SchoolType=newmodel.sch
p.Ownership = universitymodel.AscriptionName; // //p.FirstType = universitymodel.FirstType;
p.Web = universitymodel.Web; // p.Nature = universitymodel.Nature == 0 ? "公办" : universitymodel.Nature == 1 ? "民办" : universitymodel.Nature == 2 ? "中外合作办学" : universitymodel.Nature == 3 ? "港澳台" : "独立学院";
p.Logo = universitymodel.Logo; // p.AreaName = universitymodel.Area_Name;
p._985 = universitymodel.Nhef == 1 ? "是" : "否"; // p.Ownership = universitymodel.AscriptionName;
p._211 = universitymodel.Sff == 1 ? "是" : "否"; // p.Web = universitymodel.Web;
p._SYL = universitymodel.Syl == 1 ? "是" : "否"; // p.Logo = universitymodel.Logo;
p.Rank = (universitymodel.Rank == 0 || universitymodel.Rank == 9999) ? "--" : universitymodel.Rank.ToString(); // p._985 = universitymodel.Nhef == 1 ? "是" : "否";
//p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count); // p._211 = universitymodel.Sff == 1 ? "是" : "否";
//p.PlanCount = int.Parse(newmodel._23Count); // p._SYL = universitymodel.Syl == 1 ? "是" : "否";
//p.LowScore = int.Parse(newmodel._23Score); // p.Rank = (universitymodel.Rank == 0 || universitymodel.Rank == 9999) ? "--" : universitymodel.Rank.ToString();
//p.LowScoreRank = int.Parse(newmodel._23ScoreLine); // //p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count);
} // //p.PlanCount = int.Parse(newmodel._23Count);
}); // //p.LowScore = int.Parse(newmodel._23Score);
// //p.LowScoreRank = int.Parse(newmodel._23ScoreLine);
// }
//});
await this.d_PlanMajorDescProRepository.Batchupdate(plist); //await this.d_PlanMajorDescProRepository.Batchupdate(plist);
#endregion #endregion
#region 更新专业分数先选科数据 #region 更新专业分数先选科数据