Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-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
dcs-doc-expand
Commits
c53c3d19
Commit
c53c3d19
authored
Oct 10, 2024
by
wangyangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文档 图册:回写ied计划状态
parent
335fcf12
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
59 additions
and
9 deletions
+59
-9
Constants.java
...java/com/yonde/dcs/document/core/constants/Constants.java
+4
-0
ExtAutoTaskController.java
...e/dcs/document/core/controller/ExtAutoTaskController.java
+8
-2
ExtAutoTaskService.java
...m/yonde/dcs/document/core/service/ExtAutoTaskService.java
+8
-0
ExtAutoTaskServiceImpl.java
...cs/document/core/service/impl/ExtAutoTaskServiceImpl.java
+34
-6
ExtAutoTaskServiceFeign.java
...com/yonde/dcs/document/feign/ExtAutoTaskServiceFeign.java
+5
-1
No files found.
dcs-doc-expand-core/src/main/java/com/yonde/dcs/document/core/constants/Constants.java
View file @
c53c3d19
...
...
@@ -142,6 +142,10 @@ public class Constants {
* 已发放
*/
public
static
final
String
RELEASED
=
"released"
;
/**
* 文档-图纸-已发布
*/
public
static
final
String
DOC_RELEASE
=
"release"
;
/**
* 驳回
*/
...
...
dcs-doc-expand-core/src/main/java/com/yonde/dcs/document/core/controller/ExtAutoTaskController.java
View file @
c53c3d19
...
...
@@ -69,6 +69,12 @@ public class ExtAutoTaskController {
autoTaskService
.
generateCatalog
(
docId
);
}
@ApiOperation
(
"客制化修改IED计划状态"
)
@PostMapping
({
"/ied/change"
})
public
void
changeIEDStatus
(
@RequestParam
String
iedStatus
,
@RequestBody
DxDocumentVO
documentVO
)
{
autoTaskService
.
changeIEDStatus
(
iedStatus
,
documentVO
);
}
@ApiOperation
(
"电子签名"
)
@PostMapping
({
"/esign"
})
...
...
@@ -89,7 +95,7 @@ public class ExtAutoTaskController {
}
// TODO: WfcSignMessageBuilder不存在,根据2.1代码 new TaskMessage();
// WfTaskContext wfTaskContext = new WfTaskContext(wfProcessInstVO.getBusinessKey(), wfProcessInstVO.getId(), wfProcessInstVO.getProcessDef().getId(), signNode, null, (Map) null);
// WfTaskContext wfTaskContext = new WfTaskContext(wfProcessInstVO.getBusinessKey(), wfProcessInstVO.getId(), wfProcessInstVO.getProcessDef().getId(), signNode, null, (Map) null);
// WfcSignMessage wfcSignMessage = new WfcSignMessage(new HashMap());
// wfcSignMessage.setWfTaskContext(wfTaskContext);
// wfcSignMessage.setSignType(pboKey);
...
...
@@ -97,7 +103,7 @@ public class ExtAutoTaskController {
DxWfTaskContext
dxWfTaskContext
=
new
DxWfTaskContext
();
dxWfTaskContext
.
setPboKey
(
dxWfProcessVO
.
getBusinessKey
());
dxWfTaskContext
.
setProcessId
(
dxWfProcessVO
.
getId
());
dxWfTaskContext
.
setProcessDefId
(
dxWfProcessVO
.
getProcDefId
());
dxWfTaskContext
.
setProcessDefId
(
dxWfProcessVO
.
getProcDefId
());
dxWfTaskContext
.
setCurrentActivityId
(
signNode
);
WfcSignMessage
wfcSignMessage
=
new
WfcSignMessage
(
new
HashMap
<>());
wfcSignMessage
.
setWfTaskContext
(
dxWfTaskContext
);
...
...
dcs-doc-expand-core/src/main/java/com/yonde/dcs/document/core/service/ExtAutoTaskService.java
View file @
c53c3d19
...
...
@@ -213,4 +213,12 @@ public interface ExtAutoTaskService extends ExtAutoTaskServiceFeign {
*/
@SneakyThrows
void
autoSetTzri
(
ExtInterfaceVO
interfaceVO
);
/**
* 客制化修改IED计划状态
*
* @param iedStatus 为 已完成 Complete
* @param documentVO
*/
void
changeIEDStatus
(
String
iedStatus
,
DxDocumentVO
documentVO
);
}
dcs-doc-expand-core/src/main/java/com/yonde/dcs/document/core/service/impl/ExtAutoTaskServiceImpl.java
View file @
c53c3d19
...
...
@@ -22,13 +22,10 @@ import com.yonde.dcs.document.core.constants.Constants;
import
com.yonde.dcs.document.core.constants.SignConstants
;
import
com.yonde.dcs.document.common.entity.vo.DxDocumentVO
;
import
com.yonde.dcs.plan.common.vo.ExtDisReocredLinkVO
;
import
com.yonde.dcs.plan.common.vo.ExtDistributeRecordVO
;
import
com.yonde.dcs.plan.common.vo.ExtIEDPlanDocLinkVO
;
import
com.yonde.dcs.plan.common.vo.ExtPlanDocLinkVO
;
import
com.yonde.dcs.plan.common.vo.ExtPlanVO
;
import
com.yonde.dcs.plan.feign.ExtDistributeRecordServiceFeign
;
import
com.yonde.dcs.plan.feign.ExtPlanDocLinkServiceFeign
;
import
com.yonde.dcs.plan.feign.ExtPlanServiceFeign
;
import
com.yonde.dcs.plan.feign.*
;
import
com.yonde.dex.basedata.data.search.SearchItem
;
import
com.yonde.dex.basedata.data.search.SearchItems
;
import
com.yonde.dex.basedata.data.search.SearchQueryCondition
;
...
...
@@ -37,7 +34,6 @@ import com.yonde.dex.basedata.entity.data.DxPageImpl;
import
com.yonde.dex.basedata.entity.data.OperatorType
;
import
com.yonde.dex.basedata.entity.jackson.JsonUtils
;
import
com.yonde.dex.basedata.exception.DxBusinessException
;
import
com.yonde.dex.basedata.utils.obj.DxEntityUtils
;
import
com.yonde.dex.dao.service.util.DxPageUtils
;
import
com.yonde.dex.dfs.feign.FileManagerFeignService
;
import
com.yonde.dex.dfs.objfilelink.service.ObjFileLinkService
;
...
...
@@ -122,6 +118,9 @@ public class ExtAutoTaskServiceImpl implements ExtAutoTaskService {
@Resource
private
ExtPlanDocLinkServiceFeign
planDocLinkService
;
@Autowired
private
ExtIEDPlanDocLinkServiceFeign
extIEDPlanDocLinkServiceFeign
;
@Autowired
private
ExtPlanServiceFeign
extPlanService
;
@Autowired
...
...
@@ -156,6 +155,33 @@ public class ExtAutoTaskServiceImpl implements ExtAutoTaskService {
@Autowired
ExtAuditInterfLinkService
extAuditInterfLinkService
;
@Autowired
ExtIEDPlanServiceFeign
extIEDPlanServiceFeign
;
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
changeIEDStatus
(
String
iedStatus
,
DxDocumentVO
documentVO
)
{
//关联的是文档的小版本
SearchQueryCondition
queryCondition
=
SearchUtil
.
buildQuery
(
"targetId"
,
SearchItem
.
Operator
.
EQ
,
documentVO
.
getId
());
DxPageImpl
recursion
=
extIEDPlanDocLinkServiceFeign
.
findRecursion
(
queryCondition
);
ExtIEDPlanDocLinkVO
extIEDPlanDocLinkVO
=
(
ExtIEDPlanDocLinkVO
)
recursion
.
getContent
().
get
(
0
);
Long
iedPlanId
=
extIEDPlanDocLinkVO
.
getSourceId
();
SearchQueryCondition
iedQuery
=
SearchUtil
.
buildQueryWithOpenAttr
(
"sourceId"
,
SearchItem
.
Operator
.
EQ
,
iedPlanId
,
"target"
);
DxPageImpl
targetDocPage
=
extIEDPlanDocLinkServiceFeign
.
findRecursion
(
iedQuery
);
List
<
ExtIEDPlanDocLinkVO
>
content
=
targetDocPage
.
getContent
();
Boolean
isChageIEDStatus
=
true
;
for
(
ExtIEDPlanDocLinkVO
iedPlanDocLinkVO
:
content
)
{
String
state
=
iedPlanDocLinkVO
.
getTarget
().
getState
();
if
(!
Constants
.
DOC_RELEASE
.
equalsIgnoreCase
(
state
)){
isChageIEDStatus
=
false
;
}
}
if
(
isChageIEDStatus
){
extIEDPlanServiceFeign
.
changeStatus
(
iedPlanId
,
iedStatus
,
true
);
}
}
@SneakyThrows
@Override
public
void
generateCatalog
(
Long
docId
)
{
...
...
@@ -1628,6 +1654,8 @@ public class ExtAutoTaskServiceImpl implements ExtAutoTaskService {
interfaceVO
=
(
ExtInterfaceVO
)
extInterfaceService
.
update
(
interfaceVO
);
}
/**
* TODO 获取组织下面 岗位为主设人 的用户
*
...
...
dcs-doc-expand-feign/src/main/java/com/yonde/dcs/document/feign/ExtAutoTaskServiceFeign.java
View file @
c53c3d19
...
...
@@ -24,9 +24,13 @@ import java.util.Map;
**/
@Api
(
tags
=
"ExtAutoTask-FEIGN"
)
@FeignClient
(
value
=
"${dcs.feign.DCS-DOC}"
,
path
=
"/task"
)
public
interface
ExtAutoTaskServiceFeign
{
public
interface
ExtAutoTaskServiceFeign
{
@ApiOperation
(
"客制化修改IED计划状态"
)
@PostMapping
({
"/ied/change"
})
void
changeIEDStatus
(
@RequestParam
(
name
=
"iedStatus"
)
String
iedStatus
,
@RequestBody
DxDocumentVO
documentVO
);
@ApiOperation
(
value
=
"生成图册目录"
,
notes
=
"生成图册目录"
,
httpMethod
=
"GET"
)
@GetMapping
({
"/catalog"
})
void
generateCatalog
(
@RequestParam
(
name
=
"docId"
)
Long
docId
);
...
...
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