From a079fff1e7bae25a5e29f73709b8e9972216f7ef Mon Sep 17 00:00:00 2001 From: vincentlu <t1341870251@gmail.com> Date: 星期二, 21 一月 2025 15:20:29 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java index 59ca80b..cbe8b0c 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java @@ -250,7 +250,7 @@ try { // valid ----------------------------------------------- Agv agv = agvService.getById(agvId); - if (!agvService.judgeEnable(agv.getId(), true)) { + if (!agvService.judgeEnable(agv.getId(), false)) { return; } if (!Cools.isEmpty(taskService.selectInSts(agvId, TaskStsType.ASSIGN, TaskStsType.PROGRESS))) { @@ -653,9 +653,9 @@ // JSONObject storeDirection = configService.getVal("storeDirection", JSONObject.class); int angleOffsetVal = configService.getVal("mapAngleOffsetVal", Integer.class); String agvNo = agvService.getAgvNo(agvId); - if (!agvService.judgeEnable(agvId)) { - throw new CoolException("AGV[" + agvNo + "]褰撳墠涓嶅彲鐢�..."); - } +// if (!agvService.judgeEnable(agvId)) { +// throw new CoolException("AGV[" + agvNo + "]褰撳墠涓嶅彲鐢�..."); +// } AgvModel agvModel = agvModelService.getByAgvId(agvId); Double workDirection = agvModel.getWorkDirection(); @@ -989,26 +989,19 @@ now // 宸ヤ綔鏃堕棿 )); -// List<Action> newActionList = new ArrayList<>(actionList); - -// List<Action> optimizeList = actionService.optimizeSort(actionList); - - List<Action> optimizeList = actionSorter.optimizeSort(actionList); - List<Action> newActionList = new ArrayList<>(optimizeList); - - + List<Action> newActionList = actionSorter.optimizeSort(actionList); String groupId = String.valueOf(snowflakeIdWorker.nextId()).substring(3); // save action int i = newActionList.size(); for (Action action : newActionList) { - action.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3)); +// action.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3)); action.setGroupId(groupId); action.setPriority(i); - if (!actionService.save(action)) { - throw new BusinessException(action.getName() + "鍔ㄤ綔淇濆瓨澶辫触"); - } i -= 1; + } + if (!actionService.saveBatch(newActionList)) { + throw new BusinessException("group[" + groupId + "] 鍔ㄤ綔淇濆瓨澶辫触"); } // update segment @@ -1057,9 +1050,9 @@ action.setStartTime(now); action.setIoTime(now); action.setUpdateTime(now); - if (!actionService.updateById(action)) { - throw new BusinessException(action.getPriority() + " - " + action.getName() + "鍔ㄤ綔鏇存柊澶辫触"); - } + } + if (!actionService.updateBatchById(actionList)) { + throw new BusinessException("failed to update action batch !!!"); } // task -- Gitblit v1.9.1