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

bug

develop
old易 2024-04-25 22:39:02 +08:00
parent b4989426ac
commit c2698866e8
7 changed files with 353 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using MySqlX.XDevAPI.Common;
using New_College.Common.HttpRestSharp;
using New_College.IServices;
using New_College.Model;
@ -152,6 +153,38 @@ namespace New_College.Api.Controllers.Front
}
/// <summary>
///
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<UniversityMongoResult>>> GetMongoUniversity([FromQuery] string key)
{
if (key != "ycymedu")
{
return new MessageModel<List<UniversityMongoResult>>()
{
success = false,
msg = ""
};
}
//var result = await iD_LongIdMapServices.GetSyncUniversityInfo();
return new MessageModel<List<UniversityMongoResult>>()
{
// response = result,
};
}
/// <summary>
/// 专业库 一级二级列表
/// </summary>
@ -487,8 +520,8 @@ namespace New_College.Api.Controllers.Front
if (string.IsNullOrWhiteSpace(query.Year))
{
query.Year = query.Type==3?"2024":"2023";
// query.SubjectType = query.Type;
query.Year = query.Type == 3 ? "2024" : "2023";
// query.SubjectType = query.Type;
}
var result = await iD_LongIdMapServices.GetPcUniversityRank(query);

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

@ -1826,6 +1826,21 @@
获取或设置是否禁用，逻辑上的删除，非物理删除
</summary>
</member>
<member name="T:New_College.Model.Models.QuestionNaire">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.QuestionNaire.Id">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.QuestionNaire.infoList">
<summary>
学校名称
</summary>
</member>
<member name="T:New_College.Model.Models.Role">
<summary>
角色表
@ -6745,6 +6760,91 @@
原始code
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Web">
<summary>
官网
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Id">
<summary>
主键id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Name">
<summary>
名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.AcademicianCount">
<summary>
院士数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.DoctorateCount">
<summary>
博士数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.MasterCount">
<summary>
硕士数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Logo">
<summary>
学校logo
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Description">
<summary>
学校简介
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.AreaName">
<summary>
省市区名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Nature">
<summary>
办学性质
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.AscriptionName">
<summary>
隶属于
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.SubjectLevel">
<summary>
学科层次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.UniversityType">
<summary>
学校类型
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.BuildDate">
<summary>
创办时间
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Address">
<summary>
地址
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Phone">
<summary>
电话
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityMongoResult.Imglist">
<summary>
院校图片json
</summary>
</member>
<member name="T:New_College.Model.ViewModels.UniversityDetailResponse">
<summary>
@ -7700,6 +7800,21 @@
0分数修改次数|1查询次数
</summary>
</member>
<member name="T:New_College.Model.ViewModels.QuestionNaireDto">
<summary>
</summary>
</member>
<member name="P:New_College.Model.ViewModels.QuestionNaireDto.id">
<summary>
</summary>
</member>
<member name="P:New_College.Model.ViewModels.QuestionNaireDto.infoList">
<summary>
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UserBaseSettingDto.PType">
<summary>
0-pc,1-minpro

14
New_College.Api/New_College.xml
View File

@ -316,6 +316,13 @@
<param name="query"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.CustomerController.QuestionNaireSave(New_College.Model.ViewModels.QuestionNaireDto)">
<summary>
问卷保存
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:New_College.Api.Controllers.Front.EnrollMentPlansController">
<summary>
招生计划
@ -405,6 +412,13 @@
<param name="query"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.GetMongoUniversity(System.String)">
<summary>
</summary>
<param name="key"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.uniGetMajorInfo(New_College.Model.ViewModels.MajorcategoryQuery)">
<summary>
专业库 一级二级列表

2
New_College.Api/appsettings.Development.json
View File

@ -32,7 +32,7 @@
"RedisCachingAOP": {
"Enabled": true,
"ConnectionString": "127.0.0.1:6379",
"Password": "Vs_.127134"
"Password": ""
},
"MemoryCachingAOP": {
"Enabled": true

2
New_College.IServices/ID_LongIdMapServices.cs
View File

@ -24,6 +24,8 @@ namespace New_College.IServices
Task<bool> UpdateUniveristyInf();
Task<PageModel<UniversityResult>> GetUniversitys(UniversityQuery query);
Task<List<UniversityMongoResult>> GetSyncUniversityInfo();
Task<List<uniMajorInfoResult>> uniGetMajorInfo(MajorcategoryQuery query);
/// <summary>

95
New_College.Model/ViewModels/Result/UniversityResult.cs
View File

@ -150,6 +150,101 @@ namespace New_College.Model.ViewModels
}
public class UniversityMongoResult
{
public string collegeCode { get; set; }
/// <summary>
/// 官网
/// </summary>
public string Web { get; set; }
/// <summary>
/// 主键id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 院士数
/// </summary>
public int? AcademicianCount { get; set; }
/// <summary>
/// 博士数
/// </summary>
public int DoctorateCount { get; set; }
/// <summary>
/// 硕士数
/// </summary>
public int MasterCount { get; set; }
/// <summary>
/// 学校logo
/// </summary>
public string Logo { get; set; }
/// <summary>
/// 学校简介
/// </summary>
public string Description { get; set; }
/// <summary>
/// 省市区名称
/// </summary>
public string AreaName { get; set; }
public string CityName { get; set; }
/// <summary>
/// 办学性质
/// </summary>
public string Nature { get; set; }
/// <summary>
/// 隶属于
/// </summary>
public string AscriptionName { get; set; }
public string Belong { get; set; }
/// <summary>
/// 学科层次
/// </summary>
public int? SubjectLevel { get; set; }
/// <summary>
/// 学校类型
/// </summary>
public List<string> UniversityType { get; set; }
/// <summary>
/// 创办时间
/// </summary>
public string BuildDate { get; set; }
public string features { get; set; }
/// <summary>
/// 地址
/// </summary>
public string Address { get; set; }
/// <summary>
/// 电话
/// </summary>
public string Phone { get; set; }
/// <summary>
/// 院校图片json
/// </summary>
public string Imglist { get; set; }
public string VrUrl { get; set; }
}
/// <summary>
///
/// </summary>

92
New_College.Services/D_LongIdMapServices.cs
View File

@ -25,6 +25,8 @@ using New_College.Repository;
using NPOI.Util.ArrayExtensions;
using System.Threading;
using Org.BouncyCastle.Asn1.Tsp;
using Newtonsoft.Json;
using MySqlX.XDevAPI.Common;
namespace New_College.Services
{
@ -57,7 +59,7 @@ namespace New_College.Services
private readonly ID_PlanMajorDescRepository d_PlanMajorDescRepository;
private readonly ID_PlanMajorDescProRepository d_PlanMajorDescProRepository;
private readonly IT_TbSNeedDataInfoRepository t_TbSNeedDataInfoRepository;
private readonly IRedisCacheManager _redisCache;
public D_LongIdMapServices(IBaseRepository<D_LongIdMap> dal
, ID_MajorCategoryRepository ID_MajorCategoryRepository
, ID_MajorClassRepository ID_MajorClassRepository
@ -84,7 +86,8 @@ namespace New_College.Services
ID_QualificationLineRepository d_QualificationLineRepository,
ID_PlanMajorDescRepository d_PlanMajorDescRepository,
ID_PlanMajorDescProRepository d_PlanMajorDescProRepository,
IT_TbSNeedDataInfoRepository tbSNeedDataInfoRepository)
IT_TbSNeedDataInfoRepository tbSNeedDataInfoRepository,
IRedisCacheManager redisCache)
{
this._dal = dal;
d_MajorCategoryRepository = ID_MajorCategoryRepository;
@ -114,6 +117,7 @@ namespace New_College.Services
this.d_PlanMajorDescRepository = d_PlanMajorDescRepository;
this.d_PlanMajorDescProRepository = d_PlanMajorDescProRepository;
t_TbSNeedDataInfoRepository = tbSNeedDataInfoRepository;
this._redisCache = redisCache;
}
/// <summary>
@ -2035,6 +2039,90 @@ namespace New_College.Services
return true;
}
public async Task<List<UniversityMongoResult>> GetSyncUniversityInfo()
{
if (_redisCache.Get("sync_university"))
{
return JsonConvert.DeserializeObject<List<UniversityMongoResult>>((Encoding.UTF8.GetString(_redisCache.Get<byte[]>("sync_university"))));
}
var list = new List<UniversityMongoResult>();
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
var universitylist = await d_UniversityRepository.Query();
var universityimglist = await d_UniversityimgRepository.Query(x => x.IsDelete == false);
universitylist.ForEach(university =>
{
var models = new UniversityMongoResult()
{
Id = university.Id,
Name = university.Name,
Address = university.Address,
Phone = university.Phone,
// Nature = university.Nature,
//AscriptionName = university.AscriptionName,
// Rank = university.Rank,
AreaName = university.Area_Name,
Logo = university.Logo,
// Syl = university.Syl == 1 ? true : false,
// Nhef = university.Nhef == 1 ? true : false,
// Sff = university.Sff == 1 ? true : false,
// QJJH = university.QJJH == 1 ? true : false,
//UniversityType = university.Type,
SubjectLevel = university.Subject_Level,
BuildDate = university.Build_Date,
// Imglist = imgs,
DoctorateCount = university.Doctorate_Count,
MasterCount = university.Master_Count,
AcademicianCount = university.Academician_Count,
collegeCode = university.UniversityCode,
Web = string.IsNullOrEmpty(university.Web) ? "暂无" : university.Web,
// 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();
var baseinfo = tbinfo.Where(e => e.UniversityName == university.Name).FirstOrDefault();
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.LnstitutionalLevel))
{
models.features = baseinfo.LnstitutionalLevel;
}
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.City))
{
models.CityName = baseinfo.City;
}
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.Nature))
{
models.Nature = baseinfo.Nature;
}
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.Nature))
{
models.Nature = baseinfo.Nature;
}
if (baseinfo != null && !string.IsNullOrWhiteSpace(baseinfo.Ownership))
{
models.Belong = baseinfo.Ownership;
}
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();
}
list.Add(models);
});
byte[] byresult = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(list));
_redisCache.Set("sync_university", byresult, TimeSpan.FromDays(1));
return list;
}
/// <summary>
/// 更新招生计划数据
/// </summary>