From c4b29f96dceb407a6efa07781b7ad0fcee3db3c9 Mon Sep 17 00:00:00 2001
From: linrf <linrf@qq.com>
Date: Fri, 14 Jul 2023 09:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=BC=8F=E7=BC=BA=E5=A4=B1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/docus/server/CodeGenerator.java          | 2 +-
 .../src/main/resources/mapper/TaskSystemParamsMapper.xml       | 3 ++-
 .../server/entity/scheduling.management/TaskSystemParams.java  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java b/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java
index 9578326..6fb9849 100644
--- a/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java
+++ b/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java
@@ -27,7 +27,7 @@ public class CodeGenerator {
         AutoGenerator defaultConfig = BaseCodeGenerator.getDefaultConfig();
         defaultConfig.getGlobalConfig().setSwagger2(true);
         defaultConfig.getStrategy().setEntityLombokModel(true);
-        defaultConfig.getStrategy().setInclude("task_collector", "task_collector_version", "task_collector_version_file", "task_collector_version_log", "task_operation_log", "task_system_params", "task_terminator", "task_terminator_collect", "task_terminator_collect_retry_log", "task_terminator_error_log", "task_terminator_virtual_log");//需要生成的表，可指定多个，留空为全部生成
+        defaultConfig.getStrategy().setInclude("task_system_params");//需要生成的表，可指定多个，留空为全部生成
         BaseCodeGenerator.generate(defaultConfig);
     }
 }
diff --git a/collector-scheduling-management/src/main/resources/mapper/TaskSystemParamsMapper.xml b/collector-scheduling-management/src/main/resources/mapper/TaskSystemParamsMapper.xml
index 40b3d08..708ba54 100644
--- a/collector-scheduling-management/src/main/resources/mapper/TaskSystemParamsMapper.xml
+++ b/collector-scheduling-management/src/main/resources/mapper/TaskSystemParamsMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap"
                type="com.docus.server.entity.scheduling.management.TaskSystemParams">
                     <id column="id" property="id"/>
+                    <result column="parent_id" property="parentId"/>
                     <result column="param_code" property="paramCode"/>
                     <result column="param_name" property="paramName"/>
                     <result column="param_info" property="paramInfo"/>
@@ -19,7 +20,7 @@
 
             <!-- 通用查询结果列 -->
             <sql id="Base_Column_List">
-                id, param_code, param_name, param_info, param_value, param_group, sort_no, need_encrypt, create_time, update_time
+                id, parentId, param_code, param_name, param_info, param_value, param_group, sort_no, need_encrypt, create_time, update_time
             </sql>
 
 </mapper>
diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskSystemParams.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskSystemParams.java
index f647e01..8ef9e3f 100644
--- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskSystemParams.java
+++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskSystemParams.java
@@ -32,7 +32,7 @@ public class TaskSystemParams implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "父主键")
-    @TableId(value = "parent_id", type = IdType.ASSIGN_UUID)
+    @TableField(value = "parent_id")
     private Long parentId;
 
     @ApiModelProperty(value = "系统参数编号")