Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
efc5a214
Commit
efc5a214
authored
Jun 12, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(大编辑):管道增减功能开发
1.公共方法抽取
parent
5a1ac925
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
15 deletions
+13
-15
ChangeRegistrationReformEditUpdateService.java
...tionReform/ChangeRegistrationReformEditUpdateService.java
+1
-7
NewProjectEditUpdateService.java
...t/process/biz/newProject/NewProjectEditUpdateService.java
+1
-1
UseRegisterUpdateService.java
...dit/process/biz/useRegister/UseRegisterUpdateService.java
+2
-6
CommonEquipDataProcessService.java
...biz/edit/process/equip/CommonEquipDataProcessService.java
+9
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/changeRegistrationReform/ChangeRegistrationReformEditUpdateService.java
View file @
efc5a214
...
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity
;
import
com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta
;
import
com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta
;
import
com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto
;
import
com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform
;
...
@@ -18,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
...
@@ -18,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformEqServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformEqServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -99,11 +97,7 @@ public class ChangeRegistrationReformEditUpdateService {
...
@@ -99,11 +97,7 @@ public class ChangeRegistrationReformEditUpdateService {
mainService
.
update
(
updateWrapper
);
mainService
.
update
(
updateWrapper
);
}
else
{
// 完成时,把管道更新为已纳管状态
}
else
{
// 完成时,把管道更新为已纳管状态
// 按照装置id查询装置下管道,更新为已纳管状态
// 按照装置id查询装置下管道,更新为已纳管状态
List
<
IdxBizJgUseInfo
>
useInfos
=
commonEquipDataProcessService
.
getIdxBizJgUseInfoService
().
list
(
new
LambdaQueryWrapper
<
IdxBizJgUseInfo
>().
eq
(
IdxBizJgUseInfo:
:
getProjectContraptionId
,
jgChangeRegistrationReform
.
getProjectContraptionId
()).
eq
(
IdxBizJgUseInfo:
:
getIsIntoManagement
,
false
).
select
(
TzsBaseEntity:
:
getSequenceNbr
,
IdxBizJgUseInfo:
:
getRecord
));
commonEquipDataProcessService
.
updatePipeline2InUse
(
jgChangeRegistrationReform
.
getProjectContraptionId
(),
jgChangeRegistrationReform
.
getUseRegistrationCode
());
useInfos
.
parallelStream
().
forEach
(
e
->
{
commonEquipDataProcessService
.
setNewPipeline2InUseState
(
e
,
jgChangeRegistrationReform
.
getUseRegistrationCode
());
commonEquipDataProcessService
.
updateUseOrgCode2NewPipeline
(
e
,
jgChangeRegistrationReform
.
getUseRegistrationCode
());
});
}
}
// 记录本次维护管道的日志
// 记录本次维护管道的日志
this
.
updatePipelineData
(
allChangeColumns
,
applyNo
,
model
);
this
.
updatePipelineData
(
allChangeColumns
,
applyNo
,
model
);
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/newProject/NewProjectEditUpdateService.java
View file @
efc5a214
...
@@ -33,7 +33,7 @@ public class NewProjectEditUpdateService {
...
@@ -33,7 +33,7 @@ public class NewProjectEditUpdateService {
// 按照装置id查询装置下管道,更新为已纳管状态写入使用登记证编号
// 按照装置id查询装置下管道,更新为已纳管状态写入使用登记证编号
List
<
IdxBizJgUseInfo
>
useInfos
=
useInfoService
.
list
(
new
LambdaQueryWrapper
<
IdxBizJgUseInfo
>().
eq
(
IdxBizJgUseInfo:
:
getProjectContraptionId
,
projectContraptionId
).
eq
(
IdxBizJgUseInfo:
:
getIsIntoManagement
,
false
).
select
(
IdxBizJgUseInfo:
:
getRecord
,
TzsBaseEntity:
:
getSequenceNbr
));
List
<
IdxBizJgUseInfo
>
useInfos
=
useInfoService
.
list
(
new
LambdaQueryWrapper
<
IdxBizJgUseInfo
>().
eq
(
IdxBizJgUseInfo:
:
getProjectContraptionId
,
projectContraptionId
).
eq
(
IdxBizJgUseInfo:
:
getIsIntoManagement
,
false
).
select
(
IdxBizJgUseInfo:
:
getRecord
,
TzsBaseEntity:
:
getSequenceNbr
));
useInfos
.
parallelStream
().
forEach
(
e
->
{
useInfos
.
parallelStream
().
forEach
(
e
->
{
commonEquipDataProcessService
.
setNewPipeline
2In
UseState
(
e
,
projectContraption
.
getUseRegistrationCode
());
commonEquipDataProcessService
.
setNewPipelineUseState
(
e
,
projectContraption
.
getUseRegistrationCode
());
commonEquipDataProcessService
.
updateUseOrgCode2NewPipeline
(
e
,
projectContraption
.
getUseRegistrationCode
());
commonEquipDataProcessService
.
updateUseOrgCode2NewPipeline
(
e
,
projectContraption
.
getUseRegistrationCode
());
});
});
}
}
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java
View file @
efc5a214
...
@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
...
@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.PieLineDataChangeServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.PieLineDataChangeServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgUseInfoServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption
;
...
@@ -86,11 +87,7 @@ public class UseRegisterUpdateService {
...
@@ -86,11 +87,7 @@ public class UseRegisterUpdateService {
jgUseRegistrationService
.
update
(
wrapper
);
jgUseRegistrationService
.
update
(
wrapper
);
}
else
{
// 完成时,把管道更新为已纳管状态
}
else
{
// 完成时,把管道更新为已纳管状态
// 按照装置id查询装置下管道,更新为已纳管状态
// 按照装置id查询装置下管道,更新为已纳管状态
List
<
IdxBizJgUseInfo
>
useInfos
=
jgUseRegistrationService
.
getIdxBizJgUseInfoService
().
list
(
new
LambdaQueryWrapper
<
IdxBizJgUseInfo
>().
eq
(
IdxBizJgUseInfo:
:
getProjectContraptionId
,
useRegistration
.
getProjectContraptionId
()).
eq
(
IdxBizJgUseInfo:
:
getIsIntoManagement
,
false
).
select
(
TzsBaseEntity:
:
getSequenceNbr
,
IdxBizJgUseInfo:
:
getRecord
));
commonEquipDataProcessService
.
updatePipeline2InUse
(
useRegistration
.
getProjectContraptionId
(),
useRegistration
.
getUseRegistrationCode
());
useInfos
.
parallelStream
().
forEach
(
e
->
{
commonEquipDataProcessService
.
setNewPipeline2InUseState
(
e
,
useRegistration
.
getUseRegistrationCode
());
commonEquipDataProcessService
.
updateUseOrgCode2NewPipeline
(
e
,
useRegistration
.
getUseRegistrationCode
());
});
}
}
// 记录本次维护管道的日志
// 记录本次维护管道的日志
this
.
updatePipelineData
(
allChangeColumns
,
applyNo
,
model
);
this
.
updatePipelineData
(
allChangeColumns
,
applyNo
,
model
);
...
@@ -98,7 +95,6 @@ public class UseRegisterUpdateService {
...
@@ -98,7 +95,6 @@ public class UseRegisterUpdateService {
}
}
private
List
<
JgUseRegistrationEq
>
buildPipelineEqs
(
Map
<
String
,
List
<
PipelineChangeItemDto
>>
pipelineChangeItemMap
)
{
private
List
<
JgUseRegistrationEq
>
buildPipelineEqs
(
Map
<
String
,
List
<
PipelineChangeItemDto
>>
pipelineChangeItemMap
)
{
List
<
PipelineChangeItemDto
>
newPipelines
=
pipelineChangeItemMap
.
get
(
EditConstant
.
NEW_PIPELINES
);
List
<
PipelineChangeItemDto
>
newPipelines
=
pipelineChangeItemMap
.
get
(
EditConstant
.
NEW_PIPELINES
);
List
<
PipelineChangeItemDto
>
updPipelines
=
pipelineChangeItemMap
.
get
(
EditConstant
.
UPDATE_PIPELINES
);
List
<
PipelineChangeItemDto
>
updPipelines
=
pipelineChangeItemMap
.
get
(
EditConstant
.
UPDATE_PIPELINES
);
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java
View file @
efc5a214
...
@@ -1127,7 +1127,7 @@ public class CommonEquipDataProcessService {
...
@@ -1127,7 +1127,7 @@ public class CommonEquipDataProcessService {
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
}
}
public
void
setNewPipeline
2In
UseState
(
IdxBizJgUseInfo
useInfo
,
String
useOrgCode
)
{
public
void
setNewPipelineUseState
(
IdxBizJgUseInfo
useInfo
,
String
useOrgCode
)
{
// es 更新为已纳管
// es 更新为已纳管
LambdaUpdateWrapper
<
IdxBizJgUseInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
IdxBizJgUseInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TzsBaseEntity:
:
getSequenceNbr
,
useInfo
.
getSequenceNbr
());
updateWrapper
.
eq
(
TzsBaseEntity:
:
getSequenceNbr
,
useInfo
.
getSequenceNbr
());
...
@@ -1150,4 +1150,12 @@ public class CommonEquipDataProcessService {
...
@@ -1150,4 +1150,12 @@ public class CommonEquipDataProcessService {
updateWrapper
.
set
(
IdxBizJgRegisterInfo:
:
getUseOrgCode
,
useOrgCode
);
updateWrapper
.
set
(
IdxBizJgRegisterInfo:
:
getUseOrgCode
,
useOrgCode
);
jgUseRegistrationService
.
getIdxBizJgRegisterInfoService
().
update
(
updateWrapper
);
jgUseRegistrationService
.
getIdxBizJgRegisterInfoService
().
update
(
updateWrapper
);
}
}
public
void
updatePipeline2InUse
(
String
projectContraptionId
,
String
useRegistrationCode
)
{
List
<
IdxBizJgUseInfo
>
useInfos
=
idxBizJgUseInfoService
.
list
(
new
LambdaQueryWrapper
<
IdxBizJgUseInfo
>().
eq
(
IdxBizJgUseInfo:
:
getProjectContraptionId
,
projectContraptionId
).
eq
(
IdxBizJgUseInfo:
:
getIsIntoManagement
,
false
).
select
(
TzsBaseEntity:
:
getSequenceNbr
,
IdxBizJgUseInfo:
:
getRecord
));
useInfos
.
parallelStream
().
forEach
(
e
->
{
this
.
setNewPipelineUseState
(
e
,
useRegistrationCode
);
this
.
updateUseOrgCode2NewPipeline
(
e
,
useRegistrationCode
);
});
}
}
}
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