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
f9faa721
Commit
f9faa721
authored
Mar 14, 2023
by
曹盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
b04feb36
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
15 deletions
+3
-15
EquipmentClassifityEnum.java
...os/boot/module/tzs/api/enums/EquipmentClassifityEnum.java
+1
-1
EquipmentCategoryServiceImpl.java
...le/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
+1
-1
equipCategory.json
...module-tzs-biz/src/main/resources/json/equipCategory.json
+1
-13
No files found.
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/EquipmentClassifityEnum.java
View file @
f9faa721
...
...
@@ -26,7 +26,7 @@ public enum EquipmentClassifityEnum {
//设备认领状态
SBRLZT
(
"设备认领状态"
,
"rlzt"
),
BDLS
(
"八大类树"
,
"eightCategory"
),
RENLING
(
"
认领"
,
"renLing
"
);
RENLING
(
"
其他"
,
"other
"
);
private
String
name
;
private
String
code
;
public
static
Map
<
String
,
String
>
getName
=
new
HashMap
<>();
...
...
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @
f9faa721
...
...
@@ -64,7 +64,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
public
List
<
Map
<
String
,
Object
>>
equipTree
(
String
type
)
{
List
<
Map
<
String
,
Object
>>
menus
=
new
ArrayList
<>();
Map
<
String
,
List
<
Map
<
String
,
Object
>>>
resourceJson
=
JsonUtils
.
getResourceJson
(
equipCategory
);
List
<
Map
<
String
,
Object
>>
mapList
=
new
ArrayList
<>()
;
List
<
Map
<
String
,
Object
>>
mapList
;
if
(
ValidationUtil
.
isEmpty
(
type
))
{
mapList
=
resourceJson
.
get
(
EquipmentClassifityEnum
.
BDLS
.
getCode
());
}
else
{
...
...
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/json/equipCategory.json
View file @
f9faa721
...
...
@@ -41,49 +41,38 @@
"image"
:
"upload/tzs/common/image/总览索道.png"
}
],
"renLing"
:
[
"other"
:
[
{
"name"
:
"电梯"
,
"code"
:
"3000"
},
{
"name"
:
"起重机械"
,
"code"
:
"4000"
},
{
"name"
:
"场内机动车辆"
,
"code"
:
"5000"
},
{
"name"
:
"锅炉"
,
"code"
:
"1000"
},
{
"name"
:
"压力容器"
,
"code"
:
"2000"
},
{
"name"
:
"压力管道"
,
"code"
:
"8000"
},
{
"name"
:
"大型游乐设施"
,
"code"
:
"6000"
},
{
"name"
:
"客运索道"
,
"code"
:
"9000"
}
]
}
\ 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