#

Junjie

昨天 9a3dd3c806104ce59abcba635e67355573bd68ac

 src/main/java/com/zy/asrs/controller/BasMapController.java

@@ -178,6 +178,7 @@
            HashMap<Integer, List<StationObjModel>> outStationMap = new HashMap<>();
            HashMap<Integer, List<StationObjModel>> runBlockReassignStationMap = new HashMap<>();
            HashMap<Integer, List<StationObjModel>> isOutOrderStationMap = new HashMap<>();
            HashMap<Integer, List<StationObjModel>> isLiftTransferStationMap = new HashMap<>();

            for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
                Integer lev = entry.getKey();
@@ -275,6 +276,13 @@
                                isOutOrderStationList.add(stationObjModel);
                                isOutOrderStationMap.put(deviceNo, isOutOrderStationList);
                            }

                            Integer isLiftTransfer = value.getInteger("isLiftTransfer");
                            if (isLiftTransfer != null && isLiftTransfer == 1) {
                                List<StationObjModel> isLiftTransferStationList = isLiftTransferStationMap.getOrDefault(deviceNo, new ArrayList<>());
                                isLiftTransferStationList.add(stationObjModel);
                                isLiftTransferStationMap.put(deviceNo, isLiftTransferStationList);
                            }
                        } else if (nodeType.equals("rgv")) {
                            //RGV
                            nodeData.put("type", "rgv");
@@ -325,6 +333,7 @@
                List<StationObjModel> outStationList = outStationMap.get(deviceNo);
                List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.get(deviceNo);
                List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.get(deviceNo);
                List<StationObjModel> isLiftTransferStationList = isLiftTransferStationMap.get(deviceNo);

                if (barcodeStationList != null) {
                    basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
@@ -346,6 +355,10 @@
                    basDevp.setIsOutOrderList(JSON.toJSONString(isOutOrderStationList, SerializerFeature.DisableCircularReferenceDetect));
                }

                if (isLiftTransferStationList != null) {
                    basDevp.setIsLiftTransferList(JSON.toJSONString(isLiftTransferStationList, SerializerFeature.DisableCircularReferenceDetect));
                }

                basDevp.setStationList(JSON.toJSONString(stationList, SerializerFeature.DisableCircularReferenceDetect));
                basDevp.setUpdateTime(new Date());
                basDevpService.insertOrUpdate(basDevp);