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

src/main/java/UnitTest/TestPgRole.java

@@ -1,27 +1,66 @@
 package UnitTest;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
+import com.YunXiao.Util.SyncUtil;
+import com.dsideal.QingLong.Util.CommonUtil;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+
+import java.util.List;
+
 
 public class TestPgRole {
 
+    /**
+     * 功能：删除用户
+     *
+     * @param user_name
+     */
+    public static void delUser(String user_name) {
+        String sql = "DROP USER ?";
+        Db.update(sql, user_name);
+    }
+
+    /**
+     * 功能：创建用户
+     *
+     * @param user_name
+     * @param pwd
+     */
+    public static void createUser(String user_name, String pwd) {
+        String sql = "CREATE USER ? WITH PASSWORD ?";
+        Db.update(sql, user_name, pwd);
+    }
+
+    /**
+     * 功能：判断用户是否存在
+     *
+     * @param user_name
+     * @return
+     */
+    public static boolean isExistUser(String user_name) {
+        String sql = "SELECT * FROM pg_user WHERE usename = ?";
+        List<Record> list = Db.find(sql, user_name);
+        return !list.isEmpty();
+    }
+
     public static void main(String[] args) {
-        String url = "jdbc:postgresql://10.10.14.71:5432/szjz_db";
-        String user = "postgres";
-        String password = "DsideaL147258369";
-
-        try (Connection conn = DriverManager.getConnection(url, user, password);
-             Statement stmt = conn.createStatement()) {
-            // 创建新用户
-            stmt.executeUpdate("CREATE USER newuser WITH PASSWORD 'password';");
-            // 创建角色并授予权限
-            stmt.executeUpdate("CREATE ROLE read_only;");
-            stmt.executeUpdate("GRANT USAGE, SELECT ON ALL TABLES IN SCHEMA public TO read_only;");
-            // 将角色授予用户
-            stmt.executeUpdate("GRANT read_only TO newuser;");
-        } catch (Exception e) {
-            e.printStackTrace();
+        //初始化
+        SyncUtil.init();
+
+        //综合素质评价系统  数据库访问用户名：zhszpj,密码：随机生成,  表名前缀(建议，非强制要求)：zhszpj
+        String user_name = "zhszpj";
+        String pwd = CommonUtil.getSixRandom();
+
+        if (isExistUser(user_name)) {
+            System.out.println("用户名" + user_name + "已存在，将删除！");
+            delUser(user_name);
+            System.out.println("用户名" + user_name + "已成功删除！");
         }
+
+        createUser(user_name, pwd);
+        System.out.println("用户名" + user_name + "已创建，密码为：" + pwd);
+
+        //PG数据库权限概念： 角色，用户，权限
+
     }
-}
+}

src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java

@@ -514,12 +514,13 @@ public class BaseController extends Controller {
         String bureau_id = bm.getPersonInfo(person_id).getStr("bureau_id");
         //当前学期
         Record record = bm.getCurrentTerm();
-        int term_id = record.getInt("term_id");
+        int term_id = record.getInt("xq_id");
         //保存
         bm.writeDaKa(term_id, bureau_id, signature);
         Kv kv = Kv.create();
         kv.set("success", true);
         kv.set("message", "保存成功！");
+        renderJson(kv);
     }
 
     /**

src/main/java/com/dsideal/QingLong/Base/Model/BaseModel.java

@@ -192,7 +192,7 @@ public class BaseModel {
      */
     public Record getCurrentTerm() {
         String sql = Db.getSql("Base.getCurrentTerm");
-        return Db.find(sql).get(0);
+        return Db.find(sql).getFirst();
     }
 
     /**
@@ -586,7 +586,7 @@ public class BaseModel {
         List<Record> termList = getTermList(100);
         Map<Integer, String> _map = new HashMap<>();
         for (Record record : termList) {
-            _map.put(record.getInt("term_id"), record.getStr("term_name"));
+            _map.put(record.getInt("xq_id"), record.getStr("xqmc"));
         }
         for (Record record : res.getList()) {
             record.set("term_name", _map.get(record.getInt("term_id")));

src/main/resource/Sql/base.sql

@@ -88,8 +88,8 @@
 
   -- 获取当前学期
   #sql("getCurrentTerm")
-      select xq_id,(case xq_code when '09' then xn else xn+1 end) as xn,xq,
-      xqmc,ksrq,jsrq,memo,xq_code,is_current from t_base_term where is_current=1
+      select xq_id,xq,
+      xqmc,ksrq,jsrq from t_base_term where ksrq<=now() and jsrq>=now()
   #end
     -- 按年份获取学期列表
   #sql("getTermListByYear")