From 51c8c9a526761f2756534062224c312c2364beeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Tue, 12 Sep 2023 09:10:17 +0800 Subject: [PATCH] feat:appsetting sql update --- .../Front/UniversityCollectionController.cs | 15 ++++ .../Controllers/HealthCheckController.cs | 3 +- .../Controllers/LoginController.cs | 3 + New_College.Api/New_College.Model.xml | 11 ++- New_College.Api/New_College.xml | 6 ++ New_College.Api/appsettings.json | 12 +-- .../ID_UniversityServices.cs | 2 + .../IT_EnrollmentPlaneServices.cs | 2 +- New_College.Model/Models/D_University.cs | 13 ++- New_College.Services/D_UniversityServices.cs | 34 ++++++-- .../T_EnrollmentPlaneServices.cs | 86 +++++++++++++++++++ 11 files changed, 168 insertions(+), 19 deletions(-) diff --git a/New_College.Api/Controllers/Front/UniversityCollectionController.cs b/New_College.Api/Controllers/Front/UniversityCollectionController.cs index 30ca777..24f0d63 100644 --- a/New_College.Api/Controllers/Front/UniversityCollectionController.cs +++ b/New_College.Api/Controllers/Front/UniversityCollectionController.cs @@ -89,5 +89,20 @@ namespace New_College.Api.Controllers.Front { return await d_UniversityCollectionServices.GetUniversityMap(query); } + + + /// + /// 同步数据 + /// + /// + [HttpGet] + public async Task SyncUniversityLogo() + { + return await d_UniversityServices.SyncUniversityLists(); + } + + + + } } diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs index cd702e8..5a05c1d 100644 --- a/New_College.Api/Controllers/HealthCheckController.cs +++ b/New_College.Api/Controllers/HealthCheckController.cs @@ -34,7 +34,8 @@ namespace New_College.Controllers [HttpPost] public Task Post() { - return t_EnrollmentPlane.Import(); + // return t_EnrollmentPlane.Import(); + return t_EnrollmentPlane.Importuniverbaseinfo(); } } diff --git a/New_College.Api/Controllers/LoginController.cs b/New_College.Api/Controllers/LoginController.cs index de3bc1f..09a6518 100644 --- a/New_College.Api/Controllers/LoginController.cs +++ b/New_College.Api/Controllers/LoginController.cs @@ -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; /// @@ -186,6 +188,7 @@ namespace New_College.Controllers } var token = JwtToken.BuildJwtToken(claims.ToArray(), _requirement); + return new MessageModel() { success = true, diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index b654583..65addc1 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -527,7 +527,7 @@ - 办学性质 1、公立，2、私立 + 办学性质 1、公办，2、民办 @@ -542,7 +542,7 @@ - 学科层次 1、本科，2、专科 + 学科层次 0、本科，1、专科 @@ -560,6 +560,11 @@ 是否双一流 0、否，1、是 + + + 强基计划 + + 院士数 @@ -577,7 +582,7 @@ - 大学类型 0综合,1理工类，2医学类... + 大学类型 0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他 diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml index dd6de14..c4ad3e9 100644 --- a/New_College.Api/New_College.xml +++ b/New_College.Api/New_College.xml @@ -573,6 +573,12 @@ + + + 同步数据 + + + 获取Vip卡列表 diff --git a/New_College.Api/appsettings.json b/New_College.Api/appsettings.json index 087d4b3..0d5b119 100644 --- a/New_College.Api/appsettings.json +++ b/New_College.Api/appsettings.json @@ -199,12 +199,12 @@ "accessKeyId": "LTAI4GK6SGUmMX3J9Wyzyt6C", "accessKeySecret": "vTUjL4so42kiuctWEb6WoaxtXs3MLS" }, - + "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" } } diff --git a/New_College.IServices/ID_UniversityServices.cs b/New_College.IServices/ID_UniversityServices.cs index a1bf94a..57238ae 100644 --- a/New_College.IServices/ID_UniversityServices.cs +++ b/New_College.IServices/ID_UniversityServices.cs @@ -12,6 +12,8 @@ namespace New_College.IServices /// public interface ID_UniversityServices : IBaseServices { + + Task SyncUniversityLists(); Task SaveImg(); /// diff --git a/New_College.IServices/IT_EnrollmentPlaneServices.cs b/New_College.IServices/IT_EnrollmentPlaneServices.cs index 44caeb6..97c4f79 100644 --- a/New_College.IServices/IT_EnrollmentPlaneServices.cs +++ b/New_College.IServices/IT_EnrollmentPlaneServices.cs @@ -15,7 +15,7 @@ namespace New_College.IServices { Task Import(); - + Task Importuniverbaseinfo(); /// /// 根据大学或者专业获取招生计划 /// diff --git a/New_College.Model/Models/D_University.cs b/New_College.Model/Models/D_University.cs index 154f6ca..aca39cf 100644 --- a/New_College.Model/Models/D_University.cs +++ b/New_College.Model/Models/D_University.cs @@ -35,7 +35,7 @@ namespace New_College.Model.Models public string Build_Date { get; set; } /// - /// 办学性质 1、公立，2、私立 + /// 办学性质 1、公办，2、民办 /// [SugarColumn(IsNullable = true)] public int Nature { get; set; } @@ -53,7 +53,7 @@ namespace New_College.Model.Models public string AscriptionName { get; set; } /// - /// 学科层次 1、本科，2、专科 + /// 学科层次 0、本科，1、专科 /// [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; } + + /// + /// 强基计划 + /// + [SugarColumn(IsNullable = true)] + public int QJJH { get; set; } + /// /// 院士数 /// @@ -95,7 +102,7 @@ namespace New_College.Model.Models public int Master_Count { get; set; } /// - /// 大学类型 0综合,1理工类，2医学类... + /// 大学类型 0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他 /// [SugarColumn(IsNullable = true)] public int Type { get; set; } diff --git a/New_College.Services/D_UniversityServices.cs b/New_College.Services/D_UniversityServices.cs index 80a34a2..7384bc3 100644 --- a/New_College.Services/D_UniversityServices.cs +++ b/New_College.Services/D_UniversityServices.cs @@ -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 SyncUniversityLists() + { + var university = await _dal.Query(); + var list = new List(); + 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; + } + /// /// 下载图片 /// /// public async Task 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"); //保存 } } } diff --git a/New_College.Services/T_EnrollmentPlaneServices.cs b/New_College.Services/T_EnrollmentPlaneServices.cs index db16c94..4aa6874 100644 --- a/New_College.Services/T_EnrollmentPlaneServices.cs +++ b/New_College.Services/T_EnrollmentPlaneServices.cs @@ -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); } + + + /// + /// + /// + /// + public async Task 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(); + var universityattench = new List(); + 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 Import() {