Merge branch 'whxr' of http://47.97.1.152:5880/r/rcs-flow into whxr

yy

4 天以前 e2bbbae80c232e386d7f06daab2a1daf2229bbc1

Merge branch 'whxr' of http://47.97.1.152:5880/r/rcs-flow into whxr

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

@@ -34,7 +34,6 @@
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.manager.service.impl.LocStsServiceImpl;
import com.zy.acs.manager.manager.service.impl.WebsocketServiceImpl;
import com.zy.acs.manager.manager.utils.ActionSorter;
import com.zy.acs.manager.system.service.ConfigService;
@@ -143,7 +142,6 @@
        }
        Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, true);
        Integer locStaTaskNum = configService.getVal("LOC_STA_TASK_NUM", Integer.class, 2);


        // 保存任务
        for (Task task : taskList) {
@@ -766,9 +764,10 @@

            boolean first = true;
            for (Segment segment : segmentList) {

                // 分段所属的Task
                Task task = taskService.getById(segment.getTaskId());
                TaskPosDto.PosType posType = Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()));
                boolean isStation = posType.equals(TaskPosDto.PosType.ORI_STA) || posType.equals(TaskPosDto.PosType.DEST_STA);

                // 节点条码
                Code code = codeService.getCacheById(segment.getEndNode());
@@ -792,10 +791,8 @@
                        // 第一步：如果下一个方向正好是作业方向的相反方向，则重置下一个方向为作业方向，标记 reverse = true
                        boolean reverse = false;
                        if (nextDirection.equals((workDirection + 180) % 360)) {
                            List<String> list = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054");
                            if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())).equals(TaskPosDto.PosType.ORI_STA)
                                    || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                    .equals(TaskPosDto.PosType.DEST_STA)) && list.contains(lastCode.getData())) {
                            List<String> list = Arrays.asList("00000050", "00000051", "00000052", "00000053", "00000054", "00000080", "00000081", "00000082", "00000083", "00000084");
                            if (isStation && list.contains(lastCode.getData())) {
                                reverse = false;
                                lastDirection = nextDirection;
                            } else {
@@ -822,9 +819,7 @@
                                    nextDirection = lastDirection;
                                    reverse = true;
                                } else {
                                    if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                            .equals(TaskPosDto.PosType.ORI_STA) || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                            .equals(TaskPosDto.PosType.DEST_STA)) && lastCode.getData().equals("00000050")) {
                                    if (isStation && (lastCode.getData().equals("00000050") || lastCode.getData().equals("00000080"))) {
                                        // turn
                                        reverse = false;
                                        actionList.add(new Action(
@@ -843,7 +838,7 @@
                                                now    // 工作时间
                                        ));
                                        log.info("1TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
                                                Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())),
                                                posType,
                                                lastCode.getData(),
                                                lastCode.getCornerBool(),
                                                nextDirection,
@@ -871,7 +866,7 @@
                                                now    // 工作时间
                                        ));
                                        log.info("2TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
                                                Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())),
                                                posType,
                                                lastCode.getData(),
                                                lastCode.getCornerBool(),
                                                nextDirection,
@@ -880,9 +875,7 @@
                                    lastDirection = nextDirection;
                                }
                            } else {
                                if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                        .equals(TaskPosDto.PosType.ORI_STA) || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                        .equals(TaskPosDto.PosType.DEST_STA)) && lastCode.getData().equals("00000050")) {
                                if (isStation && (lastCode.getData().equals("00000050") || lastCode.getData().equals("00000080"))) {
                                    // turn
                                    reverse = false;
                                    actionList.add(new Action(
@@ -901,7 +894,7 @@
                                            now    // 工作时间
                                    ));
                                    log.info("3TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
                                            Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())),
                                            posType,
                                            lastCode.getData(),
                                            lastCode.getCornerBool(),
                                            nextDirection,
@@ -929,7 +922,7 @@
                                    now    // 工作时间
                            ));
                            log.info("4TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
                                    Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())),
                                    posType,
                                    lastCode.getData(),
                                    lastCode.getCornerBool(),
                                    nextDirection,
@@ -969,10 +962,8 @@
                if (first) {
                    if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
                        Double turnDirection = workDirection;
                        List<String> list = Arrays.asList("00000050","00000051", "00000052", "00000053", "00000054");
                        if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())).equals(TaskPosDto.PosType.ORI_STA)
                                || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                .equals(TaskPosDto.PosType.DEST_STA)) && list.contains(lastCode.getData())) {
                        List<String> list = Arrays.asList("00000050","00000051", "00000052", "00000053", "00000054", "00000080", "00000081", "00000082", "00000083", "00000084");
                        if (isStation && list.contains(lastCode.getData())) {
                            turnDirection = workDirection + 180.0;
                        }
                        if (lastCode.getCornerBool()) {
@@ -993,7 +984,7 @@
                                    now    // 工作时间
                            ));
                            log.info("5TurnCorner posType={}, code={}, corner={}, nextDirection={}, finalAngle={}",
                                    Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType())),
                                    posType,
                                    lastCode.getData(),
                                    lastCode.getCornerBool(),
                                    null,