#

vincentlu

5 天以前 9d18c1d0644555973de883f0fc888e6ab601fbaa

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

@@ -8,10 +8,7 @@
import com.zy.acs.common.domain.protocol.*;
import com.zy.acs.common.domain.protocol.action.*;
import com.zy.acs.common.enums.*;
import com.zy.acs.common.utils.Base62;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.common.utils.*;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
@@ -895,8 +892,9 @@
     */
    @Transactional
    public synchronized List<PathDto> generateAction(Long agvId, List<Segment> segmentList, List<String> pathList, Date algoStartTime) {
        List<PathDto> pathTrace = new ArrayList<>();
        try {
            if (Cools.isEmpty(agvId, segmentList)) { return; }
            if (Cools.isEmpty(agvId, segmentList)) { return pathTrace; }
            Date now = new Date();
            long actionPrepareSts = ActionStsType.PREPARE.val();
//            JSONObject storeDirection = configService.getVal("storeDirection", JSONObject.class);
@@ -925,6 +923,7 @@
            if (!lastCode.getData().equals(pathList.get(0))) {
                throw new CoolException("AGV[" + agvNo + "]定位偏移...");
            }
            pathTrace.add(new PathDto(lastCode.getData(), lastDirection, false));

            boolean first = true;
            for (Segment segment : segmentList) {
@@ -990,6 +989,7 @@
                                        now    // 工作时间
                                ));
                                lastDirection = nextLaneDir;
                                PathDto.markTurn(pathTrace, lastDirection);
                            }

                            if (nextDirection.equals(oppNextLaneDir)) {
@@ -1058,6 +1058,7 @@
                                        ));

                                        lastDirection = nextDirection;
                                        PathDto.markTurn(pathTrace, lastDirection);
                                    }
                                }
                            }
@@ -1083,6 +1084,7 @@
                            ));

                            lastDirection = nextDirection;
                            PathDto.markTurn(pathTrace, lastDirection);
                        }

                        // run
@@ -1105,6 +1107,7 @@
                        ));

                        lastCode = nextCode;
                        pathTrace.add(new PathDto(lastCode.getData(), lastDirection, false));

                    }

@@ -1150,6 +1153,7 @@
                        ));

                        lastDirection = firstTurnDir;
                        PathDto.markTurn(pathTrace, lastDirection);

                    }
                    first = false;
@@ -1277,6 +1281,7 @@
                                    now    // 工作时间
                            ));
                            lastDirection = oriStaWorkDirection;
                            PathDto.markTurn(pathTrace, lastDirection);
                        }
                        // 计算货叉工作方向
                        actuatorDirectionType = ActuatorDirectionType.fromVal(oriSta.getActDir());
@@ -1342,6 +1347,7 @@
                                    now    // 工作时间
                            ));
                            lastDirection = destStaWorkDirection;
                            PathDto.markTurn(pathTrace, lastDirection);
                        }
                        // 背篓取货
                        if (backupAction) {
@@ -1402,6 +1408,7 @@
                                    now    // 工作时间
                            ));
                            lastDirection = chargeDirection;
                            PathDto.markTurn(pathTrace, lastDirection);
                        }

                        // charge
@@ -1555,7 +1562,8 @@
                throw new BusinessException("group[" + groupId + "] 动作保存失败");
            }

            log.info("{}号Agv动作组装完成，指令数量：{}", agvNo, newActionList.size());
            News.info("{}号Agv动作组装完成，指令数量：{}", agvNo, newActionList.size());
            return pathTrace;
        } catch (Exception e) {
            log.error("mainService.generateAction", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -1611,8 +1619,9 @@
                    task.setUpdateTime(now);
                    if (!taskService.updateById(task)) {
                        throw new BusinessException(task.getSeqNum() + "任务更新失败");
                    }
                }
    }

}
            }

            AgvAction agvAction = new AgvAction(agvNo, actionGroupId);