Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apps-collaboration
Project
Project
Details
Activity
Releases
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
高燕
apps-collaboration
Commits
2fa47794
Commit
2fa47794
authored
Aug 20, 2020
by
gaoyan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交,终止接口修改
parent
59b358e3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
128 additions
and
3 deletions
+128
-3
CollaborationController.java
...pps/collaboration/controller/CollaborationController.java
+128
-3
No files found.
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @
2fa47794
...
...
@@ -9,6 +9,7 @@ import com.seeyon.apps.collaboration.bo.LockObject;
import
com.seeyon.apps.collaboration.constants.ColConstant
;
import
com.seeyon.apps.collaboration.enums.ColOpenFrom
;
import
com.seeyon.apps.collaboration.enums.ColQueryCondition
;
import
com.seeyon.apps.collaboration.enums.CollaborationEnum
;
import
com.seeyon.apps.collaboration.event.CollaborationAffairPrintEvent
;
import
com.seeyon.apps.collaboration.manager.ColLockManager
;
import
com.seeyon.apps.collaboration.manager.ColManager
;
...
...
@@ -25,6 +26,10 @@ import com.seeyon.apps.secret.util.SecretUtil;
import
com.seeyon.apps.supervision.api.SupervisionApi
;
import
com.seeyon.apps.taskmanage.util.MenuPurviewUtil
;
import
com.seeyon.cap4.form.api.FormApi4Cap4
;
import
com.seeyon.cap4.form.bean.FormBean
;
import
com.seeyon.cap4.form.bean.FormDataMasterBean
;
import
com.seeyon.cap4.form.service.CAP4FormManager
;
import
com.seeyon.client.CTPRestClient
;
import
com.seeyon.ctp.cap.api.manager.CAPFormManager
;
import
com.seeyon.ctp.common.AppContext
;
import
com.seeyon.ctp.common.ModuleType
;
...
...
@@ -108,6 +113,8 @@ import com.seeyon.v3x.peoplerelate.manager.PeopleRelateManager;
import
net.joinwork.bpm.definition.BPMProcess
;
import
org.apache.commons.lang.StringEscapeUtils
;
import
org.apache.commons.logging.Log
;
import
org.springframework.http.*
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.servlet.ModelAndView
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -152,6 +159,10 @@ public class CollaborationController extends BaseController {
private
ReportResultApi
reportResultApi
;
private
DataRelationApi
dataRelationApi
;
private
CAP4FormManager
cap4FormManager
;
private
CTPRestClient
client
=
null
;
public
MenuPurviewUtil
getMenuPurviewUtil
()
{
return
menuPurviewUtil
;
}
...
...
@@ -335,6 +346,15 @@ public class CollaborationController extends BaseController {
public
void
setTrackManager
(
CtpTrackMemberManager
trackManager
)
{
this
.
trackManager
=
trackManager
;
}
public
CAP4FormManager
getCap4FormManager
()
{
return
cap4FormManager
;
}
public
void
setCap4FormManager
(
CAP4FormManager
cap4FormManager
)
{
this
.
cap4FormManager
=
cap4FormManager
;
}
public
void
setHandoverManager
(
HandoverManager
handoverManager
)
{
this
.
handoverManager
=
handoverManager
;
}
...
...
@@ -2297,6 +2317,78 @@ public class CollaborationController extends BaseController {
colManager
.
transFinishWorkItem
(
summary
,
affair
,
params
);
//调用门户接口,告诉门户流程状态
if
(
templateId
!=
null
&&
!
Long
.
valueOf
(
0
).
equals
(
templateId
)
&&
!
Long
.
valueOf
(-
1
).
equals
(
templateId
)){
CtpTemplate
ctpTemplate
=
templateManager
.
getCtpTemplate
(
templateId
);
if
(
null
!=
ctpTemplate
.
getTempleteNumber
()){
// 判断是外部调用校稿的流程,属于校稿流程,并是最后一个节点,调用门户接口
boolean
isFinished
=
Integer
.
valueOf
(
CollaborationEnum
.
flowState
.
finish
.
ordinal
()).
equals
(
summary
.
getState
())
||
Integer
.
valueOf
(
CollaborationEnum
.
flowState
.
terminate
.
ordinal
()).
equals
(
summary
.
getState
());
String
DIC_DATA_URL
=
"http://127.0.0.1:8000/updateMhState"
;
RestTemplate
restTemplate
=
new
RestTemplate
();
HttpHeaders
headers
=
new
HttpHeaders
();
headers
.
setContentType
(
MediaType
.
APPLICATION_JSON
);
if
(
"JGLC"
.
equals
(
ctpTemplate
.
getTempleteNumber
())
&&
isFinished
){
// 调用外部接口
/**
CTPServiceClientManager clientManager = CTPServiceClientManager.getInstance("http://127.0.0.1:8000");
client = clientManager.getRestClient();
String username = "fjxz";
String psd = "1qaz2wsx3edc";
String result[] = client.get("updateState?token=", String[].class);
**/
Long
formappid
=
summary
.
getFormAppid
()
;
Long
formrecordid
=
summary
.
getFormRecordid
()
;
FormBean
formBean
=
cap4FormManager
.
getForm
(
formappid
,
false
)
;
FormDataMasterBean
master
=
cap4FormManager
.
getDataMasterBeanById
(
formrecordid
,
formBean
,
null
)
;
String
namekey
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"编号"
).
getName
();
String
code
=
(
String
)
master
.
getAllDataMap
().
get
(
namekey
);
String
reqJsonStr
=
"{\"id\":\""
+
code
+
"\", \"state\":\"1\"}"
;
HttpEntity
<
String
>
entity
=
new
HttpEntity
<
String
>(
reqJsonStr
,
headers
);
ResponseEntity
<
Map
>
resp
=
restTemplate
.
exchange
(
DIC_DATA_URL
,
HttpMethod
.
POST
,
entity
,
Map
.
class
);
}
// 判断是外部调用下单的流程
if
(
"XDLC"
.
equals
(
ctpTemplate
.
getTempleteNumber
())
&&
isFinished
){
// 调用外部接口,修改门户订单状态,并将最终审核后的数据提交给OA,此时相关填写数据已修改
Long
formappid
=
summary
.
getFormAppid
()
;
Long
formrecordid
=
summary
.
getFormRecordid
()
;
FormBean
formBean
=
cap4FormManager
.
getForm
(
formappid
,
false
)
;
FormDataMasterBean
master
=
cap4FormManager
.
getDataMasterBeanById
(
formrecordid
,
formBean
,
null
)
;
String
namekey
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"编号"
).
getName
();
String
code
=
(
String
)
master
.
getAllDataMap
().
get
(
namekey
);
String
namekeypageSize
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"开型"
).
getName
();
String
pageSize
=
(
String
)
master
.
getAllDataMap
().
get
(
namekeypageSize
);
String
namekeycover
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"封面工艺"
).
getName
();
String
cover
=
(
String
)
master
.
getAllDataMap
().
get
(
namekeycover
);
String
namekeycoverSize
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"封面纸张"
).
getName
();
String
coverSize
=
(
String
)
master
.
getAllDataMap
().
get
(
namekeycoverSize
);
String
namekeynevinSize
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"内文纸张"
).
getName
();
String
nevinSize
=
(
String
)
master
.
getAllDataMap
().
get
(
namekeynevinSize
);
String
namekeyinsertSize
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"插页纸张"
).
getName
();
String
insertSize
=
(
String
)
master
.
getAllDataMap
().
get
(
namekeyinsertSize
);
String
namekeymachinetype
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"装订方式"
).
getName
();
String
machinetype
=
(
String
)
master
.
getAllDataMap
().
get
(
namekeymachinetype
);
String
namekeydistribution
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"配送方式"
).
getName
();
String
distribution
=
(
String
)
master
.
getAllDataMap
().
get
(
namekeydistribution
);
String
reqJsonStr
=
"{\"id\":\""
+
code
+
"\",\"pageSize\":\""
+
pageSize
+
"\",\"cover\":\""
+
cover
+
"\",\"coverSize\":\""
+
coverSize
+
"\",\"nevinSize\":\""
+
nevinSize
+
"\",\"insertSize\":\""
+
insertSize
+
"\",\"machinetype\":\""
+
machinetype
+
"\",\"distribution\":\""
+
distribution
+
"\",\"state\":\"1\"}"
;
HttpEntity
<
String
>
entity
=
new
HttpEntity
<
String
>(
reqJsonStr
,
headers
);
ResponseEntity
<
Map
>
resp
=
restTemplate
.
exchange
(
DIC_DATA_URL
,
HttpMethod
.
POST
,
entity
,
Map
.
class
);
}
};
}
StringBuilder
successJson
=
new
StringBuilder
();
...
...
@@ -2310,7 +2402,7 @@ public class CollaborationController extends BaseController {
}
catch
(
BusinessException
e
){
LOG
.
error
(
"协同
提交
报错"
,
e
);
LOG
.
error
(
"协同
0
报错"
,
e
);
StringBuilder
errorJson
=
new
StringBuilder
();
...
...
@@ -2472,6 +2564,39 @@ public class CollaborationController extends BaseController {
tempMap
.
put
(
"templateColSubject"
,
templateMap
.
get
(
"templateColSubject"
));
tempMap
.
put
(
"templateWorkflowId"
,
templateMap
.
get
(
"templateWorkflowId"
));
colManager
.
transStepStop
(
tempMap
);
//停止过程中修改门户数据
CtpAffair
currentAffair
=
affairManager
.
get
(
Long
.
parseLong
(
affairId
));
if
(
null
!=
currentAffair
.
getTempleteId
()
&&
!
Long
.
valueOf
(
0
).
equals
(
currentAffair
.
getTempleteId
())
&&
!
Long
.
valueOf
(-
1
).
equals
(
currentAffair
.
getTempleteId
()))
{
CtpTemplate
ctpTemplate
=
templateManager
.
getCtpTemplate
(
currentAffair
.
getTempleteId
());
if
(
null
!=
ctpTemplate
.
getTempleteNumber
()
&&
(
"JGLC"
.
equals
(
ctpTemplate
.
getTempleteNumber
())
||
"XDLC"
.
equals
(
ctpTemplate
.
getTempleteNumber
())))
{
ColSummary
summary
=
colManager
.
getSummaryById
(
currentAffair
.
getObjectId
());
Long
formappid
=
summary
.
getFormAppid
()
;
Long
formrecordid
=
summary
.
getFormRecordid
()
;
FormBean
formBean
=
cap4FormManager
.
getForm
(
formappid
,
false
)
;
FormDataMasterBean
master
=
cap4FormManager
.
getDataMasterBeanById
(
formrecordid
,
formBean
,
null
)
;
String
namekey
=
master
.
getFormTable
().
getFieldMap4Display
().
get
(
"编号"
).
getName
();
String
code
=
(
String
)
master
.
getAllDataMap
().
get
(
namekey
);
// 调用外部接口
/**
CTPServiceClientManager clientManager = CTPServiceClientManager.getInstance("http://127.0.0.1:8000");
client = clientManager.getRestClient();
String username = "fjxz";
String psd = "1qaz2wsx3edc";
String result[] = client.get("updateState?token=", String[].class);
**/
String
DIC_DATA_URL
=
"http://127.0.0.1:8000/updateMhState"
;
RestTemplate
restTemplate
=
new
RestTemplate
();
String
reqJsonStr
=
"{\"id\":\""
+
code
+
"\", \"state\":\"4\"}"
;
HttpHeaders
headers
=
new
HttpHeaders
();
headers
.
setContentType
(
MediaType
.
APPLICATION_JSON
);
HttpEntity
<
String
>
entity
=
new
HttpEntity
<
String
>(
reqJsonStr
,
headers
);
ResponseEntity
<
Map
>
resp
=
restTemplate
.
exchange
(
DIC_DATA_URL
,
HttpMethod
.
POST
,
entity
,
Map
.
class
);
}
}
}
finally
{
if
(
isLock
){
...
...
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