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

feat》接口调整

develop
old易 2023-11-21 09:23:59 +08:00
parent 2465b1a28f
commit 872f98768a
9 changed files with 99 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,6 +203,24 @@ namespace New_College.Api.Controllers.Front
};
}
/// <summary>
/// Pc端接口职业库一级二级三级列表
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<pcMajorInfoResult>>> PcGetOccupationInfo()
{
var result = await iD_LongIdMapServices.pcGetOccupationInfo();
return new MessageModel<List<pcMajorInfoResult>>()
{
success = result.Count <= 0 ? false : true,
msg = result.Count <= 0 ? "获取失败" : "获取成功",
response = result
};
}
/// <summary>
/// 获取职业第三级
/// </summary>

8
New_College.Api/New_College.xml
View File

@ -335,6 +335,12 @@
</summary>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.PcGetOccupationInfo">
<summary>
Pc端接口职业库一级二级三级列表
</summary>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.GetOccupationThree(New_College.Model.ViewModels.IdQuery)">
<summary>
获取职业第三级
@ -1109,7 +1115,7 @@
登录管理【无权限】
</summary>
</member>
<member name="M:New_College.Controllers.LoginController.#ctor(New_College.IServices.ISysUserInfoServices,New_College.IServices.IUserRoleServices,New_College.IServices.IRoleServices,New_College.AuthHelper.PermissionRequirement,New_College.IServices.IRoleModulePermissionServices,Microsoft.AspNetCore.Http.IHttpContextAccessor)">
<member name="M:New_College.Controllers.LoginController.#ctor(New_College.IServices.ISysUserInfoServices,New_College.IServices.IUserRoleServices,New_College.IServices.IRoleServices,New_College.AuthHelper.PermissionRequirement,New_College.IServices.IRoleModulePermissionServices)">
<summary>
构造函数注入
</summary>

4
New_College.Api/wwwroot/swg-login.html
View File

@ -13,9 +13,9 @@
<div class="left">
<div></div>
<div class="login"><img src="/logo.jpg.jpg" height="30" alt="Alternate Text"/> Blog.Core 接口文档</div>
<div class="login"><img src="https://i5.youzy.cn/util4y/media/files/20231026/7840b6f1f30c413eade15babc70be26e_%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230811154443.png" height="30" alt="Alternate Text"/> 接口文档</div>
<div class="eula">欢迎使用！</div>
<div class="eula">使用真实用户账号登录，测试账号: blogadmin/blogadmin</div>
<!--<div class="eula">使用真实用户账号登录，测试账号: blogadmin/blogadmin</div>-->
</div>
<div class="right">
<svg viewBox="0 0 320 300">

2
New_College.IServices/ID_LongIdMapServices.cs
View File

@ -29,6 +29,8 @@ namespace New_College.IServices
Task<List<uniMajorInfoResult>> uniGetOccupationInfo();
Task<List<pcMajorInfoResult>> pcGetOccupationInfo();
Task<UniversityDetailResponse> GetUniversityDetails(IdQuery query);

2
New_College.Model/ViewModels/Query/UniversityQuery.cs
View File

@ -52,7 +52,7 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 院校类型 （0，校友会 1,武书连 2,软科 3,QS 4,U.S.News）
/// </summary>
public int Type { get; set; }
public int? Type { get; set; }
/// <summary>
/// 院校名称

22
New_College.Model/ViewModels/Result/uniMajorSecond.cs
View File

@ -1,4 +1,5 @@
using System;
using NPOI.POIFS.Storage;
using System;
using System.Collections.Generic;
using System.Text;
@ -40,6 +41,25 @@ namespace New_College.Model.ViewModels
public int SecondId { get; set; }
public string MajorName { get; set; }
public int MajorNum { get; set; }
}
public class pcMajorInfoResult
{
public int RootId { get; set; }
public string Name { get; set; }
public List<pcMajorItem> children { get; set; }
public int MajorNum { get; set; }
}
public class pcMajorItem
{
public int Id { get; set; }
public string Name { get; set; }
public int MajorNum { get; set; }
public List<pcMajorItem> children { get; set; }
}

4
New_College.Repository/BASE/D_UniversityRankRepository.cs
View File

@ -24,8 +24,8 @@ namespace New_College.Repository
{
var response = await this.Db.Queryable<D_UniversityRank, D_University>((rank, u) => new object[] { JoinType.Left, rank.UniversityName == u.Name })
.Where((rank, u) => rank.UniversityType == query.Type)
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(rank.UniversityName, query.Name))
.Where((rank, u) => rank.UniversityType == query.Type)
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(query.Name,rank.UniversityName))
.WhereIF(query.SubjectType.HasValue, (rank, u) => u.Type == query.SubjectType)
.OrderBy((rank, u) => rank.Rank, OrderByType.Asc)
.Select((rank, u) => new UniversityPcRankList

47
New_College.Services/D_LongIdMapServices.cs
View File

@ -280,6 +280,43 @@ namespace New_College.Services
return list;
}
public async Task<List<pcMajorInfoResult>> pcGetOccupationInfo()
{
var list = new List<pcMajorInfoResult>() { };
var occupationCategoryList = (await d_OccupationCategoryRepository.Query(x => x.IsDelete == false)).Select(x => new uniOccSelect() { Id = x.Id, Level = x.Level, Name = x.Name, ParentId = x.ParentId, OccupationName = x.OccupationName });
var queryoccupations = await d_OccupationRepository.Query(x => x.IsDelete == false);
var occupations = queryoccupations.Select(s => s.CategoryId).ToList();
var nowoccupationCategoryList = occupationCategoryList.Where(x => x.Level == 0).ToList();
foreach (var item in nowoccupationCategoryList)
{
var scond = new List<pcMajorItem>();
var nowmajoclass = occupationCategoryList.Where(x => x.ParentId == item.Id).ToList();
scond = nowmajoclass.Select(s => new pcMajorItem()
{
Name = s.OccupationName,
MajorNum = occupations.Count(e => e == s.Id),
children = queryoccupations.Where(e => e.CategoryId == s.Id).Select(c => new pcMajorItem()
{
Name = c.Name,
Id = c.Id,
// MajorNum = queryoccupations.Where(e => e.CategoryId == s.Id).Count()
}).ToList(),
Id = s.Id
}).ToList();
list.Add(new pcMajorInfoResult()
{
Name = item.Name,
children = scond
});
}
return list;
}
/// <summary>
/// 院校详情
/// </summary>
@ -587,10 +624,10 @@ namespace New_College.Services
//}
//else
//{
var majorclasses = (await d_MajorClassRepository.Query(x => x.IsDelete == false)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId });
var nowmajorname = majorclasses.Where(x => x.Id == query.categoryclassid).Select(x => x.Name)?.FirstOrDefault();
var newmajorinfo = await d_MajorRepository.Query(x => x.IsDelete == false && x.CategoryClass_Id == query.categoryclassid && x.Type != 3);
info = newmajorinfo.Where(x => x.Name != nowmajorname).Select(x => new uniMajorInfo() { Id = x.Id, Name = x.MajorName, Code = x.MajorCode }).ToList();
var majorclasses = (await d_MajorClassRepository.Query(x => x.IsDelete == false)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId });
var nowmajorname = majorclasses.Where(x => x.Id == query.categoryclassid).Select(x => x.Name)?.FirstOrDefault();
var newmajorinfo = await d_MajorRepository.Query(x => x.IsDelete == false && x.CategoryClass_Id == query.categoryclassid && x.Type != 3);
info = newmajorinfo.Where(x => x.Name != nowmajorname).Select(x => new uniMajorInfo() { Id = x.Id, Name = x.MajorName, Code = x.MajorCode }).ToList();
//}
return new MessageModel<List<uniMajorInfo>>()
{
@ -1743,7 +1780,7 @@ namespace New_College.Services
return true;
}

8
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -41,7 +41,7 @@ namespace New_College.Services
Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>()
.And(c => c.IsDelete == false)
.And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(request.Major, c.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major,request.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject))
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName))
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
@ -63,7 +63,7 @@ namespace New_College.Services
Expression<Func<D_PlanMajorDesc, bool>> expression2 = Expressionable.Create<D_PlanMajorDesc>()
.And(c => c.IsDelete == false)
.And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(request.Major, c.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major))
// .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject)) //此条件不带
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName.Trim())
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
@ -143,7 +143,7 @@ namespace New_College.Services
Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>()
.And(c => c.IsDelete == false)
.And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(request.Major, c.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject))
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName))
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
@ -164,7 +164,7 @@ namespace New_College.Services
Expression<Func<D_PlanMajorDesc, bool>> expression2 = Expressionable.Create<D_PlanMajorDesc>()
.And(c => c.IsDelete == false)
.And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(request.Major, c.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major,request.Major))
// .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject)) //此条件不带
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName.Trim())
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))