Commit 0942ae27 authored by 侯彦文's avatar 侯彦文

删除历史数据

parent 048e9fa5
...@@ -93,6 +93,12 @@ ...@@ -93,6 +93,12 @@
<artifactId>easyexcel</artifactId> <artifactId>easyexcel</artifactId>
<version>3.0.4</version> <version>3.0.4</version>
</dependency> </dependency>
<dependency>
<groupId>com.yonde.dex</groupId>
<artifactId>dex-history-plugin-common</artifactId>
<version>4.1-20241024-RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
......
...@@ -40,7 +40,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO; ...@@ -40,7 +40,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtPlanBaseLineLink-VO * @description: ExtPlanBaseLineLink-VO
* @author: dexadmin * @author: dexadmin
* @version: V * @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) @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanBaseLineLinkVO.class)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
......
package com.yonde.dcs.plan.common.vo; 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 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.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter; import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
import lombok.Data; import com.yonde.dex.basedata.entity.annotation.RelationProperty;
import com.yonde.dex.basedata.entity.annotation.*; import com.yonde.dex.basedata.entity.annotation.VersionProperty;
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.data.VersionRelationType; import com.yonde.dex.basedata.entity.data.VersionRelationType;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable; 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.dex.basedata.entity.vo.IdVO;
import com.yonde.dcs.plan.common.vo.ExtPlanBaseLineLinkVO; import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO; 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 * @description: ExtPlanParent-VO
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-10-28 17:18:27 * @date: 2024-10-30 9:33:03
**/ **/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanParentVO.class) @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanParentVO.class)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ToString(callSuper = true) @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_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"; public static final String EXT_PLAN_BASE_LINE_LINKS_PROP_NAME = "extPlanBaseLineLinks";
/** /**
* dao扩展对象 * dao扩展对象
*/ */
@DexEmbedded() @DexEmbedded()
@JsonIgnore @JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable; private DxIdVOEmbeddable dxIdEmbeddable;
/** /**
* 计划基线link集合 * 扩展VO属性
*/ */
@DexEmbedded()
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 计划基线link集合
*/
@RelationProperty(refProperty = "target") @RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE) @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private List<ExtPlanBaseLineLinkVO> extPlanBaseLineLinks; private List<ExtPlanBaseLineLinkVO> extPlanBaseLineLinks;
......
...@@ -21,30 +21,34 @@ ...@@ -21,30 +21,34 @@
<artifactId>dcs-plan-common</artifactId> <artifactId>dcs-plan-common</artifactId>
<version>4.1-20241024-RELEASE</version> <version>4.1-20241024-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-linkdata-plugin-entities</artifactId> <artifactId>dex-linkdata-plugin-entities</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-container-folder-plugin-entities</artifactId> <artifactId>dex-container-folder-plugin-entities</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-lcycle-plugin-entities</artifactId> <artifactId>dex-lcycle-plugin-entities</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-dfs-objfilelink-plugin-entities</artifactId> <artifactId>dex-dfs-objfilelink-plugin-entities</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-version-plugin-entities</artifactId> <artifactId>dex-version-plugin-entities</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-tree-plugin-entities</artifactId> <artifactId>dex-tree-plugin-entities</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.yonde.dex</groupId>
<artifactId>dex-history-plugin-entities</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
...@@ -66,5 +70,4 @@ ...@@ -66,5 +70,4 @@
</dependencies> </dependencies>
</project> </project>
...@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable; ...@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
* @description: ExtPlanBaseLineLink-PO实体 * @description: ExtPlanBaseLineLink-PO实体
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-9-27 11:03:50 * @date: 2024-10-30 9:33:03
**/ **/
@Entity @Entity
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
......
package com.yonde.dcs.plan.entity.po; 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.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 lombok.Data;
import com.yonde.dex.basedata.entity.annotation.*; import lombok.EqualsAndHashCode;
import java.math.BigInteger;
import javax.persistence.*;
import java.math.BigDecimal;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Embedded; import javax.persistence.Embedded;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; 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实体 * @description: ExtPlanParent-PO实体
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-10-28 17:18:27 * @date: 2024-10-30 9:33:03
**/ **/
@Entity @Entity
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@Data @Data
@Table(name = "EXT_PLAN_PARENT") @Table(name = "EXT_PLAN_PARENT")
public class ExtPlanParent extends IdOnlyEntity implements IdEntity{ public class ExtPlanParent extends IdOnlyEntity implements IdEntity, DxLogicDeleteHolder {
/** /**
* dao扩展对象 * dao扩展对象
*/ */
@DexEmbedded() @DexEmbedded()
@Embedded() @Embedded()
private DxIdEntityEmbeddable dxIdEmbeddable; private DxIdEntityEmbeddable dxIdEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment