diff --git a/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskBiz.java b/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskBiz.java
index 80ddd06..6aee863 100644
--- a/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskBiz.java
+++ b/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskBiz.java
@@ -1,109 +1,42 @@
package com.galaxis.rcs.common.entity;
-import com.yvan.logisticsMonitor.task.BizTask;
import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
/**
- * RcsTaskBiz 类用于定义业务任务的实体
- */
-
-/**
- * TODO: 插入 rcs_task_biz 表, 结构为
- * biz_task_id bigint not null,
- * force_assign_executor_id varchar(50) not null,
- * force_assign_executor_type varchar(50) not null,
- * task_type varchar(10)
- * lpn varchar(50)
- * priority integer
- * task_from varchar(100)
- * task_to varchar(100)
- * allocated_executor_id varchar(50) default 'N/A'
- * biz_task_status varchar(10) default 'pending'
- * create_at timestamp
- * create_by varchar(50)
- * update_at timestamp
- * update_by varchar(50)
- *
- * create table rcs_task_biz (
- * biz_task_id bigint not null auto_increment,
- * force_assign_executor_id varchar(50) not null comment '用户强制指派了车号' default 'N/A',
- * force_assign_executor_type varchar(50) not null comment '用户强制指派了车型' default 'N/A',
- * task_type varchar(10) not null comment '任务类型' default 'carry',
- * lpn varchar(50) not null comment '托盘ID',
- * priority integer not null comment '任务优先级',
- * task_from varchar(50) not null comment '任务起始点',
- * task_to varchar(50) not null comment '任务目标点',
- * allocated_executor_id varchar(50) default 'N/A' comment '系统分配的执行器ID',
- * biz_task_status varchar(10) default 'pending' comment '任务状态',
- * create_at datetime not null comment '创建时间',
- * create_by varchar(50) not null comment '创建人',
- * update_at datetime not null comment '更新时间',
- * update_by varchar(50) not null comment '更新人',
- *
- * primary key (biz_task_id)
- * }
+ * (rcs_task_biz)
*/
@Data
-public class RcsTaskBiz implements BizTask {
- /**
- * 业务任务ID
- */
- public long bizTaskId;
-
- /**
- * 强制分配的执行器ID
- */
- public String forceAssignExecutorId = "N/A"; // 默认值为 'N/A'
- /**
- * 强制分配的执行器类型
- */
- public String forceAssignExecutorType = "N/A"; // 默认值为 'N/A'
- /**
- * 任务类型
- */
- public String taskType;
- /**
- * 托盘ID
- */
- public String lpn;
- /**
- * 任务优先级
- */
- public int priority;
- /**
- * 任务起始点
- */
- public String taskFrom;
- /**
- * 任务目标点
- */
- public String taskTo;
- /**
- * 分配的执行器ID
- */
- public String allocatedExecutorId = "N/A"; // 默认值为 'N/A'
- /**
- * 业务任务状态
- */
- public String bizTaskStatus = "pending"; // 默认状态为 'pending'
- /**
- * 创建时间
- */
- public String createAt;
- /**
- * 创建人
- */
- public String createBy;
- /**
- * 更新时间
- */
- public String updateAt;
- /**
- * 更新人
- */
- public String updateBy;
- /**
- * 业务任务描述
- */
- public String description; // 可选字段，用于描述任务的详细信息
+public class RcsTaskBiz implements Serializable {
+ /** */
+ private Long bizTaskId;
+ /** 任务类型 */
+ private String bizType;
+ /** 托盘ID */
+ private String lpn;
+ /** 任务优先级 */
+ private Integer priority;
+ /** 任务起始点 */
+ private String taskFrom;
+ /** 任务目标点 */
+ private String taskTo;
+ /** 系统分配的执行器ID */
+ private String allocatedExecutorId;
+ /** 任务负载信息 */
+ private String bizTaskPayload;
+ /** 异常提示信息 */
+ private String bizTaskErrorInfo;
+ /** 任务描述 */
+ private String bizTaskDescription;
+ /** 任务状态 */
+ private String bizTaskStatus;
+ /** 创建时间 */
+ private Date createAt;
+ /** 创建人 */
+ private String createBy;
+ /** 更新时间 */
+ private Date updateAt;
+ /** 更新人 */
+ private String updateBy;
}
diff --git a/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskDevice.java b/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskDevice.java
new file mode 100644
index 0000000..3746ca5
--- /dev/null
+++ b/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskDevice.java
@@ -0,0 +1,46 @@
+package com.galaxis.rcs.common.entity;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (rcs_task_device)
+ */
+@Data
+public class RcsTaskDevice implements Serializable {
+ /** 设备任务ID */
+ private Long deviceTaskId;
+ /** 规划ID */
+ private Long planTaskId;
+ /** 业务任务ID */
+ private Long bizTaskId;
+ /** 设备类型 */
+ private String deviceType;
+ /** 执行器ID */
+ private String deviceItemId;
+ /** 执行序号 */
+ private Integer seq;
+ /** 报文类型 */
+ private String packetType;
+ /** 报文目标点 */
+ private String packetEndPoint;
+ /** 报文内容 */
+ private String packetPayload;
+ /** 任务负载信息 */
+ private String deviceTaskPayload;
+ /** 执行状态 */
+ private String deviceTaskStatus;
+ /** 异常提示信息 */
+ private String deviceTaskErrorInfo;
+ /** 任务描述 */
+ private String deviceTaskDescription;
+ /** 创建时间 */
+ private Date createAt;
+ /** 创建人 */
+ private String createBy;
+ /** 更新时间 */
+ private Date updateAt;
+ /** 更新人 */
+ private String updateBy;
+}
diff --git a/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskPlan.java b/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskPlan.java
index a26f506..e4fd18a 100644
--- a/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskPlan.java
+++ b/servo/src/main/java/com/galaxis/rcs/common/entity/RcsTaskPlan.java
@@ -1,24 +1,38 @@
package com.galaxis.rcs.common.entity;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
/**
- * 任务规划
+ * (rcs_task_plan)
*/
-public class RcsTaskPlan {
- /**
- * 表名: rcs_task_plan
- * 表结构为
- * plan_task_id bigint not null auto_increment primary key,
- * biz_task_id bigint not null,
- * type varchar(50) not null,
- * executor_id varchar(50) not null,
- * seq integer not null,
- * payload varchar(3000) not null,
- * plan_task_status varchar(10) default 'waiting',
- * error_message varchar(500) default '',
- * description varchar(500) default '',
- * create_at timestamp
- * create_by varchar(50)
- * update_at timestamp
- * update_by varchar(50)
- */
+@Data
+public class RcsTaskPlan implements Serializable {
+ /** 规划ID */
+ private Long planTaskId;
+ /** 业务任务ID */
+ private Long bizTaskId;
+ /** 规划类型 */
+ private String planType;
+ /** 执行器ID */
+ private String executorId;
+ /** 规划序号 */
+ private Integer seq;
+ /** 任务负载信息 */
+ private String planTaskPayload;
+ /** 规划状态 */
+ private String planTaskStatus;
+ /** 异常提示信息 */
+ private String planTaskErrorInfo;
+ /** 任务描述 */
+ private String planTaskDescription;
+ /** 创建时间 */
+ private Date createAt;
+ /** 创建人 */
+ private String createBy;
+ /** 更新时间 */
+ private Date updateAt;
+ /** 更新人 */
+ private String updateBy;
}
diff --git a/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskBiz.java b/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskBiz.java
new file mode 100644
index 0000000..7665b9b
--- /dev/null
+++ b/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskBiz.java
@@ -0,0 +1,92 @@
+package com.galaxis.rcs.common.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.core.types.*;
+import com.querydsl.sql.*;
+import java.sql.Types;
+import com.galaxis.rcs.common.entity.RcsTaskBiz;
+import java.util.Date;
+
+/**
+ * (rcs_task_biz)
+ */
+@SuppressWarnings("ALL")
+public class QRcsTaskBiz extends RelationalPathBase {
+ /** rcs_task_biz表 */
+ public static final QRcsTaskBiz rcsTaskBiz = new QRcsTaskBiz("rcs_task_biz");
+
+ /** */
+ public final NumberPath bizTaskId = createNumber("bizTaskId", Long.class);
+ /** 任务类型 */
+ public final StringPath bizType = createString("bizType");
+ /** 托盘ID */
+ public final StringPath lpn = createString("lpn");
+ /** 任务优先级 */
+ public final NumberPath priority = createNumber("priority", Integer.class);
+ /** 任务起始点 */
+ public final StringPath taskFrom = createString("taskFrom");
+ /** 任务目标点 */
+ public final StringPath taskTo = createString("taskTo");
+ /** 系统分配的执行器ID */
+ public final StringPath allocatedExecutorId = createString("allocatedExecutorId");
+ /** 任务负载信息 */
+ public final StringPath bizTaskPayload = createString("bizTaskPayload");
+ /** 异常提示信息 */
+ public final StringPath bizTaskErrorInfo = createString("bizTaskErrorInfo");
+ /** 任务描述 */
+ public final StringPath bizTaskDescription = createString("bizTaskDescription");
+ /** 任务状态 */
+ public final StringPath bizTaskStatus = createString("bizTaskStatus");
+ /** 创建时间 */
+ public final DateTimePath createAt = createDateTime("createAt", Date.class);
+ /** 创建人 */
+ public final StringPath createBy = createString("createBy");
+ /** 更新时间 */
+ public final DateTimePath updateAt = createDateTime("updateAt", Date.class);
+ /** 更新人 */
+ public final StringPath updateBy = createString("updateBy");
+
+ public QRcsTaskBiz(String variable) {
+ super(RcsTaskBiz.class, forVariable(variable), "rcs2_tw_zhanghui", "rcs_task_biz");
+ addMetadata();
+ }
+
+ public QRcsTaskBiz(String variable, String schema, String table) {
+ super(RcsTaskBiz.class, forVariable(variable), schema, table);
+ addMetadata();
+ }
+
+ public QRcsTaskBiz(String variable, String schema) {
+ super(RcsTaskBiz.class, forVariable(variable), schema, "rcs_task_biz");
+ addMetadata();
+ }
+
+ public QRcsTaskBiz(Path path) {
+ super(path.getType(), path.getMetadata(), "rcs2_tw_zhanghui", "rcs_task_biz");
+ addMetadata();
+ }
+
+ public QRcsTaskBiz(PathMetadata metadata) {
+ super(RcsTaskBiz.class, metadata, "rcs2_tw_zhanghui", "rcs_task_biz");
+ addMetadata();
+ }
+
+ private void addMetadata() {
+ addMetadata(bizTaskId, ColumnMetadata.named("biz_task_id").withIndex(1).ofType(Types.BIGINT).withSize(19));
+ addMetadata(bizType, ColumnMetadata.named("biz_type").withIndex(2).ofType(Types.VARCHAR).withSize(10));
+ addMetadata(lpn, ColumnMetadata.named("lpn").withIndex(3).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(priority, ColumnMetadata.named("priority").withIndex(4).ofType(Types.INTEGER).withSize(10));
+ addMetadata(taskFrom, ColumnMetadata.named("task_from").withIndex(5).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(taskTo, ColumnMetadata.named("task_to").withIndex(6).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(allocatedExecutorId, ColumnMetadata.named("allocated_executor_id").withIndex(7).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(bizTaskPayload, ColumnMetadata.named("biz_task_payload").withIndex(8).ofType(Types.VARCHAR).withSize(3000));
+ addMetadata(bizTaskErrorInfo, ColumnMetadata.named("biz_task_error_info").withIndex(9).ofType(Types.VARCHAR).withSize(500));
+ addMetadata(bizTaskDescription, ColumnMetadata.named("biz_task_description").withIndex(10).ofType(Types.VARCHAR).withSize(500));
+ addMetadata(bizTaskStatus, ColumnMetadata.named("biz_task_status").withIndex(11).ofType(Types.VARCHAR).withSize(10));
+ addMetadata(createAt, ColumnMetadata.named("create_at").withIndex(12).ofType(Types.TIMESTAMP));
+ addMetadata(createBy, ColumnMetadata.named("create_by").withIndex(13).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(updateAt, ColumnMetadata.named("update_at").withIndex(14).ofType(Types.TIMESTAMP));
+ addMetadata(updateBy, ColumnMetadata.named("update_by").withIndex(15).ofType(Types.VARCHAR).withSize(50));
+ }
+}
diff --git a/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskDevice.java b/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskDevice.java
new file mode 100644
index 0000000..29360a0
--- /dev/null
+++ b/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskDevice.java
@@ -0,0 +1,98 @@
+package com.galaxis.rcs.common.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.core.types.*;
+import com.querydsl.sql.*;
+import java.sql.Types;
+import com.galaxis.rcs.common.entity.RcsTaskDevice;
+import java.util.Date;
+
+/**
+ * (rcs_task_device)
+ */
+@SuppressWarnings("ALL")
+public class QRcsTaskDevice extends RelationalPathBase {
+ /** rcs_task_device表 */
+ public static final QRcsTaskDevice rcsTaskDevice = new QRcsTaskDevice("rcs_task_device");
+
+ /** 设备任务ID */
+ public final NumberPath deviceTaskId = createNumber("deviceTaskId", Long.class);
+ /** 规划ID */
+ public final NumberPath planTaskId = createNumber("planTaskId", Long.class);
+ /** 业务任务ID */
+ public final NumberPath bizTaskId = createNumber("bizTaskId", Long.class);
+ /** 设备类型 */
+ public final StringPath deviceType = createString("deviceType");
+ /** 执行器ID */
+ public final StringPath deviceItemId = createString("deviceItemId");
+ /** 执行序号 */
+ public final NumberPath seq = createNumber("seq", Integer.class);
+ /** 报文类型 */
+ public final StringPath packetType = createString("packetType");
+ /** 报文目标点 */
+ public final StringPath packetEndPoint = createString("packetEndPoint");
+ /** 报文内容 */
+ public final StringPath packetPayload = createString("packetPayload");
+ /** 任务负载信息 */
+ public final StringPath deviceTaskPayload = createString("deviceTaskPayload");
+ /** 执行状态 */
+ public final StringPath deviceTaskStatus = createString("deviceTaskStatus");
+ /** 异常提示信息 */
+ public final StringPath deviceTaskErrorInfo = createString("deviceTaskErrorInfo");
+ /** 任务描述 */
+ public final StringPath deviceTaskDescription = createString("deviceTaskDescription");
+ /** 创建时间 */
+ public final DateTimePath createAt = createDateTime("createAt", Date.class);
+ /** 创建人 */
+ public final StringPath createBy = createString("createBy");
+ /** 更新时间 */
+ public final DateTimePath updateAt = createDateTime("updateAt", Date.class);
+ /** 更新人 */
+ public final StringPath updateBy = createString("updateBy");
+
+ public QRcsTaskDevice(String variable) {
+ super(RcsTaskDevice.class, forVariable(variable), "rcs2_tw_zhanghui", "rcs_task_device");
+ addMetadata();
+ }
+
+ public QRcsTaskDevice(String variable, String schema, String table) {
+ super(RcsTaskDevice.class, forVariable(variable), schema, table);
+ addMetadata();
+ }
+
+ public QRcsTaskDevice(String variable, String schema) {
+ super(RcsTaskDevice.class, forVariable(variable), schema, "rcs_task_device");
+ addMetadata();
+ }
+
+ public QRcsTaskDevice(Path path) {
+ super(path.getType(), path.getMetadata(), "rcs2_tw_zhanghui", "rcs_task_device");
+ addMetadata();
+ }
+
+ public QRcsTaskDevice(PathMetadata metadata) {
+ super(RcsTaskDevice.class, metadata, "rcs2_tw_zhanghui", "rcs_task_device");
+ addMetadata();
+ }
+
+ private void addMetadata() {
+ addMetadata(deviceTaskId, ColumnMetadata.named("device_task_id").withIndex(1).ofType(Types.BIGINT).withSize(19));
+ addMetadata(planTaskId, ColumnMetadata.named("plan_task_id").withIndex(2).ofType(Types.BIGINT).withSize(19));
+ addMetadata(bizTaskId, ColumnMetadata.named("biz_task_id").withIndex(3).ofType(Types.BIGINT).withSize(19));
+ addMetadata(deviceType, ColumnMetadata.named("device_type").withIndex(4).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(deviceItemId, ColumnMetadata.named("device_item_id").withIndex(5).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(seq, ColumnMetadata.named("seq").withIndex(6).ofType(Types.INTEGER).withSize(10));
+ addMetadata(packetType, ColumnMetadata.named("packet_type").withIndex(7).ofType(Types.VARCHAR).withSize(10));
+ addMetadata(packetEndPoint, ColumnMetadata.named("packet_end_point").withIndex(8).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(packetPayload, ColumnMetadata.named("packet_payload").withIndex(9).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(deviceTaskPayload, ColumnMetadata.named("device_task_payload").withIndex(10).ofType(Types.VARCHAR).withSize(3000));
+ addMetadata(deviceTaskStatus, ColumnMetadata.named("device_task_status").withIndex(11).ofType(Types.VARCHAR).withSize(10));
+ addMetadata(deviceTaskErrorInfo, ColumnMetadata.named("device_task_error_info").withIndex(12).ofType(Types.VARCHAR).withSize(500));
+ addMetadata(deviceTaskDescription, ColumnMetadata.named("device_task_description").withIndex(13).ofType(Types.VARCHAR).withSize(500));
+ addMetadata(createAt, ColumnMetadata.named("create_at").withIndex(14).ofType(Types.TIMESTAMP));
+ addMetadata(createBy, ColumnMetadata.named("create_by").withIndex(15).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(updateAt, ColumnMetadata.named("update_at").withIndex(16).ofType(Types.TIMESTAMP));
+ addMetadata(updateBy, ColumnMetadata.named("update_by").withIndex(17).ofType(Types.VARCHAR).withSize(50));
+ }
+}
diff --git a/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskPlan.java b/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskPlan.java
new file mode 100644
index 0000000..19167b1
--- /dev/null
+++ b/servo/src/main/java/com/galaxis/rcs/common/query/QRcsTaskPlan.java
@@ -0,0 +1,86 @@
+package com.galaxis.rcs.common.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.core.types.*;
+import com.querydsl.sql.*;
+import java.sql.Types;
+import com.galaxis.rcs.common.entity.RcsTaskPlan;
+import java.util.Date;
+
+/**
+ * (rcs_task_plan)
+ */
+@SuppressWarnings("ALL")
+public class QRcsTaskPlan extends RelationalPathBase {
+ /** rcs_task_plan表 */
+ public static final QRcsTaskPlan rcsTaskPlan = new QRcsTaskPlan("rcs_task_plan");
+
+ /** 规划ID */
+ public final NumberPath planTaskId = createNumber("planTaskId", Long.class);
+ /** 业务任务ID */
+ public final NumberPath bizTaskId = createNumber("bizTaskId", Long.class);
+ /** 规划类型 */
+ public final StringPath planType = createString("planType");
+ /** 执行器ID */
+ public final StringPath executorId = createString("executorId");
+ /** 规划序号 */
+ public final NumberPath seq = createNumber("seq", Integer.class);
+ /** 任务负载信息 */
+ public final StringPath planTaskPayload = createString("planTaskPayload");
+ /** 规划状态 */
+ public final StringPath planTaskStatus = createString("planTaskStatus");
+ /** 异常提示信息 */
+ public final StringPath planTaskErrorInfo = createString("planTaskErrorInfo");
+ /** 任务描述 */
+ public final StringPath planTaskDescription = createString("planTaskDescription");
+ /** 创建时间 */
+ public final DateTimePath createAt = createDateTime("createAt", Date.class);
+ /** 创建人 */
+ public final StringPath createBy = createString("createBy");
+ /** 更新时间 */
+ public final DateTimePath updateAt = createDateTime("updateAt", Date.class);
+ /** 更新人 */
+ public final StringPath updateBy = createString("updateBy");
+
+ public QRcsTaskPlan(String variable) {
+ super(RcsTaskPlan.class, forVariable(variable), "rcs2_tw_zhanghui", "rcs_task_plan");
+ addMetadata();
+ }
+
+ public QRcsTaskPlan(String variable, String schema, String table) {
+ super(RcsTaskPlan.class, forVariable(variable), schema, table);
+ addMetadata();
+ }
+
+ public QRcsTaskPlan(String variable, String schema) {
+ super(RcsTaskPlan.class, forVariable(variable), schema, "rcs_task_plan");
+ addMetadata();
+ }
+
+ public QRcsTaskPlan(Path path) {
+ super(path.getType(), path.getMetadata(), "rcs2_tw_zhanghui", "rcs_task_plan");
+ addMetadata();
+ }
+
+ public QRcsTaskPlan(PathMetadata metadata) {
+ super(RcsTaskPlan.class, metadata, "rcs2_tw_zhanghui", "rcs_task_plan");
+ addMetadata();
+ }
+
+ private void addMetadata() {
+ addMetadata(planTaskId, ColumnMetadata.named("plan_task_id").withIndex(1).ofType(Types.BIGINT).withSize(19));
+ addMetadata(bizTaskId, ColumnMetadata.named("biz_task_id").withIndex(2).ofType(Types.BIGINT).withSize(19));
+ addMetadata(planType, ColumnMetadata.named("plan_type").withIndex(3).ofType(Types.VARCHAR).withSize(10));
+ addMetadata(executorId, ColumnMetadata.named("executor_id").withIndex(4).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(seq, ColumnMetadata.named("seq").withIndex(5).ofType(Types.INTEGER).withSize(10));
+ addMetadata(planTaskPayload, ColumnMetadata.named("plan_task_payload").withIndex(6).ofType(Types.VARCHAR).withSize(3000));
+ addMetadata(planTaskStatus, ColumnMetadata.named("plan_task_status").withIndex(7).ofType(Types.VARCHAR).withSize(10));
+ addMetadata(planTaskErrorInfo, ColumnMetadata.named("plan_task_error_info").withIndex(8).ofType(Types.VARCHAR).withSize(500));
+ addMetadata(planTaskDescription, ColumnMetadata.named("plan_task_description").withIndex(9).ofType(Types.VARCHAR).withSize(500));
+ addMetadata(createAt, ColumnMetadata.named("create_at").withIndex(10).ofType(Types.TIMESTAMP));
+ addMetadata(createBy, ColumnMetadata.named("create_by").withIndex(11).ofType(Types.VARCHAR).withSize(50));
+ addMetadata(updateAt, ColumnMetadata.named("update_at").withIndex(12).ofType(Types.TIMESTAMP));
+ addMetadata(updateBy, ColumnMetadata.named("update_by").withIndex(13).ofType(Types.VARCHAR).withSize(50));
+ }
+}
diff --git a/servo/src/main/java/com/galaxis/rcs/task/TaskService.java b/servo/src/main/java/com/galaxis/rcs/task/TaskService.java
index 04ef39b..f686198 100644
--- a/servo/src/main/java/com/galaxis/rcs/task/TaskService.java
+++ b/servo/src/main/java/com/galaxis/rcs/task/TaskService.java
@@ -46,7 +46,7 @@ public class TaskService {
* update_by varchar(50)
*
* create table rcs_task_biz (
- * biz_task_id bigint not null auto_increment,
+ * biz_task_id bigint not null,
* task_executor_id varchar(50) not null comment '任务执行器ID' default 'N/A',
* task_type varchar(10) not null comment '任务类型' default 'carry',
* lpn varchar(50) not null comment '托盘ID',
diff --git a/servo/src/test/java/com/yvan/workbench/CodegenTest.java b/servo/src/test/java/com/yvan/workbench/CodegenTest.java
index 4e025f4..e02593b 100644
--- a/servo/src/test/java/com/yvan/workbench/CodegenTest.java
+++ b/servo/src/test/java/com/yvan/workbench/CodegenTest.java
@@ -14,8 +14,10 @@ public class CodegenTest {
public void t01() {
Jdbc jdbc = BaseTest.newMysql();
CodegenCodeConfig config = new CodegenCodeConfig()
- .setOutDir(new File("./src/main/java/com/yvan/workbench/model").getAbsolutePath())
- .setPackageName("com.yvan.workbench.model")
+// .setOutDir(new File("./src/main/java/com/yvan/workbench/model").getAbsolutePath())
+// .setPackageName("com.yvan.workbench.model")
+ .setOutDir(new File("./src/main/java/com/galaxis/rcs/common").getAbsolutePath())
+ .setPackageName("com.galaxis.rcs.common")
// .removeCodegenType(CodegenType.JAVA_ENTITY)
// .removeCodegenType(CodegenType.JAVA_QUERYDSL)
// .addCodegenType(CodegenType.GROOVY_ENTITY)
@@ -23,7 +25,10 @@ public class CodegenTest {
// .addCodegenType(CodegenType.KOTLIN_ENTITY)
// .addCodegenType(CodegenType.KOTLIN_QUERYDSL)
// .addCodegenType(CodegenType.DB_DOC_MARKDOWN)
- .addTable("lcc_model_world");
+ // .addTable("lcc_model_world");
+ .addTable("rcs_task_biz")
+ .addTable("rcs_task_device")
+ .addTable("rcs_task_plan");
CodegenUtils.genCode(jdbc, config);
log.info("-->");
jdbc.close();