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

feat:appsetting sql update

develop
old易 2023-09-12 09:10:17 +08:00
parent 8bf6f6df94
commit 51c8c9a526
11 changed files with 168 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
New_College.Api/Controllers/Front/UniversityCollectionController.cs
View File

@ -89,5 +89,20 @@ namespace New_College.Api.Controllers.Front
{
return await d_UniversityCollectionServices.GetUniversityMap(query);
}
/// <summary>
/// 同步数据
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<bool> SyncUniversityLogo()
{
return await d_UniversityServices.SyncUniversityLists();
}
}
}

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

@ -34,7 +34,8 @@ namespace New_College.Controllers
[HttpPost]
public Task<bool> Post()
{
return t_EnrollmentPlane.Import();
// return t_EnrollmentPlane.Import();
return t_EnrollmentPlane.Importuniverbaseinfo();
}
}

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

@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Net.Http;
namespace New_College.Controllers
{
@ -30,6 +31,7 @@ namespace New_College.Controllers
readonly IRoleServices _roleServices;
readonly PermissionRequirement _requirement;
private readonly IRoleModulePermissionServices _roleModulePermissionServices;
// private readonly IHttpContextAccessor _httpContextAccessor;
/// <summary>
@ -186,6 +188,7 @@ namespace New_College.Controllers
}
var token = JwtToken.BuildJwtToken(claims.ToArray(), _requirement);
return new MessageModel<TokenInfoViewModel>()
{
success = true,

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

@ -527,7 +527,7 @@
</member>
<member name="P:New_College.Model.Models.D_University.Nature">
<summary>
办学性质 1、公立，2、私立
办学性质 1、公办，2、民办
</summary>
</member>
<member name="P:New_College.Model.Models.D_University.Ascription">
@ -542,7 +542,7 @@
</member>
<member name="P:New_College.Model.Models.D_University.Subject_Level">
<summary>
学科层次 1、本科，2、专科
学科层次 0、本科，1、专科
</summary>
</member>
<member name="P:New_College.Model.Models.D_University.Nhef">
@ -560,6 +560,11 @@
是否双一流 0、否，1、是
</summary>
</member>
<member name="P:New_College.Model.Models.D_University.QJJH">
<summary>
强基计划
</summary>
</member>
<member name="P:New_College.Model.Models.D_University.Academician_Count">
<summary>
院士数
@ -577,7 +582,7 @@
</member>
<member name="P:New_College.Model.Models.D_University.Type">
<summary>
大学类型 0综合,1理工类，2医学类...
大学类型 0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他
</summary>
</member>
<member name="P:New_College.Model.Models.D_University.Logo">

6
New_College.Api/New_College.xml
View File

@ -573,6 +573,12 @@
<param name="query"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.UniversityCollectionController.SyncUniversityLogo">
<summary>
同步数据
</summary>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.VipController.GetVipCardTypeList">
<summary>
获取Vip卡列表

10
New_College.Api/appsettings.json
View File

@ -201,10 +201,10 @@
},
"AliYunOss": {
"wendpoint": "http://yrtsedu.oss-cn-shanghai.aliyuncs.com/",
"accessKeyId": "LTAI4GBVp1V6CVGpuHdznRLw",
"accessKeySecret": "JVcuywn3ZU5dhFEgvcfzIxoMRm0qVs",
"bucket": "yrtsedu",
"endpoint": "http://oss-cn-shanghai.aliyuncs.com"
"wendpoint": "https://static-data-ycymedu.oss-cn-shanghai.aliyuncs.com",
"accessKeyId": "LTAI5tKs3TXSbt7E4WMDcxwR",
"accessKeySecret": "EvC8MjRaQC1kHubgU4MtecZnofOb0v",
"bucket": "static-data-ycymedu",
"endpoint": "https://oss-cn-shanghai.aliyuncs.com"
}
}

2
New_College.IServices/ID_UniversityServices.cs
View File

@ -12,6 +12,8 @@ namespace New_College.IServices
/// </summary>
public interface ID_UniversityServices : IBaseServices<D_University>
{
Task<bool> SyncUniversityLists();
Task<bool> SaveImg();
/// <summary>

2
New_College.IServices/IT_EnrollmentPlaneServices.cs
View File

@ -15,7 +15,7 @@ namespace New_College.IServices
{
Task<bool> Import();
Task<bool> Importuniverbaseinfo();
/// <summary>
/// 根据大学或者专业获取招生计划
/// </summary>

13
New_College.Model/Models/D_University.cs
View File

@ -35,7 +35,7 @@ namespace New_College.Model.Models
public string Build_Date { get; set; }
/// <summary>
/// 办学性质 1、公立，2、私立
/// 办学性质 1、公办，2、民办
/// </summary>
[SugarColumn(IsNullable = true)]
public int Nature { get; set; }
@ -53,7 +53,7 @@ namespace New_College.Model.Models
public string AscriptionName { get; set; }
/// <summary>
/// 学科层次 1、本科，2、专科
/// 学科层次 0、本科，1、专科
/// </summary>
[SugarColumn(IsNullable = true)]
public int Subject_Level { get; set; }
@ -76,6 +76,13 @@ namespace New_College.Model.Models
[SugarColumn(IsNullable = true)]
public int Syl { get; set; }
/// <summary>
/// 强基计划
/// </summary>
[SugarColumn(IsNullable = true)]
public int QJJH { get; set; }
/// <summary>
/// 院士数
/// </summary>
@ -95,7 +102,7 @@ namespace New_College.Model.Models
public int Master_Count { get; set; }
/// <summary>
/// 大学类型 0综合,1理工类，2医学类...
/// 大学类型 0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他
/// </summary>
[SugarColumn(IsNullable = true)]
public int Type { get; set; }

34
New_College.Services/D_UniversityServices.cs
View File

@ -11,6 +11,7 @@ using System.Collections.Generic;
using New_College.Model.ViewModels;
using New_College.Model;
using System.Linq;
using New_College.Common;
namespace New_College.Services
{
@ -23,20 +24,43 @@ namespace New_College.Services
base.BaseDal = dal;
}
public async Task<bool> SyncUniversityLists()
{
var university = await _dal.Query();
var list = new List<D_University>();
university.ForEach(async univer =>
{
string localurl = "D:\\Ashuju\\schoologo\\" + univer.Name + ".jpg";
if (System.IO.File.Exists(localurl))
{
string newurl = string.Format("{0}.jpg", univer.Id);
AliYunOssHelper.UploadFile(newurl, localurl);
newurl = string.Format("https://static-data.ycymedu.com/{0}", newurl);
univer.Logo = newurl;
//list.Add(univer);
await _dal.Update(univer);
}
});
return true;
}
/// <summary>
/// 下载图片
/// </summary>
/// <returns></returns>
public async Task<bool> SaveImg()
{
var info = await _dal.QuerySql("SELECT Logo FROM `D_University`");
var info = await _dal.QuerySql("SELECT Logo,Name FROM `tempuniversity`");
foreach (var item in info)
{
var url = item.Logo;
if (!string.IsNullOrWhiteSpace(url))
if (string.IsNullOrWhiteSpace(url))
{
var name = item.Logo.Substring(item.Logo.LastIndexOf("/"));
if (!System.IO.File.Exists("D:\\Ashuju\\schoologo\\" + name + ""))
var name = item.Name;
if (!System.IO.File.Exists("D:\\Ashuju\\schoologo\\" + name + ".jpg"))
{
WebClient my = new WebClient();
byte[] mybyte;
@ -44,7 +68,7 @@ namespace New_College.Services
MemoryStream ms = new MemoryStream(mybyte);
System.Drawing.Image img;
img = System.Drawing.Image.FromStream(ms);
img.Save("D:\\Ashuju\\schoologo\\" + name + ""); //保存
img.Save("D:\\Ashuju\\schoologo\\" + name + ".jpg"); //保存
}
}
}

86
New_College.Services/T_EnrollmentPlaneServices.cs
View File

@ -14,6 +14,7 @@ using System;
using New_College.Model.ViewModels.Result;
using New_College.Model.ViewModels.Query;
using New_College.Model;
using System.Text.RegularExpressions;
namespace New_College.Services
{
@ -48,6 +49,91 @@ namespace New_College.Services
return await this.planeRepository.GetEnrollmentPlans(request);
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public async Task<bool> Importuniverbaseinfo()
{
var dataSet = ExcelUtil.ReadExcelToDataSet("D:\\universitybasesql.xlsx");
if (dataSet.Tables.Count > 0)
{
var universitylist = await this.d_University.Query(x => x.IsDelete == false);
// var universitymidfys = new List<D_University>();
var universityattench = new List<D_University>();
foreach (DataRow dr in dataSet.Tables[0].Rows)
{
var universityname = dr["院校名称"].ToString();
var areaname = dr["省份"].ToString();
var schooltype = dr["本科专科"].ToString();
var classtype = dr["类型"].ToString();
var isgongban = dr["公办民办"].ToString();
var is985 = dr["是否985"].ToString();
var is211 = dr["是否211"].ToString();
var issyl = dr["双一流"].ToString();
var isqjjh = dr["强基计划"].ToString();
if (universitylist.Any(c => c.Name == universityname))
{
var single = universitylist.FirstOrDefault(c => c.Name == universityname);
single.Area_Name = areaname;
// 0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他
single.Type = classtype == "综合" ? 0 : classtype == "理工" ? 1
: classtype == "医学类" ? 2
: classtype == "军事类" ? 3
: classtype == "语言类" ? 4
: classtype == "师范类" ? 5
: classtype == "财经类" ? 6
: classtype == "政法类" ? 7
: classtype == "民族类" ? 8
: classtype == "农林类" ? 9
: classtype == "艺术类" ? 10
: classtype == "体育类" ? 11 : 12;
single.Nature = isgongban == "公办" ? 0 : isgongban == "民办" ? 1 : isgongban == "中外合作" ? 2 : 3;
single.Sff = is211 == "211" ? 1 : 0;
single.QJJH = isqjjh == "强基计划" ? 1 : 0;
single.Nhef = is985 == "985" ? 1 : 0;
single.Syl = issyl == "双一流" ? 1 : 0;
single.Subject_Level = schooltype == "本科" ? 0 : 1;
single.ModifyTime = DateTime.Now;
await this.d_University.Update(single);
}
else
{
universityattench.Add(new D_University()
{
Name = universityname,
Type = classtype == "综合" ? 0 : classtype == "理工" ? 1
: classtype == "医学类" ? 2
: classtype == "军事类" ? 3
: classtype == "语言类" ? 4
: classtype == "师范类" ? 5
: classtype == "财经类" ? 6
: classtype == "政法类" ? 7
: classtype == "民族类" ? 8
: classtype == "农林类" ? 9
: classtype == "艺术类" ? 10
: classtype == "体育类" ? 11 : 12,
Area_Name = areaname,
Nature = isgongban == "公办" ? 0 : isgongban == "民办" ? 1 : isgongban == "中外合作" ? 2 : 3,
Sff = is211 == "211" ? 1 : 0,
QJJH = isqjjh == "强基计划" ? 1 : 0,
Nhef = is985 == "985" ? 1 : 0,
Syl = issyl == "985" ? 1 : 0,
Subject_Level = schooltype == "本科" ? 0 : 1
});
}
}
await this.d_University.Add(universityattench);
}
return true;
}
//2020 最低录取分数导入
public async Task<bool> Import()
{