diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderEventDO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderEventDO.java index 87001519..519e0769 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderEventDO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderEventDO.java @@ -1,7 +1,7 @@ package com.viewsh.module.ops.dal.dataobject.workorder; +import com.baomidou.mybatisplus.annotation.IdType; import com.viewsh.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; @@ -14,7 +14,6 @@ import java.time.LocalDateTime; * @author lzh */ @TableName("ops_order_event") -@KeySequence("ops_order_event_seq") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -24,9 +23,9 @@ import java.time.LocalDateTime; public class OpsOrderEventDO extends BaseDO { /** - * 事件ID + * 事件ID(使用��花算法生成) */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 工单ID diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderQueueDO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderQueueDO.java index bc1c3212..64f108df 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderQueueDO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderQueueDO.java @@ -1,8 +1,8 @@ package com.viewsh.module.ops.dal.dataobject.workorder; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.viewsh.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; @@ -17,7 +17,6 @@ import java.util.Map; * @author lzh */ @TableName(value = "ops_order_queue", autoResultMap = true) -@KeySequence("ops_order_queue_seq") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -27,9 +26,9 @@ import java.util.Map; public class OpsOrderQueueDO extends BaseDO { /** - * 队列ID + * 队列ID(使用雪花算法生成) */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 保洁员用户ID