|
@@ -811,34 +811,36 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
|
|
|
Map<String, DictionaryItem> controlMap = dictMap.get(DictionaryType.CONTROL_STATUS);
|
|
|
Map<String, DictionaryItem> productionMap = dictMap.get(DictionaryType.PRODUCTION_STATUS);
|
|
|
Map<String, DictionaryItem> categoryMap = dictMap.get(DictionaryType.RESOURCES_CATEGORY);
|
|
|
-
|
|
|
-
|
|
|
- Map <String,Map>equipMap = getEquipListByInterface();
|
|
|
- list.stream().map((item) -> {
|
|
|
- //把三种状态,拼对象进去
|
|
|
+ try{
|
|
|
+ Map <String,Map> equipMap = getEquipListByInterface();
|
|
|
+ list.stream().map((item) -> {
|
|
|
+ //把三种状态,拼对象进去
|
|
|
// String linkStatus = item.get("linkStatus")==null?"0":item.get("linkStatus").toString();
|
|
|
// String controlStatus = item.get("controlStatus")==null?"0":item.get("controlStatus").toString();
|
|
|
// String productionStatus = item.get("productionStatus")==null?"0":item.get("productionStatus").toString();
|
|
|
- String no = item.get("code").toString();
|
|
|
- String controlStatus = equipMap.get(no)==null?"":equipMap.get(no).get("controlStatus").toString();
|
|
|
- String productionStatus = equipMap.get(no)==null?"":equipMap.get(no).get("status").toString();
|
|
|
+ String no = item.get("code").toString();
|
|
|
+ String controlStatus = equipMap.get(no)==null?"":equipMap.get(no).get("controlStatus").toString();
|
|
|
+ String productionStatus = equipMap.get(no)==null?"":equipMap.get(no).get("status").toString();
|
|
|
|
|
|
- //String category = item.get("category")==null?"":item.get("category").toString();
|
|
|
+ //String category = item.get("category")==null?"":item.get("category").toString();
|
|
|
|
|
|
- String showStatus = item.get("showStatus")==null?"0":item.get("showStatus").toString();
|
|
|
- if("1".equals(showStatus)){
|
|
|
+ String showStatus = item.get("showStatus")==null?"0":item.get("showStatus").toString();
|
|
|
+ if("1".equals(showStatus)){
|
|
|
// item.put("linkStatus",buildMap(linkMap.get(linkStatus)));
|
|
|
- item.put("controlStatus",buildMap(controlMap.get(controlStatus)));
|
|
|
- item.put("productionStatus",buildMap(productionMap.get(productionStatus)));
|
|
|
- }else {
|
|
|
+ item.put("controlStatus",buildMap(controlMap.get(controlStatus)));
|
|
|
+ item.put("productionStatus",buildMap(productionMap.get(productionStatus)));
|
|
|
+ }else {
|
|
|
// item.put("linkStatus","");
|
|
|
- item.put("controlStatus","");
|
|
|
- item.put("productionStatus","");
|
|
|
- }
|
|
|
+ item.put("controlStatus","");
|
|
|
+ item.put("productionStatus","");
|
|
|
+ }
|
|
|
|
|
|
- //item.put("category",categoryMap.get(category));
|
|
|
- return item;
|
|
|
- }).collect(Collectors.toList());
|
|
|
+ //item.put("category",categoryMap.get(category));
|
|
|
+ return item;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|