huanghai
/
QingLong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

Browse Source
main
kgdxpr 7 months ago
parent df09055331 6016248f02
commit 62f186b44d
5 changed files with 178 additions and 65 deletions
Show Stats Download Patch File Download Diff File

32
src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java
Unescape View File

@ -13,7 +13,6 @@ import com.jfinal.core.Controller;
import com.jfinal.ext.interceptor.POST;
import com.jfinal.kit.Kv;
import com.jfinal.kit.PropKit;
import com.jfinal.plugin.activerecord.Page;
import com.jfinal.plugin.activerecord.Record;
import com.jfinal.ext.interceptor.GET;
import com.jfinal.kit.StrKit;
@ -123,36 +122,5 @@ public class MaxKbController extends Controller {
renderFile(new File(tmpFile), gather_regionc + "统计报表.xlsx");
}
/**
* 获取标准学校名单,名单来自发展规划处
*/
// http://10.10.21.20:9000/QingLong/maxkb/getStandardSchoolList
@Before(GET.class)
public void getStandardSchoolList() {
renderJson(mkm.getStandardSchoolList());
}
/**
* 按学校名称匹配学校名称【成批匹配】
*
* @param pageNum 页码
* @param pageSize 每页数量
*/
// http://10.10.21.20:9000/QingLong/maxkb/matchSchoolNameList?type_id=1&pageNum=1&pageSize=10
@Before(GET.class)
public void matchSchoolNameList(int pageNum, int pageSize) {
Page<Record> page = mkm.matchSchoolNameList(pageNum, pageSize);
renderJson(page);
}
/**
* 按课程匹配学校名称【单个匹配】
*
* @param pageNum 页码
* @param pageSize 每页数量
*/
// http://10.10.21.20:9000/QingLong/maxkb/matchLessonSchoolName?pageNum=1&pageSize=10
public void matchLessonSchoolName(int pageNum, int pageSize) {
Page<Record> page = mkm.matchLessonSchoolName(pageNum, pageSize);
renderJson(page);
}
}

32
src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java
Unescape View File

@ -295,36 +295,4 @@ public class MaxKbModel {
return Db.find(sqlPara);
}
/**
* 获取所有学校标准名称
*
* @return
*/
public List<Record> getStandardSchoolList() {
String sql = "select organization_no,organization_name,gather_regionc from 教基1001 where a=1 and length(organization_no)=10 order by gather_regionc";
return Db.find(sql);
}
/**
* 获取学校标准名称列表
*
* @param pageNum 页码
* @param pageSize 每页数量
* @return
*/
public Page<Record> matchSchoolNameList(int pageNum, int pageSize) {
SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchSchoolNameList");
return Db.paginate(pageNum, pageSize, sqlPara);
}
/**
* 获取课程名称列表
* @param pageNum 页码
* @param pageSize 每页数量
* @return
*/
public Page<Record> matchLessonSchoolName(int pageNum, int pageSize) {
SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchLessonSchoolName");
return Db.paginate(pageNum, pageSize, sqlPara);
}
}

5
src/main/java/com/dsideal/QingLong/Start.java
Unescape View File

@ -29,6 +29,7 @@ import com.dsideal.QingLong.Util.CommonUtil;
import com.dsideal.QingLong.Util.LogBackLogFactory;
import com.dsideal.QingLong.Util.PkUtil;
import com.dsideal.QingLong.Util.RedisKit;
import com.dsideal.QingLong.YunXiao.Controller.YunXiaoController;
import com.dsideal.QingLong.Zbdc.Controller.ZbdcController;
import com.dsideal.QingLong.Zjcq.Controller.ZjcqController;
import com.jfinal.config.*;
@ -110,6 +111,8 @@ public class Start extends JFinalConfig {
me.add("/zjcq", ZjcqController.class);
//MaxKB AI智能助手
me.add("/maxkb", MaxKbController.class);
//长春云校
me.add("/yx", YunXiaoController.class);
}
@Override
@ -139,7 +142,7 @@ public class Start extends JFinalConfig {
hp.setMaximumPoolSize(this.maxPoolSize);
me.add(hp);
if(PropKit.get("MaxKB_jdbcUrl")!=null){
if (PropKit.get("MaxKB_jdbcUrl") != null) {
HikariCpPlugin hpMaxKB = new HikariCpPlugin(PropKit.get("MaxKB_jdbcUrl"), PropKit.get("MaxKB_user"), PropKit.get("MaxKB_password").trim(),
PropKit.get("driverClassName"));
hpMaxKB.setConnectionTestQuery(this.connectionTestQuery);

93
src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java
Unescape View File

@ -0,0 +1,93 @@
package com.dsideal.QingLong.YunXiao.Controller;
import com.dsideal.QingLong.Interceptor.IsLoginInterface;
import com.dsideal.QingLong.Util.CommonUtil;
import com.dsideal.QingLong.YunXiao.Model.YunXiaoModel;
import com.jfinal.aop.Before;
import com.jfinal.core.Controller;
import com.jfinal.ext.interceptor.GET;
import com.jfinal.ext.interceptor.POST;
import com.jfinal.plugin.activerecord.Page;
import com.jfinal.plugin.activerecord.Record;
public class YunXiaoController extends Controller {
YunXiaoModel ym=new YunXiaoModel();
/**
* 获取标准学校名单,名单来自发展规划处
*/
// http://10.10.21.20:9000/QingLong/yx/getStandardSchoolList
@Before(GET.class)
public void getStandardSchoolList() {
renderJson(ym.getStandardSchoolList());
}
/**
* 按学校名称匹配学校名称【成批匹配】
*
* @param pageNum 页码
* @param pageSize 每页数量
*/
// http://10.10.21.20:9000/QingLong/yx/matchSchoolNameList?type_id=1&pageNum=1&pageSize=10
@Before(GET.class)
public void matchSchoolNameList(int pageNum, int pageSize) {
Page<com.jfinal.plugin.activerecord.Record> page = ym.matchSchoolNameList(pageNum, pageSize);
renderJson(page);
}
/**
* 按课程匹配学校名称【单个匹配】
*
* @param pageNum 页码
* @param pageSize 每页数量
*/
// http://10.10.21.20:9000/QingLong/yx/matchLessonSchoolName?pageNum=1&pageSize=10
public void matchLessonSchoolName(int pageNum, int pageSize) {
Page<com.jfinal.plugin.activerecord.Record> page = ym.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、获取标准名称的单位，它的单位代码，隶属的区县等信息
com.jfinal.plugin.activerecord.Record record = ym.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
ym.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 = ym.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
ym.saveLessonMatchSchoolName(lesson_id, organization_name, organization_no, gather_regionc);
renderJson(CommonUtil.returnMessageJson(true, "修改成功！"));
}
}

81
src/main/java/com/dsideal/QingLong/YunXiao/Model/YunXiaoModel.java
Unescape View File

@ -0,0 +1,81 @@
package com.dsideal.QingLong.YunXiao.Model;
import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Page;
import com.jfinal.plugin.activerecord.Record;
import com.jfinal.plugin.activerecord.SqlPara;
import java.util.List;
public class YunXiaoModel {
/**
* 获取所有学校标准名称
*
* @return
*/
public List<com.jfinal.plugin.activerecord.Record> getStandardSchoolList() {
String sql = "select organization_no,organization_name,gather_regionc from 教基1001 where a=1 and length(organization_no)=10 order by gather_regionc";
return Db.find(sql);
}
/**
* 获取学校标准名称列表
*
* @param pageNum 页码
* @param pageSize 每页数量
* @return
*/
public Page<com.jfinal.plugin.activerecord.Record> matchSchoolNameList(int pageNum, int pageSize) {
SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchSchoolNameList");
return Db.paginate(pageNum, pageSize, sqlPara);
}
/**
* 获取课程名称列表
*
* @param pageNum 页码
* @param pageSize 每页数量
* @return
*/
public Page<com.jfinal.plugin.activerecord.Record> matchLessonSchoolName(int pageNum, int pageSize) {
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 课程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);
}
}
Write Preview
Loading…
Cancel
Save