Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-qc-change-system
Overview
Overview
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
胡园园
yanxuan-qc-change-system
Commits
a9c9bae9
Commit
a9c9bae9
authored
Dec 07, 2022
by
jx-art
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110
parents
4fc39f79
85fa6c21
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
92 additions
and
2 deletions
+92
-2
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+30
-0
AppConfig.java
...com/netease/mail/yanxuan/change/biz/config/AppConfig.java
+7
-0
IusService.java
...tease/mail/yanxuan/change/biz/service/rpc/IusService.java
+51
-0
IEmailService.java
...nxuan/change/integration/email/service/IEmailService.java
+4
-2
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
a9c9bae9
...
...
@@ -43,6 +43,7 @@ import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
import
com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService
;
import
com.netease.mail.yanxuan.change.biz.service.rpc.FlowService
;
import
com.netease.mail.yanxuan.change.biz.service.rpc.ItemService
;
import
com.netease.mail.yanxuan.change.biz.service.rpc.IusService
;
import
com.netease.mail.yanxuan.change.biz.service.rpc.TodoService
;
import
com.netease.mail.yanxuan.change.common.bean.CommonConstants
;
import
com.netease.mail.yanxuan.change.common.bean.RequestLocalBean
;
...
...
@@ -81,7 +82,11 @@ import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowVO;
import
com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemBasicInfoVO
;
import
com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO
;
import
com.netease.mail.yanxuan.change.dal.meta.model.vo.PageVO
;
import
com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum
;
import
com.netease.mail.yanxuan.change.integration.email.service.IEmailService
;
import
com.netease.mail.yanxuan.change.integration.excel.ChangeFlowExcelDTO
;
import
com.netease.mail.yanxuan.change.integration.flow.ius.req.IusDepartmentReq
;
import
com.netease.mail.yanxuan.change.integration.flow.ius.rsp.SecondaryDepartments
;
import
com.netease.mail.yanxuan.change.integration.item.SimplePhyCateGoryResultCo
;
import
com.netease.mail.yanxuan.change.integration.item.meta.SpuTO
;
import
com.netease.mail.yanxuan.change.integration.item.param.BatchQuerySpuInfoParam
;
...
...
@@ -139,6 +144,12 @@ public class ChangeFlowBiz {
@Autowired
private
InteriorChangeConfigService
interiorChangeConfigService
;
@Autowired
private
IEmailService
iEmailService
;
@Autowired
private
IusService
iusService
;
public
String
createAndSubmit
(
ChangeFlowCreateReq
changeFlowCreateReq
)
{
String
uid
=
RequestLocalBean
.
getUid
();
log
.
info
(
"[create] createReq={}, uid:{}"
,
JSON
.
toJSONString
(
changeFlowCreateReq
),
uid
);
...
...
@@ -234,6 +245,25 @@ public class ChangeFlowBiz {
return
flowId
;
}
// todo: 变更发起人≠变更负责人,到达501节点,发送邮件,变更申请
IusDepartmentReq
iusDepartmentReq
=
new
IusDepartmentReq
();
iusDepartmentReq
.
setHasOrgPos
(
true
);
iusDepartmentReq
.
setIcac
(
true
);
iusDepartmentReq
.
setUids
(
Collections
.
singletonList
(
changeCommander
));
HashMap
<
String
,
List
<
SecondaryDepartments
>>
map
=
iusService
.
queryDepartment
(
iusDepartmentReq
);
List
<
SecondaryDepartments
>
secondaryDepartments
=
map
.
get
(
changeCommander
);
List
<
String
>
ccList
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
secondaryDepartments
))
{
ccList
=
secondaryDepartments
.
stream
().
map
(
SecondaryDepartments:
:
getUid
).
collect
(
Collectors
.
toList
());
}
// 变更管理QM,所有邮件都要发
ccList
.
add
(
appConfig
.
getChangeManageQM
());
HashMap
<
String
,
Object
>
param
=
new
HashMap
<>();
param
.
put
(
"changeId"
,
"变更Id"
);
param
.
put
(
"changeSubject"
,
"变更主体"
);
param
.
put
(
"changeType"
,
"变更类型"
);
param
.
put
(
"flowUrl"
,
"工单链接"
);
iEmailService
.
sendEmail
(
Collections
.
singletonList
(
changeCommander
),
ccList
,
param
,
EmailTemplateEnum
.
YX_QC_CHANGE_RELEASE_FLOW
,
Collections
.
singletonList
(
changeRecord
.
getId
().
toString
()));
return
flowId
;
}
...
...
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/config/AppConfig.java
View file @
a9c9bae9
...
...
@@ -38,4 +38,10 @@ public class AppConfig {
@Value
(
"${change.goods.principal.email:grp.gyhtest1001@corp.netease.com}"
)
private
String
defaultEmail
;
/**
* 变更管理QM
*/
@Value
(
"${changeManageQM:cuiyixian@corp.netease.com}"
)
private
String
changeManageQM
;
}
\ No newline at end of file
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/IusService.java
0 → 100644
View file @
a9c9bae9
/**
* @(#)IusService.java, 2022/12/7.
* <p/>
* Copyright 2022 Netease, Inc. All rights reserved.
* NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*/
package
com
.
netease
.
mail
.
yanxuan
.
change
.
biz
.
service
.
rpc
;
import
java.util.HashMap
;
import
java.util.List
;
import
org.apache.poi.ss.formula.functions.T
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
com.alibaba.fastjson.JSON
;
import
com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory
;
import
com.netease.mail.yanxuan.change.common.bean.ResponseCode
;
import
com.netease.mail.yanxuan.change.common.bean.ResponseCodeEnum
;
import
com.netease.mail.yanxuan.change.integration.flow.ius.IusRpcService
;
import
com.netease.mail.yanxuan.change.integration.flow.ius.req.IusDepartmentReq
;
import
com.netease.mail.yanxuan.change.integration.flow.ius.rsp.SecondaryDepartments
;
import
com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse
;
import
lombok.extern.slf4j.Slf4j
;
/**
* @Author zcwang
* @Date 2022/12/7
*/
@Slf4j
@Component
public
class
IusService
{
@Autowired
private
IusRpcService
iusRpcService
;
public
HashMap
<
String
,
List
<
SecondaryDepartments
>>
queryDepartment
(
IusDepartmentReq
iusDepartmentReq
)
{
log
.
info
(
"[queryDepartment] queryDepartment req:{}"
,
JSON
.
toJSONString
(
iusDepartmentReq
));
AjaxResponse
<
HashMap
<
String
,
List
<
SecondaryDepartments
>>>
response
=
iusRpcService
.
queryDepartment
(
iusDepartmentReq
);
HashMap
<
String
,
List
<
SecondaryDepartments
>>
map
;
if
(
ResponseCodeEnum
.
SUCCESS
.
getCode
()
==
response
.
getCode
())
{
map
=
response
.
getData
();
}
else
{
log
.
error
(
"[queryDepartment] queryDepartment failed, query={}, errMsg={}"
,
JSON
.
toJSONString
(
iusDepartmentReq
),
JSON
.
toJSONString
(
response
));
throw
ExceptionFactory
.
createBiz
(
ResponseCode
.
CREATE_FLOW_ERROR
,
"查询部门错误"
);
}
return
map
;
}
}
\ No newline at end of file
yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/IEmailService.java
View file @
a9c9bae9
package
com
.
netease
.
mail
.
yanxuan
.
change
.
integration
.
email
.
service
;
import
com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum
;
import
java.util.Collection
;
import
java.util.HashMap
;
import
java.util.List
;
import
com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum
;
/**
* 发送邮件
*/
...
...
@@ -20,5 +21,6 @@ public interface IEmailService {
* @param emailTemplateEnum 标题枚举
* @param subjectParams 标题参数
*/
void
sendEmail
(
Collection
<
String
>
toList
,
Collection
<
String
>
ccList
,
HashMap
<
String
,
Object
>
map
,
EmailTemplateEnum
emailTemplateEnum
,
List
<
String
>
subjectParams
);
void
sendEmail
(
Collection
<
String
>
toList
,
Collection
<
String
>
ccList
,
HashMap
<
String
,
Object
>
map
,
EmailTemplateEnum
emailTemplateEnum
,
List
<
String
>
subjectParams
);
}
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