From 082ff05c622e8f31d26de91eb1562d17c4facbd0 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Wed, 7 May 2025 14:25:21 +0800 Subject: [PATCH] 'commit' --- dsBase/dsBase.iml | 12 ---- dsBase/pom.xml | 16 ++--- .../dsideal/dsBase/Base/Model/BaseModel.java | 2 +- .../StudentImportExcelUtil.java | 6 +- .../TeacherImportExcelUtil.java | 6 +- .../Global/Controller/GlobalController.java | 2 +- .../dsBase/Global/Model/GlobalModel.java | 2 +- .../com/dsideal/dsBase/JApiDocsGenerator.java | 2 +- .../LoginPerson/Model/LoginPersonModel.java | 2 +- .../Menu/Controller/MenuController.java | 5 +- .../Controller/OrganizationController.java | 6 +- .../Organization/Model/OrganizationModel.java | 64 +++++++++---------- .../dsBase/Student/Model/StudentModel.java | 2 +- .../Controller/StudentYdController.java | 6 +- .../StudentYd/Model/StudentYdModel.java | 26 ++++---- .../Teacher/Controller/TeacherController.java | 10 +-- .../dsBase/Teacher/Model/TeacherModel.java | 10 +-- .../Controller/TeacherYdController.java | 8 +-- .../TeacherYd/Model/TeacherYdModel.java | 12 ++-- .../com/dsideal/dsBase/Util/CommonUtil.java | 2 +- .../java/com/dsideal/dsBase/Util/PoiUtil.java | 12 ++-- .../src/main/resources/application_dev.yaml | 8 +-- .../src/main/resources/application_pro.yaml | 8 +-- .../com/dsideal/gw/Handler/RouterHandler.java | 2 +- dsRes/pom.xml | 16 ++--- .../dsideal/resource/JApiDocsGenerator.java | 2 +- dsUtils/pom.xml | 22 +++---- .../main/java/com/dsideal/GenerateCode.java | 41 ++++++------ pom.xml | 8 +-- 29 files changed, 153 insertions(+), 167 deletions(-) diff --git a/dsBase/dsBase.iml b/dsBase/dsBase.iml index 0e4f86bd..97714aba 100644 --- a/dsBase/dsBase.iml +++ b/dsBase/dsBase.iml @@ -5,16 +5,4 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/dsBase/pom.xml b/dsBase/pom.xml index 5de7bbfe..0aafda48 100644 --- a/dsBase/pom.xml +++ b/dsBase/pom.xml @@ -56,14 +56,14 @@ - com.zaxxer - HikariCP - ${HikariCP.version} + com.alibaba + druid + ${druid.version} - org.postgresql - postgresql - ${postgresql.version} + com.mysql + mysql-connector-j + ${mysql.version} @@ -220,8 +220,8 @@ maven-compiler-plugin 3.11.0 - 21 - 21 + 8 + 8 UTF-8 -parameters -Xlint:unchecked diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Base/Model/BaseModel.java b/dsBase/src/main/java/com/dsideal/dsBase/Base/Model/BaseModel.java index 67900e5e..380c4459 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Base/Model/BaseModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Base/Model/BaseModel.java @@ -188,7 +188,7 @@ public class BaseModel { */ public Record getCurrentTerm() { String sql = Db.getSql("Base.getCurrentTerm"); - return Db.find(sql).getFirst(); + return Db.findFirst(sql); } /** diff --git a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/StudentImportExcelUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/StudentImportExcelUtil.java index 55049b92..7ee033c7 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/StudentImportExcelUtil.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/StudentImportExcelUtil.java @@ -417,9 +417,9 @@ public class StudentImportExcelUtil { OrganizationModel orgModel = new OrganizationModel(); List rs = orgModel.getAreaIdByParentId(bureau_id); if (rs != null && !rs.isEmpty()) { - city_id = rs.getFirst().getStr("city_id"); - area_id = rs.getFirst().getStr("area_id"); - main_school_id = rs.getFirst().getStr("main_school_id"); + city_id = rs.get(0).getStr("city_id"); + area_id = rs.get(0).getStr("area_id"); + main_school_id = rs.get(0).getStr("main_school_id"); } else { city_id = "-1"; area_id = "-1"; diff --git a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherImportExcelUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherImportExcelUtil.java index 04022bb8..6f5d406d 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherImportExcelUtil.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherImportExcelUtil.java @@ -349,9 +349,9 @@ public class TeacherImportExcelUtil { OrganizationModel orgModel = new OrganizationModel(); List rs = orgModel.getAreaIdByParentId(bureau_id); if (rs != null && !rs.isEmpty()) { - city_id = rs.getFirst().getStr("city_id"); - area_id = rs.getFirst().getStr("area_id"); - main_school_id = rs.getFirst().getStr("main_school_id"); + city_id = rs.get(0).getStr("city_id"); + area_id = rs.get(0).getStr("area_id"); + main_school_id = rs.get(0).getStr("main_school_id"); } else { city_id = "-1"; area_id = "-1"; diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java b/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java index 50eb05b9..443018c7 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java @@ -41,7 +41,7 @@ public class GlobalController extends Controller { renderJson(CommonUtil.returnMessageJson(false, "没有找到对应的省和市！")); return; } - String area_id = records.getFirst().getStr("id"); + String area_id = records.get(0).getStr("id"); //保存 GlobalModel model = new GlobalModel(); model.saveInstallArea(area_id); diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Global/Model/GlobalModel.java b/dsBase/src/main/java/com/dsideal/dsBase/Global/Model/GlobalModel.java index fc81b135..b34a14f2 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Global/Model/GlobalModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Global/Model/GlobalModel.java @@ -75,7 +75,7 @@ public class GlobalModel { public int checkGlobalCodeCount(String global_id, String globalCode) { String install_area = getInstallArea(); String sql = "select count(1) as c from t_base_global where global_id<>? and global_code=? and install_area=?"; - Record record = Db.find(sql, Integer.parseInt(global_id), globalCode, install_area).getFirst(); + Record record = Db.find(sql, Integer.parseInt(global_id), globalCode, install_area).get(0); return record.getInt("c"); } diff --git a/dsBase/src/main/java/com/dsideal/dsBase/JApiDocsGenerator.java b/dsBase/src/main/java/com/dsideal/dsBase/JApiDocsGenerator.java index a777e148..cd4a1ccd 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/JApiDocsGenerator.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/JApiDocsGenerator.java @@ -81,7 +81,7 @@ public class JApiDocsGenerator { Method[] methods = cls.getDeclaredMethods(); for (Method method : methods) { // 检查方法上是否有@Before注解 - var before = method.getAnnotation(Before.class); + Before before = method.getAnnotation(Before.class); if (before != null) { String httpType = getHttpType(before); res.put(cls.getSimpleName() + "." + method.getName(), httpType); diff --git a/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Model/LoginPersonModel.java b/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Model/LoginPersonModel.java index 2a1eee82..18f08dc2 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Model/LoginPersonModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Model/LoginPersonModel.java @@ -65,7 +65,7 @@ public class LoginPersonModel { String sql = Db.getSql("loginPerson.getLoginInfoByPersonId"); List list = Db.find(sql, personId); if (!list.isEmpty()) { - return list.getFirst(); + return list.get(0); } else { return null; } diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Menu/Controller/MenuController.java b/dsBase/src/main/java/com/dsideal/dsBase/Menu/Controller/MenuController.java index 912cd47f..71c7b161 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Menu/Controller/MenuController.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Menu/Controller/MenuController.java @@ -13,6 +13,7 @@ import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; import com.jfinal.ext.interceptor.POST; import com.jfinal.kit.Kv; +import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import java.util.HashMap; @@ -74,7 +75,7 @@ public class MenuController extends Controller { String person_id = rPerson.getStr("person_id"); //获取单位管理员菜单 if (identity_id < 5) { //1,2,3,4 - var list = model.selectBureauMenuByPersonId(identity_id, person_id).getList(); + List list = model.selectBureauMenuByPersonId(identity_id, person_id).getList(); renderJson(MenuUtil.convertListToMenuForTreeTable(list).getChildren().get(0).getChildren()); return; } @@ -100,7 +101,7 @@ public class MenuController extends Controller { renderJson(CommonUtil.returnMessageJson(false, "无法获取指定ID的信息！")); return; } - Record record = list.getFirst(); + Record record = list.get(0); int duties_id; int level_id = record.getInt("level"); if (level_id == 4) { diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Organization/Controller/OrganizationController.java b/dsBase/src/main/java/com/dsideal/dsBase/Organization/Controller/OrganizationController.java index c2184d56..43fefaae 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Organization/Controller/OrganizationController.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Organization/Controller/OrganizationController.java @@ -84,7 +84,7 @@ public class OrganizationController extends Controller { renderJson(CommonUtil.returnMessageJson(false, "parent_org_id参数不正确!")); return; } - String city_id = rs.getFirst().getStr("city_id"); + String city_id = rs.get(0).getStr("city_id"); int cityOrarea; if (parent_org_id.equals(city_id)) { cityOrarea = 1; @@ -96,8 +96,8 @@ public class OrganizationController extends Controller { renderJson(CommonUtil.returnMessageJson(false, "school_type_id参数不正确!")); return; } - int shi_org_type = r.getFirst().getInt("shi_org_type"); - int area_org_type = r.getFirst().getInt("area_org_type"); + int shi_org_type = r.get(0).getInt("shi_org_type"); + int area_org_type = r.get(0).getInt("area_org_type"); if (cityOrarea == 1) { org_type_id = shi_org_type; } else { diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Organization/Model/OrganizationModel.java b/dsBase/src/main/java/com/dsideal/dsBase/Organization/Model/OrganizationModel.java index 18fb870c..ad79d0c4 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Organization/Model/OrganizationModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Organization/Model/OrganizationModel.java @@ -42,10 +42,10 @@ public class OrganizationModel { String sql = Db.getSql("organization.getOrgInfoById"); List list = Db.find(sql, bureau_id); if (!list.isEmpty()) { - resMap.put("city_id", list.getFirst().getStr("city_id")); - resMap.put("area_id", list.getFirst().getStr("area_id")); - resMap.put("main_school_id", list.getFirst().getStr("main_school_id")); - resMap.put("school_type_id", list.getFirst().getStr("school_type_id")); + resMap.put("city_id", list.get(0).getStr("city_id")); + resMap.put("area_id", list.get(0).getStr("area_id")); + resMap.put("main_school_id", list.get(0).getStr("main_school_id")); + resMap.put("school_type_id", list.get(0).getStr("school_type_id")); return resMap; } else { return null; @@ -74,23 +74,23 @@ public class OrganizationModel { map.put("area_code", ""); } else { //如果是市 - if (records.getFirst().getStr("id").equals(records.getFirst().getStr("city_id"))) { + if (records.get(0).getStr("id").equals(records.get(0).getStr("city_id"))) { map.put("city_id", id); map.put("area_id", NullGuid); - map.put("parent_id", records.getFirst().getStr("parent_id")); - map.put("area_name", records.getFirst().getStr("area_name")); - map.put("area_code", records.getFirst().getStr("area_code")); - map.put("province_id", records.getFirst().getStr("province_id")); - map.put("province_name", records.getFirst().getStr("province_name")); + map.put("parent_id", records.get(0).getStr("parent_id")); + map.put("area_name", records.get(0).getStr("area_name")); + map.put("area_code", records.get(0).getStr("area_code")); + map.put("province_id", records.get(0).getStr("province_id")); + map.put("province_name", records.get(0).getStr("province_name")); } else//如果是县区 { sql = Db.getSql("dm.getAreaById"); - String city_id = Db.find(sql, id).getFirst().getStr("parent_id"); + String city_id = Db.find(sql, id).get(0).getStr("parent_id"); map.put("city_id", city_id); map.put("area_id", id); - map.put("parent_id", records.getFirst().getStr("parent_id")); - map.put("area_name", records.getFirst().getStr("area_name")); - map.put("area_code", records.getFirst().getStr("area_code")); + map.put("parent_id", records.get(0).getStr("parent_id")); + map.put("area_name", records.get(0).getStr("area_name")); + map.put("area_code", records.get(0).getStr("area_code")); } } return map; @@ -196,8 +196,8 @@ public class OrganizationModel { record.set("bureau_id", bureau_id); List rs = getAreaIdByParentId(bureau_id); if (rs != null && !rs.isEmpty()) { - city_id = rs.getFirst().getStr("city_id"); - area_id = rs.getFirst().getStr("area_id"); + city_id = rs.get(0).getStr("city_id"); + area_id = rs.get(0).getStr("area_id"); } else { city_id = "-1"; area_id = "-1"; @@ -238,7 +238,7 @@ public class OrganizationModel { public List getAreaIdByParentId(String parent_id) { List rs = getOrgInfoById(parent_id); if (!rs.isEmpty()) { - String bureau_id = rs.getFirst().getStr("bureau_id"); + String bureau_id = rs.get(0).getStr("bureau_id"); rs = getOrgInfoById(bureau_id); if (!rs.isEmpty()) { return rs; @@ -276,8 +276,8 @@ public class OrganizationModel { int b_use = 0; List rs = getOrgInfoById(org_id); if (!rs.isEmpty()) { - create_time = DateUtil.parse(rs.getFirst().getStr("create_time")); - b_use = rs.getFirst().getInt("b_use"); + create_time = DateUtil.parse(rs.get(0).getStr("create_time")); + b_use = rs.get(0).getInt("b_use"); } record.set("create_time", create_time); record.set("b_use", b_use); @@ -315,8 +315,8 @@ public class OrganizationModel { List rs = getAreaIdByParentId(parent_id); if (rs != null && !rs.isEmpty()) { - city_id = rs.getFirst().getStr("city_id"); - area_id = rs.getFirst().getStr("area_id"); + city_id = rs.get(0).getStr("city_id"); + area_id = rs.get(0).getStr("area_id"); } else { city_id = "-1"; area_id = "-1"; @@ -331,9 +331,9 @@ public class OrganizationModel { String bureau_id = null; rs = getOrgInfoById(org_id); if (!rs.isEmpty()) { - bureau_id = rs.getFirst().getStr("bureau_id"); - create_time = rs.getFirst().getStr("create_time"); - b_use = rs.getFirst().getInt("b_use"); + bureau_id = rs.get(0).getStr("bureau_id"); + create_time = rs.get(0).getStr("create_time"); + b_use = rs.get(0).getInt("b_use"); } record.set("bureau_id", bureau_id); record.set("create_time", DateUtil.parse(create_time)); @@ -354,7 +354,7 @@ public class OrganizationModel { */ public int getClassCountByBureauId(String org_id) { String sql = Db.getSql("class.getClassCountByBureauId"); - return Db.find(sql, org_id).getFirst().getInt("c"); + return Db.find(sql, org_id).get(0).getInt("c"); } /** @@ -367,7 +367,7 @@ public class OrganizationModel { */ public int getOrgCountByBureauId(String org_id) { String sql = Db.getSql("organization.getOrgCountByBureauId"); - return Db.find(sql, org_id, org_id).getFirst().getInt("c"); + return Db.find(sql, org_id, org_id).get(0).getInt("c"); } /** @@ -380,7 +380,7 @@ public class OrganizationModel { */ public int getTeacherCountByBureauId(String org_id) { String sql = Db.getSql("loginPerson.getTeacherCountByBureauId"); - return Db.find(sql, org_id).getFirst().getInt("c"); + return Db.find(sql, org_id).get(0).getInt("c"); } /** @@ -393,7 +393,7 @@ public class OrganizationModel { */ public int getTeacherCountByOrgId(String org_id) { String sql = Db.getSql("loginPerson.getTeacherCountByOrgId"); - return Db.find(sql, org_id).getFirst().getInt("c"); + return Db.find(sql, org_id).get(0).getInt("c"); } /** @@ -406,7 +406,7 @@ public class OrganizationModel { */ public int getStudentCountByBureauId(String org_id) { String sql = Db.getSql("loginPerson.getStudentCountByBureauId"); - return Db.find(sql, org_id).getFirst().getInt("c"); + return Db.find(sql, org_id).get(0).getInt("c"); } /** @@ -419,7 +419,7 @@ public class OrganizationModel { */ public int getParentCountByBureauId(String org_id) { String sql = Db.getSql("loginPerson.getParentCountByBureauId"); - return Db.find(sql, org_id).getFirst().getInt("c"); + return Db.find(sql, org_id).get(0).getInt("c"); } /** @@ -457,7 +457,7 @@ public class OrganizationModel { */ public int getOrgCodeCount(String org_code) { String sql = Db.getSql("organization.getOrgCodeCount"); - return Db.find(sql, org_code).getFirst().getInt("c"); + return Db.find(sql, org_code).get(0).getInt("c"); } /** @@ -470,7 +470,7 @@ public class OrganizationModel { */ public int getOrgCodeCountExceptSelf(String org_id, String org_code) { String sql = Db.getSql("organization.getOrgCodeCountExceptSelf"); - return Db.find(sql, org_code, org_id).getFirst().getInt("c"); + return Db.find(sql, org_code, org_id).get(0).getInt("c"); } /** diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Student/Model/StudentModel.java b/dsBase/src/main/java/com/dsideal/dsBase/Student/Model/StudentModel.java index fedf3dc3..845c3f74 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Student/Model/StudentModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Student/Model/StudentModel.java @@ -32,7 +32,7 @@ public class StudentModel { if (rs == null || rs.isEmpty()) { return false; } - int stage_id = rs.getFirst().getInt("stage_id"); + int stage_id = rs.get(0).getInt("stage_id"); // 生成6位随机明文密码 String originalPwd = CommonUtil.getSixRandom(); diff --git a/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Controller/StudentYdController.java b/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Controller/StudentYdController.java index 5a4e4956..5caa6bc1 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Controller/StudentYdController.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Controller/StudentYdController.java @@ -271,7 +271,7 @@ public class StudentYdController extends Controller { return; } Record rPerson = JwtUtil.getPersonInfo(getRequest()); - String source_bureau_id = records.getFirst().getStr("source_bureau_id"); + String source_bureau_id = records.get(0).getStr("source_bureau_id"); String personId = rPerson.getStr("person_id"); String identity_id = rPerson.getStr("identity_id"); LoginPersonModel _loginPersonModel = new LoginPersonModel(); @@ -281,13 +281,13 @@ public class StudentYdController extends Controller { return; } //2、是不是已经是删除状态的 - int b_use = records.getFirst().getInt("b_use"); + int b_use = records.get(0).getInt("b_use"); if (b_use != 1) { renderJson(CommonUtil.returnMessageJson(false, "此记录已经是删除状态，不能重复删除!")); return; } //3、是不是对方还没有审核 - int status_id = records.getFirst().getInt("status_id"); + int status_id = records.get(0).getInt("status_id"); if (status_id > 1) { renderJson(CommonUtil.returnMessageJson(false, "此记录已被对方审核处理，不能删除!")); return; diff --git a/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Model/StudentYdModel.java b/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Model/StudentYdModel.java index 7bd4dc40..80c28625 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Model/StudentYdModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/StudentYd/Model/StudentYdModel.java @@ -37,7 +37,7 @@ public class StudentYdModel { public boolean updateStudentStatus(String person_id, String status_code, String operator, String ip_address) { List rs = get_dm_status_student_by_code(status_code); if (rs != null && !rs.isEmpty()) { - int change_person_b_use = rs.getFirst().getInt("change_person_b_use"); + int change_person_b_use = rs.get(0).getInt("change_person_b_use"); //修改人员主表 String sql = Db.getSql("studentYd.updateStudentStatus"); //update t_sys_loginperson set b_use=?,status_code=?,operator=?,ip_address=? where person_id=? @@ -174,7 +174,7 @@ public class StudentYdModel { if (records == null || records.size() == 0) { return false; } - Record record = records.getFirst(); + Record record = records.get(0); String person_id = record.getStr("person_id"); String target_bureau_id = record.getStr("target_bureau_id"); record.set("status_id", status_id); @@ -193,9 +193,9 @@ public class StudentYdModel { if (rs == null || rs.isEmpty()) { return false; } - String city_id = rs.getFirst().getStr("city_id"); - String area_id = rs.getFirst().getStr("area_id"); - String main_school_id = rs.getFirst().getStr("main_school_id"); + String city_id = rs.get(0).getStr("city_id"); + String area_id = rs.get(0).getStr("area_id"); + String main_school_id = rs.get(0).getStr("main_school_id"); //修改到新的单位和部门下 sql = Db.getSql("loginPerson.changePersonClass"); Db.update(sql, city_id, area_id, main_school_id, target_bureau_id, class_id, operator, IpUtil.ipToLong(ip_address), person_id); @@ -215,7 +215,7 @@ public class StudentYdModel { Db.update(sql, operator, IpUtil.ipToLong(ip_address), id); //修改为正常状态 List records = getStudentTransferInfoById(id); - updateStudentStatus(records.getFirst().getStr("person_id"), "01", operator, ip_address); + updateStudentStatus(records.get(0).getStr("person_id"), "01", operator, ip_address); } /** @@ -225,7 +225,7 @@ public class StudentYdModel { */ public int getNewStudentTransferApplyCount(String bureau_id) { String sql = Db.getSql("studentYd.getNewStudentTransferApplyCount"); - return Db.find(sql, bureau_id).getFirst().getInt("c"); + return Db.find(sql, bureau_id).get(0).getInt("c"); } /** @@ -235,7 +235,7 @@ public class StudentYdModel { */ public int getNewStudentTransferEchoCount(String bureau_id) { String sql = Db.getSql("studentYd.getNewStudentTransferEchoCount"); - return Db.find(sql, bureau_id).getFirst().getInt("c"); + return Db.find(sql, bureau_id).get(0).getInt("c"); } /** @@ -268,7 +268,7 @@ public class StudentYdModel { if (applyRs == null || applyRs.isEmpty()) { return false; } - Record record = applyRs.getFirst(); + Record record = applyRs.get(0); String source_bureau_id = record.getStr("source_bureau_id"); String target_bureau_id = record.getStr("target_bureau_id"); int status_id = record.getInt("status_id"); @@ -300,9 +300,9 @@ public class StudentYdModel { if (rs == null || rs.isEmpty()) { return false; } - String city_id = rs.getFirst().getStr("city_id"); - String area_id = rs.getFirst().getStr("area_id"); - String main_school_id = rs.getFirst().getStr("main_school_id"); + String city_id = rs.get(0).getStr("city_id"); + String area_id = rs.get(0).getStr("area_id"); + String main_school_id = rs.get(0).getStr("main_school_id"); //修改到新的单位和班级下 sql = Db.getSql("loginPerson.changePersonClass"); Db.update(sql, city_id, area_id, main_school_id, bureau_id, class_id, operator, IpUtil.ipToLong(ip_address), person_id); @@ -313,7 +313,7 @@ public class StudentYdModel { if (rs == null || rs.isEmpty()) { return false; } - String parent_id = rs.getFirst().getStr("person_id"); + String parent_id = rs.get(0).getStr("person_id"); //2、变更 sql = Db.getSql("loginPerson.changePersonClass"); Db.update(sql, city_id, area_id, main_school_id, bureau_id, class_id, operator, IpUtil.ipToLong(ip_address), parent_id); diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Controller/TeacherController.java b/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Controller/TeacherController.java index 0c3b7fde..7d44c739 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Controller/TeacherController.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Controller/TeacherController.java @@ -108,10 +108,10 @@ public class TeacherController extends Controller { return; } //获取部门所在单位ID - String bureauId = rs.getFirst().get("bureau_id").toString(); - String cityId = rs.getFirst().get("city_id").toString(); - String areaId = rs.getFirst().get("area_id").toString(); - String mainSchoolId = rs.getFirst().get("main_school_id").toString(); + String bureauId = rs.get(0).get("bureau_id").toString(); + String cityId = rs.get(0).get("city_id").toString(); + String areaId = rs.get(0).get("area_id").toString(); + String mainSchoolId = rs.get(0).get("main_school_id").toString(); //生成6位随机明文密码 String originalPwd = CommonUtil.getSixRandom(); @@ -533,7 +533,7 @@ public class TeacherController extends Controller { renderJson(map); return; } - bureau_id = records.getFirst().getStr("bureau_id"); + bureau_id = records.get(0).getStr("bureau_id"); //5、检查EXCEL与数据库中是不是有身份证号重复 diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Model/TeacherModel.java b/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Model/TeacherModel.java index adcb45f8..383899c2 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Model/TeacherModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Teacher/Model/TeacherModel.java @@ -115,12 +115,12 @@ public class TeacherModel { String sql = Db.getSql("loginPerson.getLoginInfoByPersonId"); List list = Db.find(sql, person_id); if (!list.isEmpty()) { - city_id = list.getFirst().getStr("city_id"); - area_id = list.getFirst().getStr("area_id"); - main_school_id = list.getFirst().getStr("main_school_id"); - bureau_id = list.getFirst().getStr("bureau_id"); + city_id = list.get(0).getStr("city_id"); + area_id = list.get(0).getStr("area_id"); + main_school_id = list.get(0).getStr("main_school_id"); + bureau_id = list.get(0).getStr("bureau_id"); - Record record = list.getFirst(); + Record record = list.get(0); record.set("person_id", person_id); record.set("identity_id", 5); record.set("person_name", person_name); diff --git a/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Controller/TeacherYdController.java b/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Controller/TeacherYdController.java index df9437b1..74fb26c9 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Controller/TeacherYdController.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Controller/TeacherYdController.java @@ -35,7 +35,7 @@ public class TeacherYdController extends Controller { renderJson(CommonUtil.returnMessageJson(false, "人员状态异常!")); return; } - int c = rs.getFirst().getInt("c"); + int c = rs.get(0).getInt("c"); if (c > 0) { renderJson(CommonUtil.returnMessageJson(false, "人员处理在调转审核中!")); } else { @@ -279,7 +279,7 @@ public class TeacherYdController extends Controller { return; } Record rPerson = JwtUtil.getPersonInfo(getRequest()); - String source_bureau_id = records.getFirst().getStr("source_bureau_id"); + String source_bureau_id = records.get(0).getStr("source_bureau_id"); String personId = rPerson.getStr("person_id"); ; String identity_id = rPerson.getStr("identity_id"); @@ -290,13 +290,13 @@ public class TeacherYdController extends Controller { return; } //2、是不是已经是删除状态的 - int b_use = records.getFirst().getInt("b_use"); + int b_use = records.get(0).getInt("b_use"); if (b_use != 1) { renderJson(CommonUtil.returnMessageJson(false, "此记录已经是删除状态，不能重复删除!")); return; } //3、是不是对方还没有审核 - int status_id = records.getFirst().getInt("status_id"); + int status_id = records.get(0).getInt("status_id"); if (status_id > 1) { renderJson(CommonUtil.returnMessageJson(false, "此记录已被对方审核处理，不能删除!")); return; diff --git a/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Model/TeacherYdModel.java b/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Model/TeacherYdModel.java index 9bc57e9f..c1e7beaf 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Model/TeacherYdModel.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/TeacherYd/Model/TeacherYdModel.java @@ -36,7 +36,7 @@ public class TeacherYdModel { public boolean updateTeacherStatus(String person_id, String status_code, String operator, long ip_address) { List rs = get_dm_status_teacher_by_code(status_code); if (rs != null && !rs.isEmpty()) { - int change_person_b_use = rs.getFirst().getInt("change_person_b_use"); + int change_person_b_use = rs.get(0).getInt("change_person_b_use"); //修改人员主表 String sql = Db.getSql("teacherYd.updateTeacherStatus"); Db.update(sql, change_person_b_use, status_code, operator, ip_address, person_id); @@ -173,7 +173,7 @@ public class TeacherYdModel { if (records == null || records.isEmpty()) { return false; } - Record record = records.getFirst(); + Record record = records.get(0); String person_id = record.getStr("person_id"); String target_bureau_id = record.getStr("target_bureau_id"); record.set("status_id", status_id); @@ -191,9 +191,9 @@ public class TeacherYdModel { if (rs == null || rs.isEmpty()) { return false; } - String city_id = rs.getFirst().getStr("city_id"); - String area_id = rs.getFirst().getStr("area_id"); - String main_school_id = rs.getFirst().getStr("main_school_id"); + String city_id = rs.get(0).getStr("city_id"); + String area_id = rs.get(0).getStr("area_id"); + String main_school_id = rs.get(0).getStr("main_school_id"); //修改到新的单位和部门下 sql = Db.getSql("loginPerson.changePersonBureau"); Db.update(sql, city_id, area_id, main_school_id, target_bureau_id, org_id, operator, IpUtil.ipToLong(ip_address), person_id); @@ -213,7 +213,7 @@ public class TeacherYdModel { Db.update(sql, operator, IpUtil.ipToLong(ip_address), id); //修改为正常状态 List records = getTeacherTransferInfoById(id); - updateTeacherStatus(records.getFirst().getStr("person_id"), "01", operator, IpUtil.ipToLong(ip_address)); + updateTeacherStatus(records.get(0).getStr("person_id"), "01", operator, IpUtil.ipToLong(ip_address)); } /** diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java index 886f85e3..be5683ce 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java @@ -255,7 +255,7 @@ public class CommonUtil { public static String getSixRandom() { String sources = "0123456789"; Random rand = new Random(); - var flag = new StringBuffer(); + StringBuffer flag = new StringBuffer(); for (int j = 0; j < 6; j++) { flag.append(sources.charAt(rand.nextInt(9)) + ""); } diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Util/PoiUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/Util/PoiUtil.java index 620d70cd..fc24025a 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Util/PoiUtil.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Util/PoiUtil.java @@ -177,7 +177,7 @@ public class PoiUtil { } String cellValue = ""; switch (cell.getCellType()) { - case CellType.NUMERIC: // 数字 + case NUMERIC: // 数字 short format = cell.getCellStyle().getDataFormat(); if (DateUtil.isCellDateFormatted(cell)) { SimpleDateFormat sdf = null; @@ -210,19 +210,19 @@ public class PoiUtil { cellValue = bd.toPlainString();// 数值 这种用BigDecimal包装再获取plainString，可以防止获取到科学计数值 } break; - case CellType.STRING: // 字符串 + case STRING: // 字符串 cellValue = cell.getStringCellValue(); break; - case CellType.BOOLEAN: // Boolean + case BOOLEAN: // Boolean cellValue = cell.getBooleanCellValue() + ""; break; - case CellType.FORMULA: // 公式 + case FORMULA: // 公式 cellValue = cell.getCellFormula(); break; - case CellType.BLANK: // 空值 + case BLANK: // 空值 cellValue = ""; break; - case CellType.ERROR: // 故障 + case ERROR: // 故障 cellValue = "ERROR VALUE"; break; default: diff --git a/dsBase/src/main/resources/application_dev.yaml b/dsBase/src/main/resources/application_dev.yaml index 6e9f2829..9e7e39c1 100644 --- a/dsBase/src/main/resources/application_dev.yaml +++ b/dsBase/src/main/resources/application_dev.yaml @@ -1,9 +1,9 @@ # 数据库信息 postgresql: - driverClassName: org.postgresql.Driver - user: postgres - password: DsideaL147258369 - jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true + driverClassName: com.mysql.cj.jdbc.Driver + user: ylt + password: Ycharge666 + jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true # redis redis: diff --git a/dsBase/src/main/resources/application_pro.yaml b/dsBase/src/main/resources/application_pro.yaml index 6e9f2829..9e7e39c1 100644 --- a/dsBase/src/main/resources/application_pro.yaml +++ b/dsBase/src/main/resources/application_pro.yaml @@ -1,9 +1,9 @@ # 数据库信息 postgresql: - driverClassName: org.postgresql.Driver - user: postgres - password: DsideaL147258369 - jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true + driverClassName: com.mysql.cj.jdbc.Driver + user: ylt + password: Ycharge666 + jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true # redis redis: diff --git a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java index 28ee0f07..5a40e02e 100644 --- a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java +++ b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -187,7 +187,7 @@ public class RouterHandler extends Handler { return; } - Request request = buildFileUploadRequest(files.getFirst(), forwardUrl); + Request request = buildFileUploadRequest(files.get(0), forwardUrl); executeRequest(request, res); isHandled[0] = true; } catch (Exception e) { diff --git a/dsRes/pom.xml b/dsRes/pom.xml index 78046907..77ba3272 100644 --- a/dsRes/pom.xml +++ b/dsRes/pom.xml @@ -41,14 +41,14 @@ - com.zaxxer - HikariCP - ${HikariCP.version} + com.alibaba + druid + ${druid.version} - org.postgresql - postgresql - ${postgresql.version} + com.mysql + mysql-connector-j + ${mysql.version} @@ -220,8 +220,8 @@ maven-compiler-plugin ${maven-compiler-plugin.version} - 21 - 21 + 8 + 8 UTF-8 -parameters diff --git a/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java b/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java index 234bc369..16d10607 100644 --- a/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java +++ b/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java @@ -83,7 +83,7 @@ public class JApiDocsGenerator { Method[] methods = cls.getDeclaredMethods(); for (Method method : methods) { // 检查方法上是否有@Before注解 - var before = method.getAnnotation(Before.class); + Before before = method.getAnnotation(Before.class); if (before != null) { String httpType = getHttpType(before); res.put(cls.getSimpleName() + "." + method.getName(), httpType); diff --git a/dsUtils/pom.xml b/dsUtils/pom.xml index 77a8eac9..242eaa9c 100644 --- a/dsUtils/pom.xml +++ b/dsUtils/pom.xml @@ -10,11 +10,11 @@ dsProject 1.0 - + UTF-8 - 21 - 21 + 8 + 8 @@ -42,13 +42,11 @@ screw-core 1.0.5 - - org.postgresql - postgresql - ${postgresql.version} + com.mysql + mysql-connector-j + ${mysql.version} - cn.hutool @@ -146,12 +144,10 @@ freemarker 2.3.33 - - - com.zaxxer - HikariCP - ${HikariCP.version} + com.alibaba + druid + ${druid.version} \ No newline at end of file diff --git a/dsUtils/src/main/java/com/dsideal/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/GenerateCode.java index f22bcbe9..aa2b65dd 100644 --- a/dsUtils/src/main/java/com/dsideal/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/GenerateCode.java @@ -9,10 +9,7 @@ import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.hikaricp.HikariCpPlugin; import javax.sql.DataSource; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; +import java.io.*; import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.ResultSet; @@ -286,22 +283,26 @@ public class GenerateCode { // 设置字符编码 cfg.setDefaultEncoding("UTF-8"); - //1、生成Controller层代码 - // 加载模板 - Template template = cfg.getTemplate("Controller.ftl"); - // 渲染模板到文件 - Writer out = new FileWriter(codePath + "/" + tableName + "_Controller.txt", StandardCharsets.UTF_8); - template.process(dataModel, out); - out.close(); - System.out.println(dsKit.getCurrentTimeStr() + " 1、Controller层代码生成完毕。"); + // 1、生成Controller层代码 + try (Writer out = new OutputStreamWriter( + new FileOutputStream(codePath + "/" + tableName + "_Controller.txt"), + "UTF-8")) { // 显式指定编码 + Template template = cfg.getTemplate("Controller.ftl"); + template.process(dataModel, out); + System.out.println(dsKit.getCurrentTimeStr() + " 1、Controller层代码生成完毕。"); + } catch (Exception e) { + throw new RuntimeException("生成Controller层代码失败", e); + } - //2、生成Model层代码 - // 加载模板 - template = cfg.getTemplate("Model.ftl"); - // 渲染模板到文件 - out = new FileWriter(codePath + "/" + tableName + "_Model.txt", StandardCharsets.UTF_8); - template.process(dataModel, out); - out.close(); - System.out.println(dsKit.getCurrentTimeStr() + " 2、Model层代码生成完毕。"); + // 2、生成Model层代码 + try (Writer out = new OutputStreamWriter( + new FileOutputStream(codePath + "/" + tableName + "_Model.txt"), + "UTF-8")) { // 显式指定编码 + Template template = cfg.getTemplate("Model.ftl"); + template.process(dataModel, out); + System.out.println(dsKit.getCurrentTimeStr() + " 2、Model层代码生成完毕。"); + } catch (Exception e) { + throw new RuntimeException("生成Model层代码失败", e); + } } } diff --git a/pom.xml b/pom.xml index d50c6bd4..3776466e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,8 +32,8 @@ UTF-8 UTF-8 - 21 - 21 + 8 + 8 3.10.1 @@ -46,8 +46,8 @@ 2022.2 - 6.3.0 - 42.7.5 + 1.2.24 + 9.3.0 1.0.5