diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java index 8a983306..0834c95c 100644 --- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java +++ b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/config/MybatisConfiguration.java @@ -2,6 +2,7 @@ package com.cloud.kicc.common.data.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.cloud.kicc.common.core.factory.YamlPropertySourceFactory; import com.cloud.kicc.common.data.handler.BaseMetaObjectHandler; import com.cloud.kicc.common.data.handler.KiccTenantLineHandler; @@ -43,6 +44,7 @@ public class MybatisConfiguration implements WebMvcConfigurer { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); interceptor.addInnerInterceptor(new KiccTenantLineInnerInterceptor(new KiccTenantLineHandler(tenantProperties))); interceptor.addInnerInterceptor(new KiccPaginationInnerInterceptor()); + interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); return interceptor; } diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java index be4739fd..ad6eee76 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java @@ -1,6 +1,7 @@ package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.cloud.kicc.common.data.entity.CommonEntity; import java.math.BigDecimal; @@ -70,4 +71,8 @@ public class MapLogistic extends CommonEntity { @ApiModelProperty("关联报告单生成的批次码") private String batchCode; + @Version + @ApiModelProperty("版本控制") + private Integer version; + } diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java index 9ed059f4..554d9ceb 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java @@ -1,6 +1,7 @@ package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.cloud.kicc.common.data.entity.CommonEntity; import java.io.Serializable; import java.math.BigDecimal; @@ -57,5 +58,8 @@ public class MapLogisticPoint extends CommonEntity { @ApiModelProperty("地图任务ID") private String mapTaskId; + @Version + @ApiModelProperty("版本控制") + private Integer version; } diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java index 2fe46a54..3f02bdbe 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java @@ -1,6 +1,7 @@ package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.cloud.kicc.common.data.entity.CommonEntity; import java.io.Serializable; import java.math.BigDecimal; @@ -79,5 +80,8 @@ public class MapTask extends CommonEntity { @ApiModelProperty("地图主线物流ID") private String mapLogisticId; + @Version + @ApiModelProperty("版本控制") + private Integer version; } diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java index 73bed16d..31736c4e 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java @@ -1,6 +1,7 @@ package com.cloud.kicc.commonbiz.api.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.cloud.kicc.common.data.entity.CommonEntity; import java.math.BigDecimal; @@ -77,5 +78,8 @@ public class MapTaskPreset extends CommonEntity { @ApiModelProperty("地图任务ID") private String taskId; + @Version + @ApiModelProperty("版本控制") + private Integer version; }