#

vincentlu

8 天以前 a71d7a7a4b437a718e68ec41dcecd30ee7ff55e7

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -293,7 +293,8 @@
                            currSeg.setState(SegmentStateType.INIT.toString());
                            currSeg.setUpdateTime(now);
                            if (!segmentService.updateById(currSeg)) {
                                log.error("Segment [{}] failed to update ！！！", currSeg.getGroupId() + " - " + currSeg.getSerial());
//                                log.error("Segment [{}] failed to update ！！！", currSeg.getGroupId() + " - " + currSeg.getSerial());
                                throw new CoolException("failed to update segment [" + currSeg.getGroupId() + "-" + currSeg.getSerial() + "] failed");
                            }

                            // new oriSta seg
@@ -310,7 +311,8 @@
                            loadSeg.setCreateTime(now);
                            loadSeg.setUpdateTime(now);
                            if (!segmentService.save(loadSeg)) {
                                log.error("Segment [{}] failed to save ！！！", loadSeg.getTravelId() + " - " + loadSeg.getSerial());
//                                log.error("Segment [{}] failed to save ！！！", loadSeg.getTravelId() + " - " + loadSeg.getSerial());
                                throw new CoolException("failed to save segment [" + loadSeg.getGroupId() + "-" + loadSeg.getSerial() + "] failed");
                            }

                            // place segment
@@ -382,28 +384,11 @@
                                throw new BusinessException("failed to locate new destination in sorted list");
                            }

                            // 后继点 todo
                            // 后继点
                            if (idx + 1 == destPosList.size()) {
                                placeSegSerial = destSegList.get(destSegList.size() - 1).getSerial() + 1;
                            } else {
                                TaskPosDto afterTaskPos = destPosList.get(idx);
                                Segment afterSeg = destSegList.stream()
                                        .filter(destSeg -> Objects.equals(destSeg.getId(), afterTaskPos.getSegId()))
                                        .findFirst()
                                        .orElse(null);
                                if (null == afterSeg) {
                                    placeSegSerial = destSegList.get(destSegList.size() - 1).getSerial() + 1;
                                } else {
                                    placeSegSerial = afterSeg.getSerial();
                                }
                            }

                            // todo
                            TaskPosDto afterTaskPos = (idx + 1) <= destPosList.size() ? destPosList.get(idx) : null;
                            if (null == afterTaskPos) {
                                // loadSeg is the last one
                                placeSegSerial = destSegList.get(destSegList.size() - 1).getSerial() + 1;
                            } else {
                                TaskPosDto afterTaskPos = destPosList.get(idx + 1);
                                Segment afterSeg = destSegList.stream()
                                        .filter(destSeg -> Objects.equals(destSeg.getId(), afterTaskPos.getSegId()))
                                        .findFirst()
@@ -440,7 +425,8 @@
                            placeSeg.setCreateTime(now);
                            placeSeg.setUpdateTime(now);
                            if (!segmentService.save(placeSeg)) {
                                log.error("Segment [{}] failed to save ！！！", placeSeg.getTravelId() + " - " + placeSeg.getSerial());
//                                log.error("Segment [{}] failed to save ！！！", placeSeg.getTravelId() + " - " + placeSeg.getSerial());
                                throw new CoolException("failed to save segment [" + placeSeg.getGroupId() + "-" + placeSeg.getSerial() + "] failed");
                            }

                            // update task