'commit'

2 years ago · d5ad2d8ea1
parent 3ac4943fd2 2f8b1dab60
commit d5ad2d8ea1
6 changed files with 40 additions and 17 deletions
--- a/WebRoot/html/dangjian/view/exam.html
+++ b/WebRoot/html/dangjian/view/exam.html
@ -149,7 +149,7 @@

        <!-- 菜单容器 -->
        <aside class="mui-off-canvas-left">
-            <div class="mui-scroll-wrapper">
+            <div class="mui-scroll-wrapper" id="offCanvasSideScroll">
                <div class="mui-scroll">
                    <div class="mui-content">
                        <div class="mui-content-padded">
@ -370,6 +370,7 @@
            document.getElementById("closeMenu").addEventListener("tap", function () {
                offCanvasWrapper.offCanvas('close');
            });
+            mui('#offCanvasSideScroll').scroll();
            // 禁用手势侧滑
            var offCanvasInner = offCanvasWrapper[0].querySelector('.mui-inner-wrap');
            offCanvasInner.addEventListener('drag', function (event) {
--- a/WebRoot/html/dangjian/view/test.html
+++ b/WebRoot/html/dangjian/view/test.html
@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <style>
+    .scroll-container {
+      width: 100%;
+      height: 1300px;
+      overflow-y: scroll;
+      -webkit-overflow-scrolling: touch;
+    }
+  </style>
+</head>
+<body>
+  <div class="scroll-container">
+    <p>这里是一些文本内容，用于演示触摸滚动。</p>
+    <!-- 在这里添加更多内容，以便在容器中产生滚动效果 -->
+  </div>
+</body>
+</html>
--- a/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
+++ b/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
@ -183,25 +183,16 @@ public class OpenGaussReplicationToKafka {
    public static void main(String[] args) throws Exception {

        //初始化数据库链接
-
        Init();
-
-
        // 删除槽
-//        DeleteSlot(slotName);
-
+        // DeleteSlot(slotName);
        // 创建槽
-//        CreateSlot(slotName);
-
+        // CreateSlot(slotName);
        // 查看槽
-        //ListSlot();
-
-//       TruncateTable();
-
+        // ListSlot();
+        // TruncateTable();
        //插入测试数据
-
 //        InsertTestData();
-
        //获取最后的读取偏移位置

        String lsn = GetRestartLsn(slotName);
--- a/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
+++ b/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
@ -1,6 +1,5 @@
 package com.dsideal.FengHuang.Exam.Controller;

-import cn.hutool.core.lang.Validator;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.FengHuang.Exam.Model.ExamModel;
 import com.dsideal.FengHuang.Interceptor.EmptyInterface;
@ -11,7 +10,6 @@ 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.kit.PathKit;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
@ -24,6 +22,19 @@ public class ExamController extends Controller {
    //实例化model
    ExamModel em = new ExamModel();

+    /**
+     * 功能：清库
+     */
+    // http://10.10.21.20:9000/FengHuang/exam/ClearDataBase
+    public void ClearDataBase() {
+        //清库脚本
+        PgSqlUtil.Truncate("t_exam_person");
+        PgSqlUtil.Truncate("t_exam_record");
+        Kv kv = Kv.by("success", true);
+        kv.set("message", "清库成功！");
+        renderJson(kv);
+    }
+
    /**
     * 功能：增加考试人员
     *
--- a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
@ -1,6 +1,5 @@
 package com.dsideal.FengHuang.Exam.Model;

-import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.Kv;
--- a/target/classes/ExcelExportTemplate/excelTemp/0FA61AAF-59AA-45BE-BCA3-DA21992E0EBE.xlsx
+++ b/target/classes/ExcelExportTemplate/excelTemp/0FA61AAF-59AA-45BE-BCA3-DA21992E0EBE.xlsx