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
438bb612
Commit
438bb612
authored
Feb 27, 2025
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【需求】管道变更/单位变更
parent
219e4923
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
0 deletions
+63
-0
JgChangeRegistrationUnitController.java
...jg/biz/controller/JgChangeRegistrationUnitController.java
+13
-0
JgChangeRegistrationUnitServiceImpl.java
...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
+50
-0
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/JgChangeRegistrationUnitController.java
View file @
438bb612
...
@@ -122,6 +122,19 @@ public class JgChangeRegistrationUnitController extends BaseController {
...
@@ -122,6 +122,19 @@ public class JgChangeRegistrationUnitController extends BaseController {
/**
/**
* 根据sequenceNbr查询详情
*
* @param sequenceNbr 主键
* @return ResponseModel
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/projectContraption/details"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个管道工程装置表"
,
notes
=
"根据sequenceNbr查询单个管道工程装置表"
)
public
ResponseModel
<
Map
<
String
,
Map
<
String
,
Object
>>>
detailsByProjectContraption
(
@RequestParam
(
"sequenceNbr"
)
String
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationUnitServiceImpl
.
detailsByProjectContraption
(
sequenceNbr
));
}
/**
* 列表分页查询
* 列表分页查询
*
*
* @param current 当前页
* @param current 当前页
...
...
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 @
438bb612
...
@@ -39,6 +39,7 @@ import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
...
@@ -39,6 +39,7 @@ import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
import
com.yeejoin.amos.feign.workflow.Workflow
;
import
com.yeejoin.amos.feign.workflow.Workflow
;
import
com.yeejoin.amos.feign.workflow.model.*
;
import
com.yeejoin.amos.feign.workflow.model.*
;
import
io.seata.spring.annotation.GlobalTransactional
;
import
io.seata.spring.annotation.GlobalTransactional
;
import
lombok.var
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.redisson.api.RLock
;
import
org.redisson.api.RLock
;
import
org.redisson.api.RedissonClient
;
import
org.redisson.api.RedissonClient
;
...
@@ -2129,4 +2130,52 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
...
@@ -2129,4 +2130,52 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
projectContraptionList
.
forEach
(
item
->
result
.
addAll
(
projectContraptionService
.
getBaseMapper
().
selectEquipList
((
String
)
item
.
get
(
"sequenceNbr"
))));
projectContraptionList
.
forEach
(
item
->
result
.
addAll
(
projectContraptionService
.
getBaseMapper
().
selectEquipList
((
String
)
item
.
get
(
"sequenceNbr"
))));
return
result
;
return
result
;
}
}
public
Map
<
String
,
Map
<
String
,
Object
>>
detailsByProjectContraption
(
String
sequenceNbr
)
{
String
[]
jsonFields
=
{
"PRODUCT_PHOTO"
,
"OTHER_ACCESSORIES"
,
"PRODUCT_QUALIFICATION_CERTIFICATE"
,
"START_LATITUDE_LONGITUDE"
,
"END_LATITUDE_LONGITUDE"
};
Map
<
String
,
Map
<
String
,
Object
>>
resultMap
=
new
HashMap
<>();
if
(
StringUtils
.
isEmpty
(
sequenceNbr
))
{
resultMap
.
put
(
"equipInfo"
,
Collections
.
emptyMap
());
return
resultMap
;
}
//如果单位变更关系表没有管道数据返回空
LambdaQueryWrapper
<
JgChangeRegistrationUnitEq
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
eq
(
JgChangeRegistrationUnitEq:
:
getProjectContraptionId
,
sequenceNbr
)
.
eq
(
JgChangeRegistrationUnitEq:
:
getIsDelete
,
false
);
List
<
JgChangeRegistrationUnitEq
>
changeRegistrationUnitEqs
=
registrationUnitEqService
.
list
(
wrapper
);
if
(
CollUtil
.
isEmpty
(
changeRegistrationUnitEqs
)){
resultMap
.
put
(
"equipInfo"
,
Collections
.
emptyMap
());
return
resultMap
;
}
JgChangeRegistrationUnit
jgChangeRegistrationUnit
=
this
.
baseMapper
.
selectById
(
changeRegistrationUnitEqs
.
get
(
0
).
getUnitChangeRegistrationId
());
//如果历史表没有数据返回空
Map
<
String
,
Object
>
projectContraptionDetail
=
new
HashMap
<>();
JgRegistrationHistory
history
=
registrationHistoryService
.
lambdaQuery
()
.
eq
(
JgRegistrationHistory:
:
getCurrentDocumentId
,
jgChangeRegistrationUnit
.
getApplyNo
())
.
eq
(
JgRegistrationHistory:
:
getIsDelete
,
false
)
.
one
();
JSONArray
historyJson
=
JSON
.
parseArray
(
history
.
getChangeData
());
if
(
CollUtil
.
isEmpty
(
historyJson
)){
resultMap
.
put
(
"equipInfo"
,
Collections
.
emptyMap
());
return
resultMap
;
}
historyJson
.
forEach
(
item
->{
JSONObject
jsonObject
=
JSON
.
parseObject
(
item
.
toString
());
if
(
sequenceNbr
.
equals
(
jsonObject
.
getString
(
"sequenceNbr"
))){
projectContraptionDetail
.
putAll
(
jsonObject
);
}
});
Map
<
String
,
Object
>
projectContraptionMap
=
Optional
.
of
(
projectContraptionDetail
)
.
map
(
map
->
{
commonServiceImpl
.
convertStringToJsonobject
(
map
,
jsonFields
);
List
<
JSONObject
>
pipelineList
=
new
ArrayList
<>();
changeRegistrationUnitEqs
.
forEach
(
item
->
pipelineList
.
add
(
JSON
.
parseObject
(
item
.
getDeviceInfo
())));
map
.
put
(
"pipelineList"
,
pipelineList
);
return
map
;
}).
orElse
(
Collections
.
emptyMap
());
resultMap
.
put
(
"equipInfo"
,
projectContraptionMap
);
return
resultMap
;
}
}
}
\ No newline at end of file
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