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

bug fixed

develop
old易 2024-04-28 22:14:54 +08:00
parent c2698866e8
commit 3c581384a7
3 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Controllers/Front/LibraryController.cs
View File

@ -174,12 +174,12 @@ namespace New_College.Api.Controllers.Front
};
}
//var result = await iD_LongIdMapServices.GetSyncUniversityInfo();
var result = await iD_LongIdMapServices.GetSyncUniversityInfo();
return new MessageModel<List<UniversityMongoResult>>()
{
// response = result,
response = result,
};
}

72
New_College.Common/Enum/EnumHelper.cs
View File

@ -34,17 +34,17 @@ namespace New_College.Common
/// 志愿填报卡
/// </summary>
[Description("志愿填报卡")]
volunteerCard=0,
volunteerCard = 0,
/// <summary>
/// 选科指导卡
/// </summary>
[Description("选科指导卡")]
selectSubjectGuideCard=1,
selectSubjectGuideCard = 1,
/// <summary>
/// 生涯发展卡
/// </summary>
[Description("生涯发展卡")]
development=2
development = 2
}
@ -63,7 +63,7 @@ namespace New_College.Common
Specialist = 2
}
/// <summary>
/// 办学类别
/// 办学类别0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他
/// </summary>
public enum EnumUniversityType
{
@ -78,65 +78,61 @@ namespace New_College.Common
[Description("理工")]
Engineering = 1,
/// <summary>
/// 财经
/// </summary>
[Description("财经")]
Finance = 2,
/// <summary>
/// 农林
/// </summary>
[Description("农林")]
Farming = 3,
/// <summary>
/// 医药
/// </summary>
[Description("医药")]
Medical = 4,
[Description("医学")]
Medical = 2,
/// <summary>
/// 军事
/// </summary>
[Description("军事")]
Military = 3,
/// <summary>
/// 语言
/// </summary>
[Description("语言")]
Language = 4,
/// <summary>
/// 师范
/// </summary>
[Description("师范")]
Normal = 5,
/// <summary>
/// 体育
/// 财经
/// </summary>
[Description("体育")]
Sports = 6,
/// <summary>
/// 省属
/// </summary>
[Description("省属")]
Provincial = 7,
[Description("财经")]
Finance = 6,
/// <summary>
/// 政法
/// </summary>
[Description("政法")]
Politics = 8,
/// <summary>
/// 艺术
/// </summary>
[Description("艺术")]
Art = 9,
Politics = 7,
/// <summary>
/// 民族
/// </summary>
[Description("民族")]
Nation = 10,
Nation = 8,
/// <summary>
/// 军事
/// 农林
/// </summary>
[Description("军事")]
Military = 11,
[Description("农林")]
Farming = 9,
/// <summary>
/// 语言
/// 艺术
/// </summary>
[Description("语言")]
Language = 12,
[Description("艺术")]
Art = 10,
/// <summary>
/// 体育
/// </summary>
[Description("体育")]
Sports = 11,
/// <summary>
/// 其它
/// </summary>
[Description("其它")]
Other = 13,
Other = 12,
}
/// <summary>

32
New_College.Services/D_LongIdMapServices.cs
View File

@ -27,6 +27,7 @@ using System.Threading;
using Org.BouncyCastle.Asn1.Tsp;
using Newtonsoft.Json;
using MySqlX.XDevAPI.Common;
using NPOI.SS.Formula.Functions;
namespace New_College.Services
{
@ -977,7 +978,7 @@ namespace New_College.Services
}
/// <summary>
/// 获取学校类型
/// 获取学校类型0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他
/// </summary>
/// <param name="type"></param>
/// <returns></returns>
@ -2044,7 +2045,7 @@ namespace New_College.Services
{
if (_redisCache.Get("sync_university"))
{
return JsonConvert.DeserializeObject<List<UniversityMongoResult>>((Encoding.UTF8.GetString(_redisCache.Get<byte[]>("sync_university"))));
return JsonConvert.DeserializeObject<List<UniversityMongoResult>>((Encoding.UTF8.GetString(_redisCache.Get<byte[]>("sync_university"))));
}
var list = new List<UniversityMongoResult>();
@ -2079,7 +2080,7 @@ namespace New_College.Services
AcademicianCount = university.Academician_Count,
collegeCode = university.UniversityCode,
Web = string.IsNullOrEmpty(university.Web) ? "暂无" : university.Web,
// Description = ClearHtmlHelper.SHTML(university.Description),
// Description = ClearHtmlHelper.SHTML(university.Description),
};
models.Imglist = universityimglist.Where(e => e.UniversityId == university.Id).Select(c => c.ImgList).FirstOrDefault();
models.VrUrl = universityimglist.Where(e => e.UniversityId == university.Id).Select(c => c.VRUrl).FirstOrDefault();
@ -2095,24 +2096,39 @@ namespace New_College.Services
{
models.CityName = baseinfo.City;
}
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.Nature))
if ((baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.Nature)))
{
models.Nature = baseinfo.Nature;
}
else
{
models.Nature = university.Nature == 0 ? "公办" : university.Nature == 1 ? "民办" : university.Nature == 2 ? "中外合作" : "港澳台";
}
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.Nature))
{
models.Nature = baseinfo.Nature;
}
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.Ownership))
{
models.Belong = baseinfo.Ownership;
}
else
{
models.Belong = university.AscriptionName;
}
var undetail = HttpHelper.GetApi<UniversityDetailobject>("http://192.168.104.104:3000/", "youzy.dms.basiclib.api.college.bycode.get?code=" + university.UniversityCode + "", "");
if (undetail != null && undetail.isSuccess)
{
models.UniversityType = undetail.result.categories.ToList();
}
else
{
models.UniversityType = new List<string>() {
GetUniversityTypeName(university.Type)
};
}
list.Add(models);