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
49bcb1c8
Commit
49bcb1c8
authored
Mar 15, 2025
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
恢复单位变更数据
parent
a119ea02
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
2 deletions
+57
-2
DataHandlerController.java
.../boot/module/jg/biz/controller/DataHandlerController.java
+7
-0
DataHandlerServiceImpl.java
...ot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
+49
-1
JgChangeRegistrationUnitServiceImpl.java
...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
+1
-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/controller/DataHandlerController.java
View file @
49bcb1c8
...
...
@@ -186,4 +186,11 @@ public class DataHandlerController extends BaseController {
return
ResponseHelper
.
buildResponse
(
true
);
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"恢复单位变更数据"
,
notes
=
"恢复单位变更数据"
)
@GetMapping
(
value
=
"/restore"
)
public
ResponseModel
<
Boolean
>
restore
(){
dataHandlerService
.
restore
();
return
ResponseHelper
.
buildResponse
(
true
);
}
}
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/DataHandlerServiceImpl.java
View file @
49bcb1c8
...
...
@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import
com.yeejoin.amos.boot.module.jg.api.mapper.DataHandlerMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper
;
import
com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.*
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum
;
...
...
@@ -91,7 +92,10 @@ public class DataHandlerServiceImpl {
private
final
DataHandlerMapper
dataHandlerMapper
;
private
final
CategoryOtherInfoMapper
categoryOtherInfoMapper
;
private
final
CommonMapper
commonMapper
;
private
final
JgChangeRegistrationUnitServiceImpl
jgChangeRegistrationUnitService
;
private
final
JgChangeRegistrationUnitEqServiceImpl
jgChangeRegistrationUnitEqService
;
private
final
UseInfoMapper
useInfoMapper
;
private
final
TzsServiceFeignClient
tzsServiceFeignClient
;
/**
* 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
...
...
@@ -1064,4 +1068,48 @@ public class DataHandlerServiceImpl {
List
<
KeyValueDto
>
companyList
=
commonMapper
.
queryAllCompanyDict
();
return
companyList
.
stream
().
collect
(
Collectors
.
toMap
(
KeyValueDto:
:
getStrKey
,
KeyValueDto:
:
getStrValue
,
(
k1
,
k2
)->
k1
));
}
public
void
restore
()
{
LambdaQueryWrapper
<
JgChangeRegistrationUnit
>
jgChangeRegistrationUnitWrapper
=
new
LambdaQueryWrapper
<>();
jgChangeRegistrationUnitWrapper
.
orderByAsc
(
JgChangeRegistrationUnit:
:
getRecDate
);
List
<
JgChangeRegistrationUnit
>
changeRegistrationUnits
=
jgChangeRegistrationUnitService
.
list
(
jgChangeRegistrationUnitWrapper
);
for
(
JgChangeRegistrationUnit
changeRegistrationUnit
:
changeRegistrationUnits
)
{
String
status
=
changeRegistrationUnit
.
getStatus
();
String
useUnitName
=
null
;
String
useUnitCreditCode
=
null
;
Date
date
=
null
;
if
(
"已完成"
.
equals
(
status
)){
useUnitName
=
changeRegistrationUnit
.
getNewUseUnitName
();
useUnitCreditCode
=
changeRegistrationUnit
.
getNewUseUnitCreditCode
();
date
=
changeRegistrationUnit
.
getRecDate
();
}
else
{
useUnitName
=
changeRegistrationUnit
.
getUseUnitName
();
useUnitCreditCode
=
changeRegistrationUnit
.
getUseUnitCreditCode
();
date
=
changeRegistrationUnit
.
getCreateDate
();
}
LambdaQueryWrapper
<
JgChangeRegistrationUnitEq
>
unitEqWrapper
=
new
LambdaQueryWrapper
<>();
unitEqWrapper
.
eq
(
JgChangeRegistrationUnitEq:
:
getUnitChangeRegistrationId
,
changeRegistrationUnit
.
getSequenceNbr
());
List
<
JgChangeRegistrationUnitEq
>
changeRegistrationUnitEqs
=
jgChangeRegistrationUnitEqService
.
list
(
unitEqWrapper
);
Map
<
String
,
Map
<
String
,
Object
>>
resultMap
=
new
HashMap
<>();
for
(
JgChangeRegistrationUnitEq
changeRegistrationUnitEq
:
changeRegistrationUnitEqs
)
{
String
equipId
=
changeRegistrationUnitEq
.
getEquId
();
if
(
StringUtils
.
isNotEmpty
(
equipId
)){
LambdaQueryWrapper
<
UseInfo
>
queryWrapper2
=
new
LambdaQueryWrapper
<>();
queryWrapper2
.
eq
(
UseInfo:
:
getRecord
,
equipId
);
UseInfo
useInfo
=
useInfoMapper
.
selectOne
(
queryWrapper2
);
if
(
Objects
.
nonNull
(
useInfo
))
{
useInfo
.
setUseUnitName
(
useUnitName
);
useInfo
.
setUseUnitCreditCode
(
useUnitCreditCode
);
useInfoMapper
.
updateById
(
useInfo
);
}
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
map1
.
put
(
"USE_UNIT_CREDIT_CODE"
,
useUnitCreditCode
);
map1
.
put
(
"USE_UNIT_NAME"
,
useUnitName
);
map1
.
put
(
"REC_DATE"
,
date
);
// 更新时间
resultMap
.
put
(
equipId
,
map1
);
tzsServiceFeignClient
.
commonUpdateEsDataByIds
(
resultMap
);
}
}
}
}
}
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/JgChangeRegistrationUnitServiceImpl.java
View file @
49bcb1c8
...
...
@@ -1391,7 +1391,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
unitEqWrapper
.
eq
(
JgChangeRegistrationUnitEq:
:
getProjectContraptionId
,
sequenceNbr
)
.
eq
(
JgChangeRegistrationUnitEq:
:
getUnitChangeRegistrationId
,
registration
.
getSequenceNbr
())
.
eq
(
JgChangeRegistrationUnitEq:
:
getIsDelete
,
false
);
List
<
JgChangeRegistrationUnitEq
>
changeRegistrationUnitEqs
=
registrationUnitEqService
.
list
();
List
<
JgChangeRegistrationUnitEq
>
changeRegistrationUnitEqs
=
registrationUnitEqService
.
list
(
unitEqWrapper
);
if
(!
CollectionUtils
.
isEmpty
(
changeRegistrationUnitEqs
)){
Map
<
String
,
Map
<
String
,
Object
>>
resultMap
=
new
HashMap
<>();
for
(
JgChangeRegistrationUnitEq
jgChangeRegistrationUnitEq
:
changeRegistrationUnitEqs
)
{
...
...
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