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
ddfe5922
Commit
ddfe5922
authored
Feb 05, 2026
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(大编辑) :es顺序
1.写es移动到最后执行
parent
8fd6fe17
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletion
+11
-1
DataRefreshDispatcher.java
...le/common/biz/refresh/dispatch/DataRefreshDispatcher.java
+1
-1
DataDockServiceImpl.java
.../boot/module/jg/biz/service/impl/DataDockServiceImpl.java
+1
-0
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+1
-0
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+8
-0
No files found.
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/refresh/dispatch/DataRefreshDispatcher.java
View file @
ddfe5922
...
@@ -26,7 +26,7 @@ public class DataRefreshDispatcher implements IDataRefreshDispatch {
...
@@ -26,7 +26,7 @@ public class DataRefreshDispatcher implements IDataRefreshDispatch {
public
void
doDispatch
(
List
<
IDataRefreshHandler
>
dataRefreshHandlers
,
List
<
TzsDataRefreshMessage
>
messages
)
{
public
void
doDispatch
(
List
<
IDataRefreshHandler
>
dataRefreshHandlers
,
List
<
TzsDataRefreshMessage
>
messages
)
{
int
total
=
dataRefreshHandlers
.
size
();
int
total
=
dataRefreshHandlers
.
size
();
dataRefreshHandlers
.
forEach
(
dataRefreshHandler
->
{
dataRefreshHandlers
.
forEach
(
dataRefreshHandler
->
{
messages
.
forEach
(
message
->
{
messages
.
parallelStream
().
forEach
(
message
->
{
try
{
try
{
message
.
setDistributions
(
total
);
message
.
setDistributions
(
total
);
dataRefreshHandler
.
doRefresh
(
message
);
dataRefreshHandler
.
doRefresh
(
message
);
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java
View file @
ddfe5922
...
@@ -2048,6 +2048,7 @@ public class DataDockServiceImpl {
...
@@ -2048,6 +2048,7 @@ public class DataDockServiceImpl {
equipmentCategoryDto
.
setSEQUENCE_NBR
(
record
);
equipmentCategoryDto
.
setSEQUENCE_NBR
(
record
);
return
equipmentCategoryDto
;
return
equipmentCategoryDto
;
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
log
.
error
(
"导入失败,开始回滚删除数据:{}"
,
JSONObject
.
toJSONString
(
dtoList
));
esEquipmentCategory
.
deleteAll
(
dtoList
);
esEquipmentCategory
.
deleteAll
(
dtoList
);
}
}
throw
e
;
throw
e
;
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
View file @
ddfe5922
...
@@ -4832,6 +4832,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
...
@@ -4832,6 +4832,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
eventPublisher
.
publish
(
new
EquipCreateOrEditEvent
(
this
,
BusinessTypeEnum
.
JG_NEW_EQUIP
.
name
(),
recordSet
,
EquipCreateOrEditEvent
.
EquipType
.
equip
));
eventPublisher
.
publish
(
new
EquipCreateOrEditEvent
(
this
,
BusinessTypeEnum
.
JG_NEW_EQUIP
.
name
(),
recordSet
,
EquipCreateOrEditEvent
.
EquipType
.
equip
));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
if
(!
esEquipmentCategoryList
.
isEmpty
()){
if
(!
esEquipmentCategoryList
.
isEmpty
()){
log
.
error
(
"导入失败,开始回滚删除数据:{}"
,
JSONObject
.
toJSONString
(
esEquipmentCategoryList
));
esEquipmentCategory
.
deleteAll
(
esEquipmentCategoryList
);
esEquipmentCategory
.
deleteAll
(
esEquipmentCategoryList
);
}
}
throw
e
;
throw
e
;
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @
ddfe5922
...
@@ -3526,9 +3526,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -3526,9 +3526,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
// 报错时回滚
// 报错时回滚
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复老索引设备数据:{}"
,
JSONObject
.
toJSONString
(
equipmentCategoryDtosSnapshot
));
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
}
}
if
(
esEquipmentInfosSnapshot
.
iterator
().
hasNext
()){
if
(
esEquipmentInfosSnapshot
.
iterator
().
hasNext
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复新索引设备数据:{}"
,
JSONObject
.
toJSONString
(
esEquipmentInfosSnapshot
));
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
}
}
throw
new
RuntimeException
(
e
);
throw
new
RuntimeException
(
e
);
...
@@ -3765,9 +3767,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -3765,9 +3767,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
esEquipmentDao
.
saveAll
(
esEquipmentInfoDtoMap
.
values
());
esEquipmentDao
.
saveAll
(
esEquipmentInfoDtoMap
.
values
());
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
if
(!
equipmentCategoryDtosSnapshot
.
isEmpty
()){
if
(!
equipmentCategoryDtosSnapshot
.
isEmpty
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复老索引设备数据:{}"
,
JSONObject
.
toJSONString
(
equipmentCategoryDtosSnapshot
));
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
}
}
if
(!
esEquipmentInfosSnapshot
.
isEmpty
()){
if
(!
esEquipmentInfosSnapshot
.
isEmpty
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复新索引设备数据:{}"
,
JSONObject
.
toJSONString
(
esEquipmentInfosSnapshot
));
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
}
}
throw
new
RuntimeException
(
e
);
throw
new
RuntimeException
(
e
);
...
@@ -3814,9 +3818,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -3814,9 +3818,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 报错时按照快照数据恢复
// 报错时按照快照数据恢复
if
(
oldStatus
.
equals
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
()))
{
if
(
oldStatus
.
equals
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
()))
{
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复老索引设备数据:{}"
,
JSONObject
.
toJSONString
(
equipmentCategoryDtosSnapshot
));
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
}
}
if
(
esEquipmentInfosSnapshot
.
iterator
().
hasNext
()){
if
(
esEquipmentInfosSnapshot
.
iterator
().
hasNext
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复新索引设备数据:{}"
,
JSONObject
.
toJSONString
(
esEquipmentInfosSnapshot
));
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
}
}
}
}
...
@@ -3851,9 +3857,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -3851,9 +3857,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 报错时按照快照数据恢复
// 报错时按照快照数据恢复
if
(
oldStatus
.
equals
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
()))
{
if
(
oldStatus
.
equals
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
()))
{
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复老索引设备数据:{}"
,
JSONObject
.
toJSONString
(
equipmentCategoryDtosSnapshot
));
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
esEquipmentCategory
.
saveAll
(
equipmentCategoryDtosSnapshot
);
}
}
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
if
(
equipmentCategoryDtosSnapshot
.
iterator
().
hasNext
()){
log
.
error
(
"使用登记作废报错开始按照快照恢复新索引设备数据:{}"
,
JSONObject
.
toJSONString
(
equipmentCategoryDtosSnapshot
));
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
esEquipmentDao
.
saveAll
(
esEquipmentInfosSnapshot
);
}
}
}
}
...
...
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