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
5de8ff01
Commit
5de8ff01
authored
Aug 02, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消防系统树和消防建筑树接口参数修改
parent
8d3a985c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
RequestBaseDto.java
...yeejoin/equipmanage/common/entity/dto/RequestBaseDto.java
+8
-0
FireFightingSystemController.java
.../equipmanage/controller/FireFightingSystemController.java
+4
-3
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/RequestBaseDto.java
0 → 100644
View file @
5de8ff01
package
com
.
yeejoin
.
equipmanage
.
common
.
entity
.
dto
;
import
lombok.Data
;
@Data
public
class
RequestBaseDto
{
private
String
bizOrgCode
;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @
5de8ff01
...
...
@@ -8,6 +8,7 @@ import java.util.Map;
import
java.util.concurrent.ConcurrentHashMap
;
import
com.yeejoin.equipmanage.common.entity.*
;
import
com.yeejoin.equipmanage.common.entity.dto.RequestBaseDto
;
import
com.yeejoin.equipmanage.common.utils.SpringUtils
;
import
com.yeejoin.equipmanage.fegin.JcsFeign
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -592,12 +593,12 @@ public class FireFightingSystemController extends AbstractBaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"消防系统树和消防建筑树"
,
notes
=
"树菜单"
)
@GetMapping
(
value
=
"/getBuildingTreeAndSystemTree"
)
public
Map
<
String
,
List
>
getBuildingTreeAndSystemTree
(
@RequestParam
String
bizOrgCode
)
{
public
Map
<
String
,
List
>
getBuildingTreeAndSystemTree
(
RequestBaseDto
dto
)
{
Map
<
String
,
List
>
map
=
new
HashMap
<>();
List
<
BuildingTreeVo
>
buildingTrees
=
buildService
.
getBuildingTreeByBizOrgCode
(
bizOrgCode
);
List
<
BuildingTreeVo
>
buildingTrees
=
buildService
.
getBuildingTreeByBizOrgCode
(
dto
.
getBizOrgCode
()
);
LambdaQueryWrapper
<
FireFightingSystemEntity
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
lambdaQueryWrapper
.
orderByAsc
(
FireFightingSystemEntity:
:
getRecDate
);
lambdaQueryWrapper
.
likeRight
(
StringUtil
.
isNotEmpty
(
bizOrgCode
),
FireFightingSystemEntity:
:
getBizOrgCode
,
bizOrgCode
);
lambdaQueryWrapper
.
likeRight
(
StringUtil
.
isNotEmpty
(
dto
.
getBizOrgCode
()),
FireFightingSystemEntity:
:
getBizOrgCode
,
dto
.
getBizOrgCode
()
);
List
<
FireFightingSystemEntity
>
systemTree
=
fireFightingSystemService
.
list
(
lambdaQueryWrapper
);
systemTree
.
forEach
(
action
->
{
action
.
setDetailListPaneApi
(
ffsEquipAlarmsUrl
);
...
...
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