Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
I
inet-doc-expand
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
INET-TWO
server
inet-doc-expand
Commits
735950a0
Commit
735950a0
authored
Aug 02, 2024
by
xuzhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat[doc]代码迁移
parent
f46a9062
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
481 additions
and
676 deletions
+481
-676
DxDocumentVO.java
...n/java/com/yonde/dcs/document/common/vo/DxDocumentVO.java
+25
-72
ExtObsoleteDocLinkVO.java
...om/yonde/dcs/document/common/vo/ExtObsoleteDocLinkVO.java
+0
-24
ObsoleteDocLinkVO.java
...a/com/yonde/dcs/document/common/vo/ObsoleteDocLinkVO.java
+0
-99
ExtObsoleteDocLinkController.java
...ocument/core/controller/ExtObsoleteDocLinkController.java
+0
-8
ExtObsoleteDocLinkControllerShadow.java
...controller/shadow/ExtObsoleteDocLinkControllerShadow.java
+1
-8
TechnicalFileUtils.java
...m/yonde/dcs/document/core/factory/TechnicalFileUtils.java
+426
-421
ObsoleteDocLinkRepositoryShadow.java
...ocument/core/service/ObsoleteDocLinkRepositoryShadow.java
+2
-2
ExtAutoTaskServiceImpl.java
...cs/document/core/service/impl/ExtAutoTaskServiceImpl.java
+0
-2
ExtDocServiceImpl.java
...nde/dcs/document/core/service/impl/ExtDocServiceImpl.java
+9
-8
ExtObsoleteDocLinkServiceImpl.java
...ment/core/service/impl/ExtObsoleteDocLinkServiceImpl.java
+4
-9
ExtObsoleteDocLinkServiceShadow.java
.../core/service/shadow/ExtObsoleteDocLinkServiceShadow.java
+1
-1
ExtDocUtil.java
...ain/java/com/yonde/dcs/document/core/util/ExtDocUtil.java
+5
-4
WorkFlowUtil.java
...n/java/com/yonde/dcs/document/core/util/WorkFlowUtil.java
+5
-11
ExtObsoleteDocLink.java
.../com/yonde/dcs/document/entity/po/ExtObsoleteDocLink.java
+1
-1
ExtObsoleteDocLinkServiceFeign.java
...de/dcs/document/feign/ExtObsoleteDocLinkServiceFeign.java
+1
-2
ExtObsoleteDocLinkServiceFeignShadow.java
...nt/feign/shadow/ExtObsoleteDocLinkServiceFeignShadow.java
+1
-4
No files found.
dcs-doc-common/src/main/java/com/yonde/dcs/document/common/vo/DxDocumentVO.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
common
.
vo
;
package
com
.
yonde
.
dcs
.
document
.
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.fasterxml.jackson.annotation.JsonUnwrapped
;
import
lombok.Data
;
import
com.yonde.dcs.document.expand.entity.DxDocumentVOExpand
;
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.data.VersionRelationType
;
import
com.yonde.dcs.document.common.vo.ExtAtlasDrawingLinkVO
;
import
com.yonde.dcs.document.expand.plugin.DxDocumentVOPluginExpand
;
import
com.yonde.dcs.document.expand.plugin.DxDocumentVOPluginExpand
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder
;
import
com.yonde.dex.basedata.data.expands.DxExpandVO
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable
;
import
com.yonde.dex.basedata.entity.annotation.DexEmbedded
;
import
com.yonde.dcs.document.common.vo.ExtObjectDocLinkVO
;
import
com.yonde.dex.basedata.entity.annotation.ReferenceProperty
;
import
com.yonde.dcs.document.common.vo.ExtRefJobContractDocVO
;
import
com.yonde.dex.basedata.entity.annotation.RelationProperty
;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable
;
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.dex.basedata.entity.vo.IdVO
;
import
com.yonde.d
cs.document.common.vo.ExtRelatedDcrLinkVO
;
import
com.yonde.d
ex.container.folder.plugin.common.entity.DxObjFolderVOEmbeddable
;
import
com.yonde.d
cs.document.common.vo.ExtReviewChangeLinkVO
;
import
com.yonde.d
ex.container.folder.plugin.common.entity.DxObjFolderVOHolder
;
import
com.yonde.d
cs.document.common.vo.ExtRelatedNcrLinkVO
;
import
com.yonde.d
ex.context.plugin.common.entity.DxContextVOEmbeddable
;
import
com.yonde.dex.context.plugin.common.entity.DxContextVOHolder
;
import
com.yonde.dex.context.plugin.common.entity.DxContextVOHolder
;
import
com.yonde.dcs.document.common.vo.ExtRefContractDocVO
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder
;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable
;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder
;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder
;
import
com.yonde.dcs.document.common.vo.ExtDenDescriptLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtRefDesignInputLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtComDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtInterfaceInfoLinkVO
;
import
com.yonde.dex.sandbox.plugin.common.entity.DxSandboxVOEmbeddable
;
import
com.yonde.dex.sandbox.plugin.common.entity.DxSandboxVOEmbeddable
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable
;
import
com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOHolder
;
import
com.yonde.dcs.document.common.vo.ExtReviewDocComLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtTechStandardLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtSendFormLinkVO
;
import
com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOEmbeddable
;
import
com.yonde.dex.basedata.entity.users.DxUserVO
;
import
com.yonde.dcs.document.common.vo.ExtReviewDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtRefOutsideDocVO
;
import
com.yonde.dex.sandbox.plugin.common.entity.DxSandboxVOHolder
;
import
com.yonde.dex.sandbox.plugin.common.entity.DxSandboxVOHolder
;
import
com.yonde.dcs.document.common.vo.ExtApplyDocVO
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable
;
import
com.yonde.dcs.document.common.vo.ExtChangeReasonLinkVO
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder
;
import
com.yonde.dcs.document.expand.entity.DxDocumentVOExpand
;
import
com.yonde.dcs.document.common.vo.ExtDxDocumentFolderVO
;
import
com.yonde.dcs.document.common.vo.ExtRelatedDrawingLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtInterfaceDocLinkVO
;
import
com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable
;
import
com.yonde.dcs.document.common.vo.ExtReplyDocVO
;
import
com.yonde.dcs.document.common.vo.ExtDocumentReferentLinkVO
;
import
com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder
;
import
com.yonde.dcs.document.common.vo.ExtReplenishLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtInterfaceReplaceLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtCheckedFileLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtAuditRecordCardLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtRelatedInterfaceLinkVO
;
import
com.yonde.dex.user.common.vo.DxOrganizationVO
;
import
com.yonde.dex.user.common.vo.DxOrganizationVO
;
import
com.yonde.dcs.document.common.vo.ExtRelatedDenLinkVO
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable
;
import
com.yonde.dex.basedata.data.expands.DxExpandVO
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.ToString
;
import
java.util.List
;
/**
/**
* @description: DxDocument-VO
* @description: DxDocument-VO
...
...
dcs-doc-common/src/main/java/com/yonde/dcs/document/common/vo/ExtObsoleteDocLinkVO.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
common
.
vo
;
package
com
.
yonde
.
dcs
.
document
.
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
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
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
lombok.Data
;
import
lombok.Data
;
import
com.yonde.dex.basedata.entity.annotation.*
;
import
com.yonde.dex.basedata.entity.annotation.*
;
import
lombok.AllArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
com.yonde.dex.basedata.entity.vo.IdOnlyVO
;
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.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder
;
import
com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder
;
import
com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable
;
import
com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable
;
...
@@ -36,8 +14,6 @@ import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
...
@@ -36,8 +14,6 @@ import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder
;
import
com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder
;
import
com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable
;
import
com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable
;
import
com.yonde.dcs.document.common.vo.DxDocumentVO
;
import
com.yonde.dex.basedata.entity.users.DxUserVO
;
/**
/**
* @description: ExtObsoleteDocLink-VO
* @description: ExtObsoleteDocLink-VO
...
...
dcs-doc-common/src/main/java/com/yonde/dcs/document/common/vo/ObsoleteDocLinkVO.java
deleted
100644 → 0
View file @
f46a9062
package
com
.
yonde
.
dcs
.
document
.
common
.
vo
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonTypeInfo
;
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.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.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable
;
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
* @version: 0
* @date: 2021-09-27 10:48:22
**/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@ToString
(
callSuper
=
true
)
@JsonTypeInfo
(
use
=
JsonTypeInfo
.
Id
.
CLASS
,
property
=
"dxClassname"
,
defaultImpl
=
ObsoleteDocLinkVO
.
class
)
@ModelConfigProperty
(
syncES
=
true
)
public
class
ObsoleteDocLinkVO
extends
IdOnlyVO
implements
IdVO
{
/**
* dao扩展对象
*/
@DexEmbedded
()
@JsonIgnore
private
DxIdVOEmbeddable
dxIdEmbeddable
;
/**
* 扩展VO属性
*/
@DexEmbedded
()
@JsonIgnore
private
DxLogicDeleteVOEmbeddable
dxLogicDeleteEmbeddable
;
/**
* 扩展VO属性
*/
@DexEmbedded
()
@JsonIgnore
private
DxLinkDataVOEmbeddable
<
DxDocumentVO
,
DxDocumentVO
>
dxLinkDataEmbeddable
;
/**
* 文档
*/
@ReferenceProperty
(
baseProperty
=
"sourceId"
)
@VersionProperty
(
curVersion
=
VersionRelationType
.
NONE
,
refVersion
=
VersionRelationType
.
VERSION
)
private
DxDocumentVO
source
;
/**
* 文档
*/
@ReferenceProperty
(
baseProperty
=
"targetId"
)
@VersionProperty
(
curVersion
=
VersionRelationType
.
NONE
,
refVersion
=
VersionRelationType
.
VERSION
)
private
DxDocumentVO
target
;
/**
* source对应的属性
*/
private
Long
sourceId
;
/**
* sourceId对应的类型
*/
private
String
sourceIdType
;
/**
* target对应的属性
*/
private
Long
targetId
;
/**
* targetId对应的类型
*/
private
String
targetIdType
;
private
Map
<
String
,
Object
>
dynamicAttrs
;
/**
* 关联描述
*/
private
String
linkDescript
;
}
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/controller/ExtObsoleteDocLinkController.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
core
.
controller
;
package
com
.
yonde
.
dcs
.
document
.
core
.
controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.annotation.Validated
;
import
java.util.List
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
import
com.yonde.dcs.document.core.controller.shadow.ExtObsoleteDocLinkControllerShadow
;
import
com.yonde.dcs.document.core.controller.shadow.ExtObsoleteDocLinkControllerShadow
;
import
javax.annotation.Resource
;
import
com.yonde.dex.basedata.auth.annos.BasePermission
;
import
com.yonde.dex.basedata.auth.annos.BasePermission
;
import
org.springframework.stereotype.Controller
;
/**
/**
* @description: ExtObsoleteDocLink-Controller
* @description: ExtObsoleteDocLink-Controller
...
...
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/controller/shadow/ExtObsoleteDocLinkControllerShadow.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
core
.
controller
.
shadow
;
package
com
.
yonde
.
dcs
.
document
.
core
.
controller
.
shadow
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.annotation.Validated
;
import
java.util.List
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dcs.document.core.service.impl.ExtObsoleteDocLinkServiceImpl
;
import
com.yonde.dcs.document.core.service.impl.ExtObsoleteDocLinkServiceImpl
;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController
;
import
com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController
;
import
com.yonde.dex.basedata.auth.annos.BasePermission
;
import
com.yonde.dex.basedata.auth.annos.BasePermission
;
...
...
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/factory/TechnicalFileUtils.java
View file @
735950a0
This diff is collapsed.
Click to expand it.
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/service/ObsoleteDocLinkRepositoryShadow.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
core
.
repository
.
shadow
;
package
com
.
yonde
.
dcs
.
document
.
core
.
repository
.
shadow
;
import
com.yonde.dcs.document.entity.po.ObsoleteDocLink
;
import
com.yonde.dcs.document.entity.po.
Ext
ObsoleteDocLink
;
import
com.yonde.dex.dao.business.repository.BaseRepository
;
import
com.yonde.dex.dao.business.repository.BaseRepository
;
import
org.springframework.data.repository.NoRepositoryBean
;
import
org.springframework.data.repository.NoRepositoryBean
;
...
@@ -11,7 +11,7 @@ import org.springframework.data.repository.NoRepositoryBean;
...
@@ -11,7 +11,7 @@ import org.springframework.data.repository.NoRepositoryBean;
* @date: 2024-7-15 15:32:39
* @date: 2024-7-15 15:32:39
**/
**/
@NoRepositoryBean
@NoRepositoryBean
public
interface
ObsoleteDocLinkRepositoryShadow
<
P
extends
ObsoleteDocLink
>
extends
BaseRepository
<
P
>
{
public
interface
ObsoleteDocLinkRepositoryShadow
<
P
extends
Ext
ObsoleteDocLink
>
extends
BaseRepository
<
P
>
{
String
BEAN_NAME
=
"obsoleteDocLinkRepository"
;
String
BEAN_NAME
=
"obsoleteDocLinkRepository"
;
}
}
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/service/impl/ExtAutoTaskServiceImpl.java
View file @
735950a0
...
@@ -40,7 +40,6 @@ import com.yonde.dex.user.feign.DxUserInfoFeign;
...
@@ -40,7 +40,6 @@ import com.yonde.dex.user.feign.DxUserInfoFeign;
import
com.yonde.dex.user.feign.SwitchUserService
;
import
com.yonde.dex.user.feign.SwitchUserService
;
import
com.yonde.dex.wfc.common.vo.DxWfParticipantInfoVO
;
import
com.yonde.dex.wfc.common.vo.DxWfParticipantInfoVO
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessVO
;
import
com.yonde.dex.wfc.common.vo.DxWfTaskContext
;
import
com.yonde.dex.wfc.common.vo.DxWfTaskContext
;
import
com.yonde.dex.wfc.feign.api.WfcProcessFeign
;
import
com.yonde.dex.wfc.feign.api.WfcProcessFeign
;
import
com.yonde.dex.wfc.feign.api.WfcTaskFeign
;
import
com.yonde.dex.wfc.feign.api.WfcTaskFeign
;
...
@@ -63,7 +62,6 @@ import java.io.FileInputStream;
...
@@ -63,7 +62,6 @@ import java.io.FileInputStream;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Method
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
/**
* @program: inet-pdm-service
* @program: inet-pdm-service
...
...
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/service/impl/ExtDocServiceImpl.java
View file @
735950a0
...
@@ -4,11 +4,16 @@ import cn.hutool.core.collection.CollectionUtil;
...
@@ -4,11 +4,16 @@ import cn.hutool.core.collection.CollectionUtil;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ZipUtil
;
import
cn.hutool.core.util.ZipUtil
;
import
cn.hutool.extra.spring.SpringUtil
;
import
cn.hutool.extra.spring.SpringUtil
;
import
com.yonde.dcs.document.common.vo.*
;
import
com.yonde.dcs.document.common.vo.DxDocumentVO
;
import
com.yonde.dcs.document.common.vo.ExtAtlasDrawingLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtReviseVersionVO
;
import
com.yonde.dcs.document.core.constants.Constants
;
import
com.yonde.dcs.document.core.constants.Constants
;
import
com.yonde.dcs.document.core.service.*
;
import
com.yonde.dcs.document.core.service.DxDocumentService
;
import
com.yonde.dcs.document.core.service.ExtAtlasDrawingLinkService
;
import
com.yonde.dcs.document.core.service.ExtDocService
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dcs.document.core.util.CommonUtil
;
import
com.yonde.dcs.document.core.util.CommonUtil
;
import
com.yonde.dcs.document.core.util.ExtDocUtil
;
import
com.yonde.dcs.document.core.util.ExtDocUtil
;
import
com.yonde.dcs.document.core.util.FileUtils
;
import
com.yonde.dcs.document.core.util.FileUtils
;
...
@@ -26,7 +31,6 @@ import com.yonde.dex.basedata.entity.data.DxPageImpl;
...
@@ -26,7 +31,6 @@ import com.yonde.dex.basedata.entity.data.DxPageImpl;
import
com.yonde.dex.basedata.entity.data.OperatorType
;
import
com.yonde.dex.basedata.entity.data.OperatorType
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.basedata.exception.DxBusinessException
;
import
com.yonde.dex.basedata.exception.DxBusinessException
;
import
com.yonde.dex.basedata.utils.obj.DxEntityUtils
;
import
com.yonde.dex.basedata.utils.obj.DxEntityUtils
;
import
com.yonde.dex.dao.service.util.DxPageUtils
;
import
com.yonde.dex.dao.service.util.DxPageUtils
;
import
com.yonde.dex.dfs.feign.FileManagerFeignService
;
import
com.yonde.dex.dfs.feign.FileManagerFeignService
;
...
@@ -37,12 +41,9 @@ import com.yonde.dex.dfs.vo.RepoFileVO;
...
@@ -37,12 +41,9 @@ import com.yonde.dex.dfs.vo.RepoFileVO;
import
com.yonde.dex.dfs.vo.view.FileDownLoadInfoVO
;
import
com.yonde.dex.dfs.vo.view.FileDownLoadInfoVO
;
import
com.yonde.dex.dict.feign.DictDataFeignService
;
import
com.yonde.dex.dict.feign.DictDataFeignService
;
import
com.yonde.dex.dict.service.vo.DictDataVO
;
import
com.yonde.dex.dict.service.vo.DictDataVO
;
import
com.yonde.dex.user.feign.DxUserInfoFeign
;
import
com.yonde.dex.user.feign.SwitchUserService
;
import
com.yonde.dex.user.feign.SwitchUserService
;
import
com.yonde.dex.version.plugin.core.service.VersionService
;
import
com.yonde.dex.version.plugin.core.service.VersionService
;
import
com.yonde.dex.version.plugin.entities.DxVersion
;
import
com.yonde.dex.version.plugin.entities.DxVersion
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessInfoVO
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessInfoVO
;
import
com.yonde.dex.wfc.feign.api.WfcProcessFeign
;
import
com.yonde.dex.wfc.feign.api.WfcProcessFeign
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -259,7 +260,7 @@ public class ExtDocServiceImpl implements ExtDocService {
...
@@ -259,7 +260,7 @@ public class ExtDocServiceImpl implements ExtDocService {
//设置为已发布状态
//设置为已发布状态
docNotifySave
.
setState
(
Constants
.
PBULISHED
);
docNotifySave
.
setState
(
Constants
.
PBULISHED
);
DxDocumentVO
notifyDocumentVO
=
(
DxDocumentVO
)
documentService
.
changeStatus
(
docNotifySave
);
DxDocumentVO
notifyDocumentVO
=
(
DxDocumentVO
)
documentService
.
changeStatus
(
docNotifySave
);
ObsoleteDocLinkVO
linkVO
=
new
ObsoleteDocLinkVO
();
ExtObsoleteDocLinkVO
linkVO
=
new
Ext
ObsoleteDocLinkVO
();
linkVO
.
setSource
(
documentVO
);
linkVO
.
setSource
(
documentVO
);
linkVO
.
setTarget
(
notifyDocumentVO
);
linkVO
.
setTarget
(
notifyDocumentVO
);
//过时文件通知单关联当前文档最新版本
//过时文件通知单关联当前文档最新版本
...
...
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/service/impl/ExtObsoleteDocLinkServiceImpl.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
core
.
service
.
impl
;
package
com
.
yonde
.
dcs
.
document
.
core
.
service
.
impl
;
import
org.springframework.stereotype.Service
;
import
io.swagger.annotations.ApiOperation
;
import
java.util.List
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dcs.document.core.repository.ExtObsoleteDocLinkRepository
;
import
com.yonde.dcs.document.core.repository.ExtObsoleteDocLinkRepository
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dcs.document.entity.po.ExtObsoleteDocLink
;
import
com.yonde.dcs.document.entity.po.ExtObsoleteDocLink
;
import
javax.annotation.Resource
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
/**
/**
* @description: ExtObsoleteDocLink-ServiceImpl
* @description: ExtObsoleteDocLink-ServiceImpl
...
...
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/service/shadow/ExtObsoleteDocLinkServiceShadow.java
View file @
735950a0
...
@@ -2,8 +2,8 @@ package com.yonde.dcs.document.core.service.shadow;
...
@@ -2,8 +2,8 @@ package com.yonde.dcs.document.core.service.shadow;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.feign.ExtObsoleteDocLinkServiceFeign
;
import
com.yonde.dcs.document.feign.ExtObsoleteDocLinkServiceFeign
;
import
com.yonde.dex.linkdata.plugin.core.service.DxLinkDataService
;
import
com.yonde.dex.dao.service.BaseIdEntityService
;
import
com.yonde.dex.dao.service.BaseIdEntityService
;
import
com.yonde.dex.linkdata.plugin.core.service.DxLinkDataService
;
import
com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService
;
import
com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService
;
/**
/**
* @description: ExtObsoleteDocLink-service
* @description: ExtObsoleteDocLink-service
...
...
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/util/ExtDocUtil.java
View file @
735950a0
...
@@ -4,7 +4,6 @@ package com.yonde.dcs.document.core.util;
...
@@ -4,7 +4,6 @@ package com.yonde.dcs.document.core.util;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.yonde.dcs.document.common.vo.DxDocumentVO
;
import
com.yonde.dcs.document.common.vo.DxDocumentVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ObsoleteDocLinkVO
;
import
com.yonde.dcs.document.core.constants.Constants
;
import
com.yonde.dcs.document.core.constants.Constants
;
import
com.yonde.dcs.document.core.service.DxDocumentService
;
import
com.yonde.dcs.document.core.service.DxDocumentService
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
import
com.yonde.dcs.document.core.service.ExtObsoleteDocLinkService
;
...
@@ -24,8 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -24,8 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.context.request.RequestAttributes
;
import
org.springframework.web.context.request.RequestAttributes
;
import
java.io.InputStream
;
import
java.util.Collections
;
import
java.util.*
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
/**
/**
...
@@ -159,7 +160,7 @@ public class ExtDocUtil {
...
@@ -159,7 +160,7 @@ public class ExtDocUtil {
*
*
* @param sourceId
* @param sourceId
*/
*/
public
List
<
ObsoleteDocLinkVO
>
recursionObsoleteDocLinkBySourceId
(
Long
sourceId
)
{
public
List
<
Ext
ObsoleteDocLinkVO
>
recursionObsoleteDocLinkBySourceId
(
Long
sourceId
)
{
SearchQueryCondition
condition
=
SearchQueryCondition
.
builder
()
SearchQueryCondition
condition
=
SearchQueryCondition
.
builder
()
.
openProp
(
SearchQueryCondition
.
builder
().
name
(
"target"
)
.
openProp
(
SearchQueryCondition
.
builder
().
name
(
"target"
)
.
openProp
(
SearchQueryCondition
.
builder
().
name
(
"objFileLinks"
).
openProp
(
SearchQueryCondition
.
builder
().
name
(
"target"
).
build
()).
build
()).
build
())
.
openProp
(
SearchQueryCondition
.
builder
().
name
(
"objFileLinks"
).
openProp
(
SearchQueryCondition
.
builder
().
name
(
"target"
).
build
()).
build
()).
build
())
...
...
dcs-doc-core/src/main/java/com/yonde/dcs/document/core/util/WorkFlowUtil.java
View file @
735950a0
...
@@ -2,22 +2,16 @@ package com.yonde.dcs.document.core.util;
...
@@ -2,22 +2,16 @@ package com.yonde.dcs.document.core.util;
import
com.yonde.dcs.document.common.vo.DxDocumentVO
;
import
com.yonde.dcs.document.common.vo.DxDocumentVO
;
import
com.yonde.dcs.document.core.constants.SignConstants
;
import
com.yonde.dex.user.common.vo.DxUserInfoVO
;
import
com.yonde.dex.user.common.vo.DxUserInfoVO
;
import
com.yonde.dex.user.feign.DxUserInfoFeign
;
import
com.yonde.dex.user.feign.DxUserInfoFeign
;
import
com.yonde.dex.wfc.common.enums.TaskStateEnum
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessSearchVO
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO
;
import
com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO
;
import
com.yonde.dex.wfc.feign.api.WfcProcessFeign
;
import
com.yonde.dex.wfc.feign.api.WfcProcessFeign
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Page
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
java.text.SimpleDateFormat
;
import
java.util.List
;
import
java.util.*
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
/**
* @program: inet-pdm-service
* @program: inet-pdm-service
...
@@ -75,7 +69,7 @@ public class WorkFlowUtil {
...
@@ -75,7 +69,7 @@ public class WorkFlowUtil {
* @param doc
* @param doc
*/
*/
// TODO: 2024/8/1 getProcessInstList方法不存在
// TODO: 2024/8/1 getProcessInstList方法不存在
//
public Map<String, List<DxWfProcessTaskVO>> getWfInfo(DxDocumentVO doc) {
public
Map
<
String
,
List
<
DxWfProcessTaskVO
>>
getWfInfo
(
DxDocumentVO
doc
)
{
// WfProcessInstVO wfProcessInstVO = getWfProcessInst(doc);
// WfProcessInstVO wfProcessInstVO = getWfProcessInst(doc);
// if (!ObjectUtils.isEmpty(wfProcessInstVO)) {
// if (!ObjectUtils.isEmpty(wfProcessInstVO)) {
// WfProcessInfoVO wfProcessInfo = this.instanceService.getProcessInstSimpleDetailById(wfProcessInstVO.getId());
// WfProcessInfoVO wfProcessInfo = this.instanceService.getProcessInstSimpleDetailById(wfProcessInstVO.getId());
...
@@ -88,8 +82,8 @@ public class WorkFlowUtil {
...
@@ -88,8 +82,8 @@ public class WorkFlowUtil {
//
//
// return wfHistoryMap;
// return wfHistoryMap;
// }
// }
//
return null;
return
null
;
//
}
}
/**
/**
* 根据任务名称获取处理人
* 根据任务名称获取处理人
...
...
dcs-doc-entity/src/main/java/com/yonde/dcs/document/entity/po/ObsoleteDocLink.java
→
dcs-doc-entity/src/main/java/com/yonde/dcs/document/entity/po/
Ext
ObsoleteDocLink.java
View file @
735950a0
...
@@ -27,7 +27,7 @@ import javax.persistence.Table;
...
@@ -27,7 +27,7 @@ import javax.persistence.Table;
@NoArgsConstructor
@NoArgsConstructor
@Data
@Data
@Table
(
name
=
"OBSOLETE_DOC_LINK"
)
@Table
(
name
=
"OBSOLETE_DOC_LINK"
)
public
class
ObsoleteDocLink
extends
IdOnlyEntity
implements
IdEntity
,
DxLogicDeleteHolder
,
DxLinkDataHolder
{
public
class
Ext
ObsoleteDocLink
extends
IdOnlyEntity
implements
IdEntity
,
DxLogicDeleteHolder
,
DxLinkDataHolder
{
/**
/**
* dao扩展对象
* dao扩展对象
...
...
dcs-doc-feign/src/main/java/com/yonde/dcs/document/feign/ExtObsoleteDocLinkServiceFeign.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
feign
;
package
com
.
yonde
.
dcs
.
document
.
feign
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.feign.shadow.ExtObsoleteDocLinkServiceFeignShadow
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.document.feign.shadow.ExtObsoleteDocLinkServiceFeignShadow
;
/**
/**
* @description: ExtObsoleteDocLink-Feign
* @description: ExtObsoleteDocLink-Feign
...
...
dcs-doc-feign/src/main/java/com/yonde/dcs/document/feign/shadow/ExtObsoleteDocLinkServiceFeignShadow.java
View file @
735950a0
package
com
.
yonde
.
dcs
.
document
.
feign
.
shadow
;
package
com
.
yonde
.
dcs
.
document
.
feign
.
shadow
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
com.yonde.dcs.document.common.vo.ExtObsoleteDocLinkVO
;
import
io.swagger.annotations.Api
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dex.dao.service.remotes.BaseFeign
;
import
com.yonde.dex.dao.service.remotes.BaseFeign
;
import
com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign
;
import
com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign
;
import
com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign
;
import
com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign
;
/**
/**
* @description: ExtObsoleteDocLink-Feign
* @description: ExtObsoleteDocLink-Feign
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment