|
@@ -409,6 +409,41 @@ public class ZZoneServiceImpl extends SuperServiceImpl<ZZoneMapper, ZZone> imple
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
+ public Map getYunjianResourceList(Map<String, Object> map) {
|
|
|
+ String type = map.get("type")==null?"":map.get("type").toString();
|
|
|
+ List <String>list = new ArrayList<String>();
|
|
|
+
|
|
|
+
|
|
|
+ Map returnMap = new HashMap();
|
|
|
+ //查出所有生产资源
|
|
|
+ Map queryMap = new HashMap();
|
|
|
+ queryMap.put("resourceStatus","1");
|
|
|
+ if("1".equals(type)){//保障区
|
|
|
+ queryMap.put("zoneName","保障");
|
|
|
+ }else if("2".equals(type)){//舱体
|
|
|
+ queryMap.put("zoneName","舱体");
|
|
|
+ }else if("3".equals(type)){//矿体
|
|
|
+ queryMap.put("zoneName","矿体");
|
|
|
+ }
|
|
|
+ //生产资源的数据
|
|
|
+ List<Map> resourceList = productionresourceService.getList(queryMap);
|
|
|
+ //转成map
|
|
|
+ Map<String,Object>resourceMap = resourceList.stream(). collect(Collectors.toMap(t->t.get("id").toString(), t->t));
|
|
|
+ //把positon数据存放进去
|
|
|
+ resourceMap = setPositionMap(resourceMap);
|
|
|
+
|
|
|
+ //把线边库拼进去
|
|
|
+ resourceMap = setShelvesMap(resourceMap);
|
|
|
+ ////把任务拼进去
|
|
|
+// resourceMap = setTaskMap(resourceMap);
|
|
|
+
|
|
|
+ List returnList = new ArrayList<>(resourceMap.values());
|
|
|
+ returnMap.put("list",returnList);
|
|
|
+ return returnMap;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public Map demoLineAllResource() {
|
|
|
List <String>list = new ArrayList<String>();
|