From f6b095c100387099453569b300dd66c48dd49eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 29 Dec 2023 08:31:10 +0800
Subject: [PATCH] 'commit'

---
 .../java/com/dsideal/Util/CommonUtil.java     |  6 +--
 pom.xml                                       |  1 +
 .../Base/Controller/BaseController.java       | 20 ++++----
 .../Collect/Controller/CollectController.java | 46 +++++++++----------
 .../Gtzz/Controller/GtzzController.java       |  2 +-
 .../Controller/LoginPersonController.java     |  2 +-
 .../Organization/Model/OrganizationModel.java |  4 +-
 .../Student/Controller/StudentController.java |  6 +--
 .../Teacher/Controller/TeacherController.java | 10 ++--
 .../QingLong/Util/RandomGeneratorUtil.java    |  2 +-
 10 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/dsssoserver/src/main/java/com/dsideal/Util/CommonUtil.java b/dsssoserver/src/main/java/com/dsideal/Util/CommonUtil.java
index 75db1ef5..302a8bee 100644
--- a/dsssoserver/src/main/java/com/dsideal/Util/CommonUtil.java
+++ b/dsssoserver/src/main/java/com/dsideal/Util/CommonUtil.java
@@ -328,21 +328,21 @@ public class CommonUtil {
      * @param message
      */
     public static Map returnMessageJson(boolean result, String message) {
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", result);
         map.put("message", message);
         return map;
     }
 
     public static Map returnMessageJson(boolean result, JSONObject jo) {
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", result);
         map.put("result", jo);
         return map;
     }
 
     public static Map returnMessageJson(boolean result, List<Record> list) {
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", result);
         map.put("result", list);
         return map;
diff --git a/pom.xml b/pom.xml
index c131a692..d4527e8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -400,6 +400,7 @@
                     <encoding>UTF-8</encoding>
                     <!-- java21 保留参数名编译参数 -->
                     <compilerArgument>-parameters</compilerArgument>
+                    <compilerArgument>-Xlint:unchecked</compilerArgument>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java b/src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java
index c389b70b..5899369a 100644
--- a/src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java
+++ b/src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java
@@ -476,18 +476,14 @@ public class BaseController extends Controller {
      */
     @Before({GET.class})
     public void getPersonInfo(String teacher_id) {
-        Record record = bm.getPersonInfo(teacher_id);
-        renderJson(record);
-    }
-    /**
-     * 功能：获取指定的人员信息
-     *
-     * @return
-     */
-    public void getPersonInfo() {
-        String personId = SessionKit.get(getRequest(), getResponse(), "person_id");
-        Record record = bm.getPersonInfo(personId);
-        renderJson(record);
+        if (StrKit.isBlank(teacher_id)) {
+            String personId = SessionKit.get(getRequest(), getResponse(), "person_id");
+            Record record = bm.getPersonInfo(personId);
+            renderJson(record);
+        } else {
+            Record record = bm.getPersonInfo(teacher_id);
+            renderJson(record);
+        }
     }
 
     /**
diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
index adfff1bd..074f992e 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -74,7 +74,7 @@ public class CollectController extends Controller {
         //判断文件大小大于20b则返回错误信息，并终止上传，删除上传文件
         long size = excelFile.getFile().length();
         if (size > 1024 * 1024 * 2) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "xlsx文件大小大于2MB,请检查是否正确!");
             renderJson(map);
@@ -117,7 +117,7 @@ public class CollectController extends Controller {
         }
         //通过后，记录新增加了一个任务模板文件，共N个模板，记录到数据库表中，然后提供给前台这些数据信息
         int job_id = cm.addExcelJob(publish_role_id, person_id, kvList, upload_excel_filename);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("job_id", job_id);
         map.put("success", true);
         map.put("message", "模板上传成功!");
@@ -222,7 +222,7 @@ public class CollectController extends Controller {
             idx++;
         }
         if (!StrKit.isBlank(errMsg)) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", errMsg);
             renderJson(map);
@@ -250,7 +250,7 @@ public class CollectController extends Controller {
             writeList.add(record);
         }
         cm.saveSheet(job_id, sheet_index, writeList, table_name);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         renderJson(map);
@@ -284,7 +284,7 @@ public class CollectController extends Controller {
         //检查是不是某张表中存在字段名称重复的情况
         for (int i = 0; i < listJobSheet.size(); i++) {
             if (cm.checkColumnNameDuplicate(job_id, i)) {
-                Map map = new HashMap();
+                Map<String,Object> map = new HashMap<>();
                 map.put("success", false);
                 map.put("message", "第" + (i + 1) + "个Sheet表中存在字段名称重复的情况，请检查后重新保存！");
                 renderJson(map);
@@ -393,7 +393,7 @@ public class CollectController extends Controller {
         cm.saveJob(job_id, job_name, upload_excel_filename_finish);
 
         //返回成功
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         renderJson(map);
@@ -411,7 +411,7 @@ public class CollectController extends Controller {
     @EmptyInterface({"job_name"})
     public void renameJob(int job_id, String job_name) {
         cm.renameJob(job_id, job_name);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         renderJson(map);
@@ -429,7 +429,7 @@ public class CollectController extends Controller {
         //已发布，并且有人填写的不能删除
         Record record = cm.getJob(job_id);
         if (record == null) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", true);
             map.put("message", "保存成功!");
             renderJson(map);
@@ -443,7 +443,7 @@ public class CollectController extends Controller {
                 if (r.getInt("is_finish") == 1) is_finish_count++;
             }
             if (is_finish_count > 0) {
-                Map map = new HashMap();
+                Map<String,Object> map = new HashMap<>();
                 map.put("success", false);
                 map.put("message", "任务已发布，并且存在填报记录，无法删除!");
                 renderJson(map);
@@ -451,7 +451,7 @@ public class CollectController extends Controller {
             }
         }
         cm.delJob(job_id);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         renderJson(map);
@@ -483,7 +483,7 @@ public class CollectController extends Controller {
         //判断文件大小大于20b则返回错误信息，并终止上传，删除上传文件
         long size = excelFile.getFile().length();
         if (size > 1024 * 1024 * 20) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "xlsx文件大小大于20MB,请检查是否正确!");
             renderJson(map);
@@ -707,7 +707,7 @@ public class CollectController extends Controller {
     public void publishJob(int job_id, String deadline_time, int shiZhiSchool,
                            int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds) throws ParseException {
         cm.publishJob(job_id, deadline_time, shiZhiSchool, shiZhiJiaoFu, quXiaoJiaoYuJu, bureauIds);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         renderJson(map);
@@ -737,7 +737,7 @@ public class CollectController extends Controller {
     @EmptyInterface({"deadline_time"})
     public void extensionJob(int job_id, String deadline_time) throws ParseException {
         cm.extensionJob(job_id, deadline_time);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         renderJson(map);
@@ -754,7 +754,7 @@ public class CollectController extends Controller {
     @IsNumericInterface({"job_id"})
     public void cloneJob(int job_id, String job_name) {
         cm.cloneJob(job_id, job_name);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         renderJson(map);
@@ -898,7 +898,7 @@ public class CollectController extends Controller {
         int publish_role_id = kvCheck.getInt("publish_role_id");
 
         if (cm.isTableExist(table_name)) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "表名" + table_name + "已存在，无法创建，请更换后再次提交！");
             renderJson(map);
@@ -906,7 +906,7 @@ public class CollectController extends Controller {
         }
         //检查字段名是否重复
         if (cm.checkColumnNameDuplicate(json)) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "表名" + table_name + "中存在重复列名或与保留字冲突，不能创建，请检查！");
             renderJson(map);
@@ -915,7 +915,7 @@ public class CollectController extends Controller {
 
         //通过检查
         int job_id = cm.addFormJob(person_id, publish_role_id, job_name, table_name, json);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         map.put("job_id", job_id);
@@ -947,14 +947,14 @@ public class CollectController extends Controller {
         String form_table_name = cm.getJob(job_id).getStr("form_table_name");
 
         if (!form_table_name.equals(table_name) && cm.isTableExist(table_name)) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "表名" + table_name + "已存在，无法创建，请更换后再次提交！");
             renderJson(map);
             return;
         }
         cm.updateFormJob(job_id, job_name, json, table_name);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         map.put("job_id", job_id);
@@ -980,7 +980,7 @@ public class CollectController extends Controller {
         Record rs = personModel.getLoginInfoByPersonId(person_id);
         String bureau_id = rs.get("bureau_id");
         cm.saveFormJob(bureau_id, person_id, table_name, json);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         map.put("job_id", job_id);
@@ -1026,7 +1026,7 @@ public class CollectController extends Controller {
         int publish_role_id = kvCheck.getInt("publish_role_id");
 
         int group_id = cm.addGroup(group_name, bureauIds, publish_role_id);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         map.put("group_id", group_id);
@@ -1046,7 +1046,7 @@ public class CollectController extends Controller {
     @EmptyInterface({"group_name", "bureauIds"})
     public void updateGroup(int group_id, String group_name, String bureauIds) {
         cm.updateGroup(group_id, group_name, bureauIds);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         map.put("group_id", group_id);
@@ -1085,7 +1085,7 @@ public class CollectController extends Controller {
     @IsNumericInterface({"group_id"})
     public void delGroup(int group_id) {
         cm.delGroup(group_id);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");
         map.put("group_id", group_id);
diff --git a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java
index 9fad6ccd..b224e942 100644
--- a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java
+++ b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java
@@ -688,7 +688,7 @@ public class GtzzController extends Controller {
         //判断文件大小大于20mb则返回错误信息，并终止上传，删除上传文件
         long size = picFile.getFile().length();
         if (size > 1024 * 1024 * 20) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "xls文件大小大于20MB,请检查是否正确!");
             renderJson(map);
diff --git a/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java b/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java
index 0c01dc50..b3c0db0d 100644
--- a/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java
+++ b/src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java
@@ -155,7 +155,7 @@ public class LoginPersonController extends Controller {
         RedisKit.Del(PassWordKey);
         RedisKit.Del(checkCodeKey);
         //防止用户攻击修改Cookie
-        Map _map = new HashMap<String, String>();
+        Map<String, Object> _map = new HashMap<>();
         _map.put("identity_id", loginMap.get("identity_id"));
         _map.put("person_id", loginMap.get("person_id"));
         _map.put("bureau_id", loginMap.get("bureau_id").toString().trim());
diff --git a/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java b/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java
index dabdd25e..179c07d1 100644
--- a/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java
+++ b/src/main/java/com/dsideal/QingLong/Organization/Model/OrganizationModel.java
@@ -40,7 +40,7 @@ public class OrganizationModel {
      */
     public Map getCityAreaMainSchoolByBureauId(String bureau_id) {
         try {
-            HashMap resMap = new HashMap();
+            HashMap<String,Object> resMap = new HashMap<>();
             String sql = Db.getSql("organization.getOrgInfoById");
             List<Record> list = Db.find(sql, bureau_id);
             if (list.size() > 0) {
@@ -68,7 +68,7 @@ public class OrganizationModel {
      */
     public Map<String, String> getAreaInfoById(String id) {
         String NullGuid = "00000000-0000-0000-0000-000000000000";
-        Map<String, String> map = new HashMap();
+        Map<String, String> map = new HashMap<>();
         String sql = Db.getSql("dm.getAreaById");
         List<Record> records = Db.find(sql, id);
         if (records.size() == 0) {
diff --git a/src/main/java/com/dsideal/QingLong/Student/Controller/StudentController.java b/src/main/java/com/dsideal/QingLong/Student/Controller/StudentController.java
index a35bff0a..890ba541 100644
--- a/src/main/java/com/dsideal/QingLong/Student/Controller/StudentController.java
+++ b/src/main/java/com/dsideal/QingLong/Student/Controller/StudentController.java
@@ -511,7 +511,7 @@ public class StudentController extends Controller {
         //判断文件大小大于20mb则返回错误信息，并终止上传，删除上传文件
         long size = picFile.getFile().length();
         if (size > 1024 * 1024 * 20) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "xls文件大小大于20MB,请检查!");
             renderJson(map);
@@ -547,7 +547,7 @@ public class StudentController extends Controller {
         int identity_id = Integer.parseInt(SessionKit.get(getRequest(), getResponse(),"identity_id"));
         if (identity_id == 1) {
             if (getPara("bureau_id") == null) {
-                Map map = new HashMap();
+                Map<String,Object> map = new HashMap<>();
                 map.put("success", false);
                 map.put("message", "超级管理员使用此接口，需要传入bureau_id参数，单位管理员不需要。");
                 renderJson(map);
@@ -585,7 +585,7 @@ public class StudentController extends Controller {
             String ip_address = IpUtil.getIpAddr(getRequest());
 
             jo = StudentImportExcelUtil.SaveBatch(batch_id, bureau_id, operator, ip_address);
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", true);
             map.put("message", "导入成功！");
             map.put("count", jo.getInteger("count"));
diff --git a/src/main/java/com/dsideal/QingLong/Teacher/Controller/TeacherController.java b/src/main/java/com/dsideal/QingLong/Teacher/Controller/TeacherController.java
index 81ec07eb..9a89a919 100644
--- a/src/main/java/com/dsideal/QingLong/Teacher/Controller/TeacherController.java
+++ b/src/main/java/com/dsideal/QingLong/Teacher/Controller/TeacherController.java
@@ -482,7 +482,7 @@ public class TeacherController extends Controller {
         //判断文件大小大于20mb则返回错误信息，并终止上传，删除上传文件
         long size = picFile.getFile().length();
         if (size > 1024 * 1024 * 20) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "xls文件大小大于20MB,请检查是否正确!");
             renderJson(map);
@@ -516,7 +516,7 @@ public class TeacherController extends Controller {
         //3、检查值域是不是正确
         jo = TeacherImportExcelUtil.IsHaveErrorData(templateXls);
         if (!jo.getBoolean("success")) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "文件存在值域不对情况，请下载模板后检查!");
             map.put("uuid", uuidString);
@@ -536,7 +536,7 @@ public class TeacherController extends Controller {
 
         if (identity_id == 1) {
             if (getPara("bureau_id") == null) {
-                Map map = new HashMap();
+                Map<String,Object> map = new HashMap<>();
                 map.put("success", false);
                 map.put("message", "超级管理员使用此接口，需要传入bureau_id参数，单位管理员不需要。");
                 renderJson(map);
@@ -549,7 +549,7 @@ public class TeacherController extends Controller {
         OrganizationModel model = new OrganizationModel();
         List<Record> records = model.getOrgInfoById(bureau_id);
         if (records == null || records.size() == 0) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("success", false);
             map.put("message", "传入的bureau_id有误，无法找到相关信息！");
             renderJson(map);
@@ -581,7 +581,7 @@ public class TeacherController extends Controller {
         String ip_address = IpUtil.getIpAddr(getRequest());
 
         jo = TeacherImportExcelUtil.SaveBatch(batch_id, bureau_id, operator, ip_address);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "导入成功！");
         map.put("count", jo.getInteger("count"));
diff --git a/src/main/java/com/dsideal/QingLong/Util/RandomGeneratorUtil.java b/src/main/java/com/dsideal/QingLong/Util/RandomGeneratorUtil.java
index 111ca82e..cdf0d9e4 100644
--- a/src/main/java/com/dsideal/QingLong/Util/RandomGeneratorUtil.java
+++ b/src/main/java/com/dsideal/QingLong/Util/RandomGeneratorUtil.java
@@ -94,7 +94,7 @@ public class RandomGeneratorUtil {
      * @return
      */
     public static Map getAddress() {
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("name", getChineseName());
         map.put("sex", name_sex);
         map.put("road", getRoad());