update job info; add replace param, partition_info, jvm param

app/models/job_info.py

@@ -41,5 +41,11 @@ class JobInfo(BaseModel):
     inc_start_time = Column(Integer)
     # 最近一次执行状态
     last_handle_code = Column(Integer)
-    # 数据状态
+    # 数据状态 0-删除 1-正常
     delete_status = Column(Integer, nullable=False)
+    # 增量时间
+    replace_param = Column(String)
+    # 分区信息
+    partition_info = Column(String)
+    # jvm参数
+    jvm_param = Column(String)

app/schemas/job_info.py

@@ -23,6 +23,12 @@ class JobInfoBase(BaseModel):
     inc_start_time: Optional[int]
     # datax运行脚本
     job_json: str
+     # 增量时间
+    replace_param = Optional[str]
+    # 分区信息
+    partition_info = Optional[str]
+    # jvm参数
+    jvm_param = Optional[str]
 
 
 
@@ -39,7 +45,10 @@ class JobInfoCreate(JobInfoBase):
                 "executor_timeout": 60,
                 "executor_fail_retry_count": 2,
                 "inc_start_time": 0,
-                "job_json": ""
+                "job_json": "",
+                "replace_param": "-DlastTime='%s' -DcurrentTime='%s'",
+                "partition_info": "txn_date,0,yyyy-MM-dd",
+                "jvm_param": "",
             }
         }
 
@@ -60,6 +69,9 @@ class JobInfoUpdate(JobInfoBase):
                 "inc_start_time": 0,
                 "job_json": "",
                 "trigger_status": 1,
+                "replace_param": "-DlastTime='%s' -DcurrentTime='%s'",
+                "partition_info": "txn_date,0,yyyy-MM-dd",
+                "jvm_param": "",
             }
         }
 

data/data.sql

@@ -68,6 +68,14 @@ ALTER TABLE `job_info`
 ADD COLUMN `delete_status` tinyint(4) NOT NULL COMMENT '数据状态：0-无效，1-有效' AFTER `last_handle_code`;
 
 
+
+
+ALTER TABLE `job_info`
+ADD COLUMN `replace_param` varchar(100) NULL COMMENT '增量时间' AFTER `delete_status`,
+ADD COLUMN `partition_info` varchar(100) NULL COMMENT '分区信息' AFTER `replace_param`,
+ADD COLUMN `jvm_param` varchar(100) NULL COMMENT 'jvm参数' AFTER `partition_info`;
+
+
 -- ----------------------------
 -- Table structure for job_log
 -- ----------------------------
@@ -92,4 +100,4 @@ CREATE TABLE `job_log` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `I_trigger_time` (`trigger_time`) USING BTREE,
   KEY `I_handle_code` (`handle_code`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1581 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=1581 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;

production.ini

@@ -1,12 +1,12 @@
-[DATABASE]
-user = root
-pwd = happylay
-db_name = datax_web_dev
-host = 192.168.199.107
-port = 10086
 ; [DATABASE]
-; user = aihubtest
-; pwd = q9WBYDynEy@jh#5N
-; db_name = aihubtest_dag_admin_db
-; host = 10.254.12.7
-; port = 3306
+; user = root
+; pwd = happylay
+; db_name = datax_web_dev
+; host = 192.168.199.107
+; port = 10086
+[DATABASE]
+user = aihubtest
+pwd = q9WBYDynEy@jh#5N
+db_name = aihubtest_dag_admin_db
+host = 10.254.12.7
+port = 3306