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

Doc/数据上报系统测试账号.txt

@@ -32,7 +32,21 @@ truncate table t_collect_job_sheet  restart identity;
 truncate table t_collect_job_sheet_col  restart identity;
 truncate table t_collect_mapping  restart identity;
 truncate table t_collect_job_bureau   restart identity;
-truncate table t_collect_group   restart identity;
+truncate table t_collect_group restart identity;
+
+-- 删除所有以ds_job开头的表
+DO $$
+DECLARE
+    rec record;
+BEGIN
+    FOR rec IN
+        SELECT table_name
+        FROM information_schema.tables
+        WHERE table_name LIKE 'ds_job%'
+    LOOP
+        EXECUTE 'DROP TABLE ' || rec.table_name || ' CASCADE';
+    END LOOP;
+END $$;
 
 # 处理序列
 -- 查看所有序列

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -38,7 +38,7 @@ public class CollectController extends Controller {
     CollectModel cm = new CollectModel();
 
     /********以下为EXCEL模板上传管理功能******************************************************
-    /**
+     /**
      * EXCEL原始模板上传
      */
     @Before({POST.class})
@@ -184,7 +184,8 @@ public class CollectController extends Controller {
             renderJson(kv);
             return;
         }
-        if (cm.isTableExist(table_name)) {
+        String old_table_name = cm.getSheet(job_id, sheet_index).getStr("table_name");
+        if (old_table_name != null && !old_table_name.equals(table_name) && cm.isTableExist(table_name)) {
             Kv kv = Kv.create();
             kv.set("success", false);
             kv.set("message", "表名" + table_name + "已存在，不能保存！");
@@ -646,6 +647,17 @@ public class CollectController extends Controller {
         renderJson(map);
     }
 
+    /**
+     * 功能：获取任务信息
+     * @param job_id
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    @IsNumericInterface({"job_id"})
+    public void getJob(int job_id) {
+        Record record = cm.getJob(job_id);
+        renderJson(record);
+    }
 
     /**
      * 功能：延期任务

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -311,13 +311,14 @@ public class CollectModel {
             String column_name = record.getStr("column_name").toLowerCase();
             int data_type_id = record.getInt("data_type_id");
             String column_type = getDataType(data_type_id, DataTypeConst.PG_DATA_TYPE);
-            colSql +="\""+ column_name + "\" " + column_type;
+            colSql += "\"" + column_name + "\" " + column_type;
             String original_name = record.getStr("original_name");
             if (record.getBoolean("allow_blank") == null || !record.getBoolean("allow_blank")) colSql += " NOT NULL ";
             colSql += ",";
             commentSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"" + column_name + "\" IS '" + original_name + "';\n";
         }
-        String finalSql = "CREATE TABLE \"public\".\"" + table_name + "\" (";
+        String finalSql = "DROP TABLE IF EXISTS " + table_name + ";";
+        finalSql += "CREATE TABLE \"public\".\"" + table_name + "\" (";
         finalSql += "\"id\" serial4,";
         finalSql += "\"bureau_id\" char(36) NOT NULL,";
         finalSql += "\"person_id\" char(36)  NOT NULL,";
@@ -359,10 +360,6 @@ public class CollectModel {
         }
         Db.batchSave("t_collect_mapping", writeList, 100);
 
-        //记录模板文件的头文件位置,开始行，结束行，开始列，结束列
-        sql = "delete from t_collect_job_sheet where upload_excel_filename=? and table_name=?";
-        Db.update(sql, upload_excel_filename, table_name);
-
         Kv kv = Kv.create();
         kv.set("success", true);
         kv.set("message", "表结构创建成功！");
@@ -621,6 +618,7 @@ public class CollectModel {
 
 
     //回写完成标记
+
     /**
      * @param job_id
      * @param bureau_id
@@ -1103,4 +1101,6 @@ public class CollectModel {
         List<Record> list = Db.find(sqlPara);
         return list;
     }
+
+
 }