Commit f9faa721 authored by 曹盼盼's avatar 曹盼盼

修改

parent b04feb36
......@@ -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<>();
......
......@@ -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 {
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment