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
b516328b
Commit
b516328b
authored
Aug 02, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):使用登记通过更新es中设备的内部编号
parent
243bcf29
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+4
-3
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/service/impl/JgUseRegistrationServiceImpl.java
View file @
b516328b
...
...
@@ -1290,7 +1290,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useInfo
.
setIsIntoManagement
(
Boolean
.
TRUE
);
useInfoMapper
.
updateById
(
useInfo
);
// 更新es
updateEsData
(
usePlace
,
mapData
,
otherInfo
,
jgUseRegistration
,
jsonObject
);
updateEsData
(
usePlace
,
mapData
,
otherInfo
,
useInfo
,
jgUseRegistration
,
jsonObject
);
jgResumeInfoService
.
createWithModel
(
JgResumeInfoDto
.
builder
()
.
applyNo
(
jgUseRegistration
.
getApplyNo
())
.
businessType
(
BusinessTypeEnum
.
JG_USAGE_REGISTRATION
.
getName
())
...
...
@@ -1375,7 +1375,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return
codeUtil
.
generateEquipmentCode
(
codeGenerateDto
);
}
public
void
updateEsData
(
String
usePlace
,
JSONObject
dataMap
,
IdxBizJgOtherInfo
otherInfo
,
public
void
updateEsData
(
String
usePlace
,
JSONObject
dataMap
,
IdxBizJgOtherInfo
otherInfo
,
IdxBizJgUseInfo
useInfo
,
JgUseRegistration
jgUseRegistration
,
JSONObject
jsonObject
)
{
// 更新es
HashMap
<
String
,
Map
<
String
,
Object
>>
objMap
=
new
HashMap
<>();
...
...
@@ -1391,6 +1391,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
param
.
put
(
"USE_PLACE"
,
usePlace
);
param
.
put
(
"STATUS"
,
"已认领"
);
param
.
put
(
"EQU_STATE"
,
1
);
param
.
put
(
"USE_INNER_CODE"
,
useInfo
.
getUseInnerCode
());
param
.
put
(
"IS_INTO_MANAGEMENT"
,
true
);
param
.
put
(
"USE_PLACE_CODE"
,
jsonObject
.
get
(
"province"
)
+
"#"
+
jsonObject
.
get
(
"city"
)
+
"#"
+
jsonObject
.
get
(
"county"
)
+
"#"
+
jsonObject
.
get
(
"factoryUseSiteStreet"
));
param
.
put
(
"USE_SITE_CODE"
,
String
.
valueOf
(
jsonObject
.
get
(
"usePlace"
)));
...
...
@@ -2845,7 +2846,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
this
.
createCode
(
map
,
jgUseRegistration
,
registerInfo
,
useInfo
,
otherInfo
);
map
.
put
(
"equCode"
,
equCode
);
// 更新es
this
.
updateEsData
(
usePlace
,
map
,
otherInfo
,
jgUseRegistration
,
map
);
this
.
updateEsData
(
usePlace
,
map
,
otherInfo
,
useInfo
,
jgUseRegistration
,
map
);
this
.
updateById
(
jgUseRegistration
);
// 设备安装信息更新
...
...
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