Skip to content

D
dcs-doc-expand
Commit 73846951 authored by wangyangyang's avatar wangyangyang
Browse files
Options

去掉多余vo类

parent 34ad01d6
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 316 deletions
.gitignore 0 → 100644
View file @ 73846951
# Created by .ignore support plugin (hsz.mobi)
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/dictionaries
.idea/**/shelf
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# CMake
cmake-build-debug/
cmake-build-release/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
### Java template
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
*.iml
.idea/
**/target/**
*.gitkeep
.mvn/
\ No newline at end of file
.idea/.gitignore 0 → 100644
View file @ 73846951
# Created by .ignore support plugin (hsz.mobi)
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/dictionaries
.idea/**/shelf
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# CMake
cmake-build-debug/
cmake-build-release/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
### Java template
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
*.iml
.idea/
**/target/**
*.gitkeep
.mvn/
\ No newline at end of file
.idea/compiler.xml 0 → 100644
View file @ 73846951
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="dcs-doc-expand-core" />
<module name="dcs-doc-expand-build-lib" />
<module name="dcs-doc-expand-build-thirdLib" />
<module name="dcs-doc-expand-common" />
<module name="dcs-doc-expand-feign" />
<module name="dcs-doc-expand-entity" />
<module name="dcs-doc-expand-server" />
</profile>
</annotationProcessing>
</component>
</project>
\ No newline at end of file
.idea/encodings.xml 0 → 100644
View file @ 73846951
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/dcs-doc-expand-build-lib/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-build-lib/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-build-thirdLib/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-build-thirdLib/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-core/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-core/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-entity/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-entity/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-feign/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-feign/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-server/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dcs-doc-expand-server/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
dcs-doc-expand-common/src/main/java/com/yonde/dcs/document/common/vo/ExtDisReocredLinkVO.java deleted 100644 → 0
View file @ 34ad01d6
package com.yonde.dcs.document.common.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dcs.plan.common.vo.ExtPlanVO;
import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
import com.yonde.dex.basedata.entity.annotation.ModelConfigProperty;
import com.yonde.dex.basedata.entity.annotation.ReferenceProperty;
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.linkdata.plugin.common.DxLinkDataVOEmbeddable;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.Map;
/**
* @author xfchai
* @description: 分发记录关联VO
* @description:
* @version: 0
* @date: 2021-09-14 11:08:37
**/
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@JsonTypeInfo(
use = JsonTypeInfo.Id.CLASS,
property = "dxClassname",
defaultImpl = ExtDisReocredLinkVO.class
)
@ModelConfigProperty(syncES = true)
public class ExtDisReocredLinkVO extends IdOnlyVO implements IdVO, DxLinkDataVOHolder<ExtDistributeRecordVO, ExtPlanVO> {
/**
* dao扩展对象
*/
@DexEmbedded()
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLinkDataVOEmbeddable<ExtDistributeRecordVO, ExtPlanVO> dxLinkDataEmbeddable;
/**
* DxObject
*/
@ReferenceProperty(baseProperty = "targetId")
private ExtPlanVO target;
/**
* 分发记录
*/
@ReferenceProperty(baseProperty = "sourceId")
private ExtDistributeRecordVO source;
/**
* target对应的属性
*/
private Long targetId;
/**
* targetId对应的类型
*/
private String targetIdType;
/**
* source对应的属性
*/
private Long sourceId;
/**
* sourceId对应的类型
*/
private String sourceIdType;
private Map<String, Object> dynamicAttrs;
}
dcs-doc-expand-common/src/main/java/com/yonde/dcs/document/common/vo/ExtDistributeRecordVO.java deleted 100644 → 0
View file @ 34ad01d6
package com.yonde.dcs.document.common.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
import com.yonde.dex.basedata.entity.annotation.ModelConfigProperty;
import com.yonde.dex.basedata.entity.annotation.ReferenceProperty;
import com.yonde.dex.basedata.entity.annotation.RelationProperty;
import com.yonde.dex.basedata.entity.users.DxUserVO;
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.dfs.vo.ObjFileLinkVO;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
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.Date;
import java.util.List;
import java.util.Map;
/**
* @author xfchai
* @description: 分发记录实体VO
* @version: 1
* @date: 2021-09-14 11:11:01
**/
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@JsonTypeInfo(
use = JsonTypeInfo.Id.CLASS,
property = "dxClassname",
defaultImpl = ExtDistributeRecordVO.class
)
@ModelConfigProperty(syncES = true)
public class ExtDistributeRecordVO extends IdOnlyVO implements IdVO, DxLinkDataVOHolder<DxDocumentVO, DxDocumentVO>, 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 DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
public static final String LINK_DESCRIPT_PROP_NAME = "linkDescript";
/**
* dao扩展对象
*/
@DexEmbedded()
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLinkDataVOEmbeddable<DxDocumentVO, DxDocumentVO> dxLinkDataEmbeddable;
/**
* 分发记录对象Link模型集合
*/
@RelationProperty(refProperty = "source")
private List<ExtDisReocredLinkVO> sourceDisReocredLink;
/**
* 分发类型
*/
private String distributeType;
/**
* 操作时间
*/
private Date operationTime;
/**
* 工作说明
*/
private String workDesc;
/**
* 接收备注
*/
private String receiveRemark;
/**
* 完成接收任务时间
*/
private Date comReceiveTime;
/**
* 分发人
*/
@ReferenceProperty(baseProperty = "senderId")
private DxUserVO sender;
/**
* 显示名称
*/
private String boTitle;
/**
* 是否处理
*/
private Boolean completed;
/**
* 截止时间
*/
private Date dueTime;
/**
* 关联附件集合
*/
@RelationProperty(refProperty = "source")
private List<ObjFileLinkVO> objFileLinks;
/**
* 分发单位
*/
private String distributDepart;
/**
* 分发时间
*/
private Date distributTime;
/**
* 发送人
*/
@ReferenceProperty(baseProperty = "handlerId")
private DxUserVO handler;
/**
* 分发备注
*/
private String distributeRemark;
/**
* 分发是否需回复
*/
private String replyDistribute;
/**
* 要求回复日期
*/
private Date replyDate;
/**
* 接收单位
*/
private String receiver;
/**
* 接收任务类型
*/
private String receiveTaskType;
/**
* 接收时间
*/
private Date receiveTime;
/**
* 接收类型
*/
private String receiveType;
/**
* 发送人对应的属性
*/
private Long senderId;
/**
* 发送人对应的类型
*/
private String senderIdType;
/**
* 接收人对应的属性
*/
private Long handlerId;
/**
* 接收人对应的类型
*/
private String handlerIdType;
/**
* 外单位(收)
*/
private String foreignUnitReceive;
/**
* 外单位(发)
*/
private String foreignUnitIssued;
/**
* 发送任务是否结束
*/
private Boolean sendFinish;
/**
* 分发编号
*/
private String disNumber;
private Map<String, Object> dynamicAttrs;
}
dcs-doc-expand-core/src/main/java/com/yonde/dcs/document/core/service/impl/expand/ExtDxDocumentServiceImpl.java
View file @ 73846951
......@@ -34,13 +34,13 @@ public class ExtDxDocumentServiceImpl<V extends DxDocumentVO> extends DocumentSe
@Override
public void beforeSave(Collection<V> target) {
for (V v : target) {
documentEvent.createDocListener(v);
//documentEvent.createDocListener(v);
}
}
@Override
public void beforeUpdate(Collection<V> target, Collection<V> origin) {
for (V v : target) {
documentEvent.updateDocListener(v);
//documentEvent.updateDocListener(v);
}
}
}
......
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