删除历史数据

dcs-plan-common/pom.xml

@@ -93,6 +93,12 @@
             <artifactId>easyexcel</artifactId>
             <version>3.0.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.yonde.dex</groupId>
+            <artifactId>dex-history-plugin-common</artifactId>
+            <version>4.1-20241024-RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanBaseLineLinkVO.java

@@ -40,7 +40,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtPlanBaseLineLink-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-28 17:18:26
+* @date: 2024-10-30 9:33:03
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanBaseLineLinkVO.class)
 @EqualsAndHashCode(callSuper = true)

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanParentVO.java

 package com.yonde.dcs.plan.common.vo;
 
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import cn.hutool.core.convert.Convert;
-import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import lombok.ToString;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.math.BigInteger;
-import org.springframework.data.annotation.Transient;
-import lombok.experimental.Delegate;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.XmlAttribute;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.NotNull;
-import java.util.List;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
-import lombok.Data;
-import com.yonde.dex.basedata.entity.annotation.*;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.TypeReference;
+import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
+import com.yonde.dex.basedata.entity.annotation.RelationProperty;
+import com.yonde.dex.basedata.entity.annotation.VersionProperty;
 import com.yonde.dex.basedata.entity.data.VersionRelationType;
 import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
+import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
 import com.yonde.dex.basedata.entity.vo.IdVO;
-import com.yonde.dcs.plan.common.vo.ExtPlanBaseLineLinkVO;
-import com.yonde.dex.basedata.entity.users.DxUserVO;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.List;
 
 /**
-* @description: ExtPlanParent-VO
-* @author: dexadmin
-* @version: V
-* @date: 2024-10-28 17:18:27
-**/
-@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanParentVO.class)
+ * @description: ExtPlanParent-VO
+ * @author: dexadmin
+ * @version: V
+ * @date: 2024-10-30 9:33:03
+ **/
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanParentVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtPlanParentVO extends IdOnlyVO implements IdVO{
+public class ExtPlanParentVO extends IdOnlyVO implements IdVO, DxLogicDeleteVOHolder {
 
     public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String EXT_PLAN_BASE_LINE_LINKS_PROP_NAME = "extPlanBaseLineLinks";
 
     /**
@@ -57,6 +40,13 @@ public class ExtPlanParentVO extends IdOnlyVO implements IdVO{
     @JsonIgnore
     private DxIdVOEmbeddable dxIdEmbeddable;
 
+    /**
+     * 扩展VO属性
+     */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
+
     /**
      * 计划基线link集合
      */

dcs-plan-entity/pom.xml

@@ -45,6 +45,10 @@
             <groupId>com.yonde.dex</groupId>
             <artifactId>dex-tree-plugin-entities</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yonde.dex</groupId>
+            <artifactId>dex-history-plugin-entities</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -66,5 +70,4 @@
     </dependencies>
 
 
-
 </project>

dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPlanBaseLineLink.java

@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
 * @description: ExtPlanBaseLineLink-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-27 11:03:50
+* @date: 2024-10-30 9:33:03
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)

dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPlanParent.java

 package com.yonde.dcs.plan.entity.po;
 
-import org.springframework.data.annotation.CreatedBy;
-import javax.persistence.UniqueConstraint;
-import java.util.Date;
-import java.time.LocalDateTime;
-import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.LastModifiedDate;
-import com.yonde.dex.dao.entity.base.IdEntity;
-import org.springframework.data.annotation.LastModifiedBy;
-import javax.persistence.Column;
-import org.springframework.data.annotation.CreatedDate;
 import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
+import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
+import com.yonde.dex.dao.entity.base.IdEntity;
+import com.yonde.dex.dao.entity.base.IdOnlyEntity;
+import com.yonde.dex.history.plugin.entities.DxHistoryPlugin;
+import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
+import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
 import lombok.Data;
-import com.yonde.dex.basedata.entity.annotation.*;
-import java.math.BigInteger;
-import javax.persistence.*;
-import java.math.BigDecimal;
-import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import javax.persistence.Column;
+
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import com.yonde.dex.dao.entity.base.IdEntity;
-import javax.persistence.Column;
-import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
-import com.yonde.dex.dao.entity.base.IdOnlyEntity;
 
 /**
-* @description: ExtPlanParent-PO实体
-* @author: dexadmin
-* @version: V
-* @date: 2024-10-28 17:18:27
-**/
+ * @description: ExtPlanParent-PO实体
+ * @author: dexadmin
+ * @version: V
+ * @date: 2024-10-30 9:33:03
+ **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 @Table(name = "EXT_PLAN_PARENT")
-public class ExtPlanParent extends IdOnlyEntity implements IdEntity{
+public class ExtPlanParent extends IdOnlyEntity implements IdEntity, DxLogicDeleteHolder {
 
     /**
      * dao扩展对象
@@ -46,6 +34,12 @@ public class ExtPlanParent extends IdOnlyEntity implements IdEntity{
     @DexEmbedded()
     @Embedded()
     private DxIdEntityEmbeddable dxIdEmbeddable;
+    /**
+     * 扩展PO属性
+     */
+    @DexEmbedded()
+    @Embedded()
+    private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
 }