Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-plan
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-plan
Commits
283a46cf
Commit
283a46cf
authored
Oct 15, 2024
by
wangqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改IED 获取项目代号
parent
32d4db3e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
IEDPlanExcelListenner.java
...m/yonde/dcs/plan/core/listener/IEDPlanExcelListenner.java
+4
-0
ExtIEDPlanServiceImpl.java
...nde/dcs/plan/core/service/impl/ExtIEDPlanServiceImpl.java
+4
-4
UserUtils.java
...src/main/java/com/yonde/dcs/plan/core/util/UserUtils.java
+4
-0
No files found.
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/listener/IEDPlanExcelListenner.java
View file @
283a46cf
...
@@ -289,6 +289,9 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
...
@@ -289,6 +289,9 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
}
}
extIEDPlanVO
.
setEditor
(
extIEDPlanExcelVO
.
getEditor
());
extIEDPlanVO
.
setEditor
(
extIEDPlanExcelVO
.
getEditor
());
Map
<
String
,
Object
>
dynamicAttrs
=
new
HashMap
<>();
dynamicAttrs
.
put
(
"editorName"
,
userUtils
.
getUserById
(
Long
.
valueOf
(
extIEDPlanExcelVO
.
getEditor
())));
extIEDPlanVO
.
setDynamicAttrs
(
dynamicAttrs
);
extIEDPlanVO
.
setChecker
(
extIEDPlanExcelVO
.
getChecker
());
extIEDPlanVO
.
setChecker
(
extIEDPlanExcelVO
.
getChecker
());
extIEDPlanVO
.
setAuditor
(
extIEDPlanExcelVO
.
getAuditor
());
extIEDPlanVO
.
setAuditor
(
extIEDPlanExcelVO
.
getAuditor
());
extIEDPlanVO
.
setInvestigator
(
extIEDPlanExcelVO
.
getInvestigator
());
extIEDPlanVO
.
setInvestigator
(
extIEDPlanExcelVO
.
getInvestigator
());
...
@@ -299,6 +302,7 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
...
@@ -299,6 +302,7 @@ public class IEDPlanExcelListenner extends AnalysisEventListener<ExtIEDPlanExcel
extIEDPlanVO
.
setSecretCode
(
secretCode
);
extIEDPlanVO
.
setSecretCode
(
secretCode
);
extIEDPlanVO
.
setDxContextId
(
Long
.
parseLong
(
projectId
));
extIEDPlanVO
.
setDxContextId
(
Long
.
parseLong
(
projectId
));
}
}
public
ExtIEDPlanVO
getIEDPlanByFileNumber
(
String
fileNumber
)
{
public
ExtIEDPlanVO
getIEDPlanByFileNumber
(
String
fileNumber
)
{
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtIEDPlanServiceImpl.java
View file @
283a46cf
...
@@ -206,13 +206,13 @@ public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> implements ExtIEDPlan
...
@@ -206,13 +206,13 @@ public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> implements ExtIEDPlan
dynamicAttrs
.
put
(
"editor"
,
extIEDPlanVO
.
getEditor
());
dynamicAttrs
.
put
(
"editor"
,
extIEDPlanVO
.
getEditor
());
//设置动态属性
//设置动态属性
dxDocumentVO
.
setDynamicAttrs
(
dynamicAttrs
);
dxDocumentVO
.
setDynamicAttrs
(
dynamicAttrs
);
//设备号
// dxDocumentExpand.setOwnedEquipment(extIEDPlanVO.getDeviceNumber());
//创建时间
//创建时间
dxDocumentVO
.
setCreateTime
(
LocalDateTime
.
now
());
dxDocumentVO
.
setCreateTime
(
LocalDateTime
.
now
());
//文档扩展类的设备号
dxDocumentExpand
.
setOwnedEquipment
(
extIEDPlanVO
.
getDeviceNumber
());
//文档扩展类的项目代号
dxDocumentExpand
.
setProjectCode
(
extIEDPlanVO
.
getDxContext
().
getNumber
());
//设置扩展属性
//设置扩展属性
//项目代号
//todo wq项目代号暂时还未取到
dxDocumentVO
.
setDxDocumentExpand
(
dxDocumentExpand
);
dxDocumentVO
.
setDxDocumentExpand
(
dxDocumentExpand
);
dxDocumentVO
.
setOperator
(
OperatorType
.
ADD
);
dxDocumentVO
.
setOperator
(
OperatorType
.
ADD
);
DxDocumentVO
dxDocumentVOForDB
=
extDxDocumentServiceFeign
.
saveRecursion
(
dxDocumentVO
);
DxDocumentVO
dxDocumentVOForDB
=
extDxDocumentServiceFeign
.
saveRecursion
(
dxDocumentVO
);
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/util/UserUtils.java
View file @
283a46cf
...
@@ -18,4 +18,8 @@ public class UserUtils {
...
@@ -18,4 +18,8 @@ public class UserUtils {
public
DxUserInfoVO
getUserByName
(
String
name
){
public
DxUserInfoVO
getUserByName
(
String
name
){
return
dxUserInfoFeign
.
getUserByName
(
name
);
return
dxUserInfoFeign
.
getUserByName
(
name
);
}
}
public
DxUserInfoVO
getUserById
(
Long
id
){
return
dxUserInfoFeign
.
getByUserId
(
id
);
}
}
}
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