From ba2d5283b8f90be8e1e5e93b70198947cad4fed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 8 Jan 2025 16:41:54 +0800 Subject: [PATCH] 'commit' --- .../MaxKB/Controller/MaxKbController.java | 47 +++++++++++++++++++ .../QingLong/MaxKB/Model/MaxKbModel.java | 39 ++++++++++++++- 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java index 185139a5..984316a7 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java @@ -1,7 +1,9 @@ package com.dsideal.QingLong.MaxKB.Controller; +import Tools.Crawler.YunXiao; import com.alibaba.fastjson.JSONObject; import com.dsideal.QingLong.Base.Model.BaseModel; +import com.dsideal.QingLong.Interceptor.IsLoginInterface; import com.dsideal.QingLong.MaxKB.Model.MaxKbModel; import com.dsideal.QingLong.MaxKB.Service.Impl.MaxKbImpl; import com.dsideal.QingLong.MaxKB.Service.MaxKbService; @@ -144,6 +146,7 @@ public class MaxKbController extends Controller { Page page = mkm.matchSchoolNameList(pageNum, pageSize); renderJson(page); } + /** * 按课程匹配学校名称【单个匹配】 * @@ -155,4 +158,48 @@ public class MaxKbController extends Controller { Page page = mkm.matchLessonSchoolName(pageNum, pageSize); renderJson(page); } + + /** + * 手工匹配学校名称 + * + * @param original_school_name 原始学校名称 + * @param organization_name 正式学校名称 + */ + @Before({POST.class}) + @IsLoginInterface({}) + public void saveHandMatchSchoolName(String original_school_name, String organization_name) { + //1、获取标准名称的单位,它的单位代码,隶属的区县等信息 + Record record = mkm.getBzSchoolByName(organization_name); + if (record == null) { + renderJson(CommonUtil.returnMessageJson(false, "原始学校名称不存在!")); + return; + } + String organization_no = record.getStr("organization_no"); + String gather_regionc = record.getStr("gather_regionc"); + //2、批量将关系表中,所有名称为original_school_name的单位,修改为organization_name + mkm.saveHandMatchSchoolName(original_school_name, organization_name, organization_no, gather_regionc); + renderJson(CommonUtil.returnMessageJson(true, "修改成功!")); + } + + /** + * 手工匹配课程与单位的名称 + * + * @param lesson_id 课程id + * @param organization_name 单位名称 + */ + @Before({POST.class}) + @IsLoginInterface({}) + public void saveLessonMatchSchoolName(String lesson_id, String organization_name) { + //1、获取标准名称的单位,它的单位代码,隶属的区县等信息 + Record record = mkm.getBzSchoolByName(organization_name); + if (record == null) { + renderJson(CommonUtil.returnMessageJson(false, "原始学校名称不存在!")); + return; + } + String organization_no = record.getStr("organization_no"); + String gather_regionc = record.getStr("gather_regionc"); + //2、将关系表中,课程id为lesson_id的单位名称修改为organization_name + mkm.saveLessonMatchSchoolName(lesson_id, organization_name, organization_no, gather_regionc); + renderJson(CommonUtil.returnMessageJson(true, "修改成功!")); + } } diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java b/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java index b3742bb2..2c5ed3ab 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java @@ -319,7 +319,8 @@ public class MaxKbModel { /** * 获取课程名称列表 - * @param pageNum 页码 + * + * @param pageNum 页码 * @param pageSize 每页数量 * @return */ @@ -327,4 +328,40 @@ public class MaxKbModel { SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchLessonSchoolName"); return Db.paginate(pageNum, pageSize, sqlPara); } + + /** + * 根据学校名称获取学校信息 + * + * @param organization_name 单位名称 + * @return + */ + public Record getBzSchoolByName(String organization_name) { + String sql = "select * from 教基1001 where a=1 and length(organization_no)=10 and organization_name=?"; + return Db.findFirst(sql, organization_name); + } + + /** + * 手工匹配学校名称 + * + * @param original_school_name + * @param organization_name + * @param organization_no + * @param gather_regionc + */ + public void saveHandMatchSchoolName(String original_school_name, String organization_name, String organization_no, String gather_regionc) { + String sql = "update t_crawler_lesson_school set organization_name=?,match_type=2,organization_no=?,gather_regionc=? where original_school_name=?"; + Db.update(sql, organization_name, organization_no, gather_regionc, original_school_name); + } + + /** + * 课程匹配学校名称 + * @param lesson_id + * @param organization_name + * @param organization_no + * @param gather_regionc + */ + public void saveLessonMatchSchoolName(String lesson_id, String organization_name, String organization_no, String gather_regionc) { + String sql = "update t_crawler_lesson_school set organization_name=?,match_type=3,organization_no=?,gather_regionc=? where lesson_id=?"; + Db.update(sql, organization_name, organization_no, gather_regionc, lesson_id); + } }