From 9d803fd9429f424648adab46d25f6c0bb49747ee Mon Sep 17 00:00:00 2001 From: vincentlu <t1341870251@gmail.com> Date: 星期一, 13 一月 2025 10:17:22 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java | 16 ++++---- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 4 +- zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java | 13 +++++- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 4 +- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java | 4 +- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 10 ++-- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 24 ++++++------ zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 4 +- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 6 +- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 6 +- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java | 4 +- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 2 21 files changed, 61 insertions(+), 54 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java index 0c39768..3fc2bfb 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java @@ -108,11 +108,18 @@ // codeMatrixIdxList.add(codeMatrixIdx); // } - List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(null, path); +// List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(null, path); // System.out.println(codeMatrixIdxList.toString()); - return R.ok().add(codeMatrixIdxList); +// return R.ok().add(codeMatrixIdxList); + + for (String codeData : path) { + Code code = codeService.getCacheByData(codeData); + Code byId = codeService.getCacheById(code.getId()); + } + + return R.ok(); } // @RequestMapping(value = "/system/route/generate", method = {RequestMethod.GET, RequestMethod.POST}) @@ -136,7 +143,7 @@ for (int i = 0; i < standbyFunStaList.size(); i++) { FuncSta funcSta = standbyFunStaList.get(i); - Code code = codeService.getById(funcSta.getCode()); + Code code = codeService.getCacheById(funcSta.getCode()); Agv agv = agvList.get(i); AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId()); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java index ca9ccbe..ccf9def 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java @@ -104,7 +104,7 @@ case MOVE: Code endCode = null; if (!Cools.isEmpty(param.getEndCode())) { - endCode = codeService.getById(param.getEndCode()); + endCode = codeService.getCacheById(param.getEndCode()); } if (!Cools.isEmpty(param.getEndCodeStr())) { endCode = codeService.getCacheByData(param.getEndCodeStr()); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java index 771fe7f..860ee60 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java @@ -84,7 +84,7 @@ if (null == agvDetail) { continue; } Long recentCode = agvDetail.getRecentCode(); if (null == recentCode) { continue; } - Code code = codeService.getById(recentCode); + Code code = codeService.getCacheById(recentCode); if (null == code) { continue; } MapWsAgvVo vo = new MapWsAgvVo(); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java index 5d6cdb2..67c5841 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java @@ -198,7 +198,7 @@ // distance // from AgvDetail agvDetail = agvDetailService.selectByAgvId(agvId); - Code agvCurrCode = codeService.getById(agvDetail.getRecentCode()); + Code agvCurrCode = codeService.getCacheById(agvDetail.getRecentCode()); Double[] fromPosition = new Double[]{agvCurrCode.getX(), agvCurrCode.getY()}; // to Code firstCode = null; @@ -207,20 +207,20 @@ case LOC_TO_LOC: case LOC_TO_STA: Loc oriLoc = locService.getById(task.getOriLoc()); - firstCode = codeService.getById(oriLoc.getCode()); + firstCode = codeService.getCacheById(oriLoc.getCode()); break; case STA_TO_LOC: case STA_TO_STA: Sta oriSta = staService.getById(task.getOriSta()); - firstCode = codeService.getById(oriSta.getCode()); + firstCode = codeService.getCacheById(oriSta.getCode()); break; case TO_CHARGE: case TO_STANDBY: case MOVE: - firstCode = codeService.getById(task.getDestCode()); + firstCode = codeService.getCacheById(task.getDestCode()); break; default: - firstCode = codeService.getById(task.getDestCode()); + firstCode = codeService.getCacheById(task.getDestCode()); break; } assert null != firstCode; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java index aab566b..3b45a5a 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java @@ -131,7 +131,7 @@ for (Code code : codeList) { List<Long> adjacencyNode = routeService.getAdjacencyNode(code.getId()); this.adjacencyCodeMap.put(code.getData(), adjacencyNode.stream().map(node -> ( - codeService.getById(node).getData() + codeService.getCacheById(node).getData() )).collect(Collectors.toList())); } } 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 8a1f948..ada07bc 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 @@ -301,8 +301,8 @@ oriLoc = locService.getById(task.getOriLoc()); destLoc = locService.getById(task.getDestLoc()); - startCode = codeService.getById(oriLoc.getCode()); - endCode = codeService.getById(destLoc.getCode()); + startCode = codeService.getCacheById(oriLoc.getCode()); + endCode = codeService.getCacheById(destLoc.getCode()); TaskPosDto.packagePosGroup(groups, task, startCode, TaskPosDto.PosType.ORI_LOC, sameGroupXy); TaskPosDto.packagePosGroup(groups, task, endCode, TaskPosDto.PosType.DEST_LOC, sameGroupXy); @@ -311,8 +311,8 @@ oriLoc = locService.getById(task.getOriLoc()); destSta = staService.getById(task.getDestSta()); - startCode = codeService.getById(oriLoc.getCode()); - endCode = codeService.getById(destSta.getCode()); + startCode = codeService.getCacheById(oriLoc.getCode()); + endCode = codeService.getCacheById(destSta.getCode()); TaskPosDto.packagePosGroup(groups, task, startCode, TaskPosDto.PosType.ORI_LOC, sameGroupXy); TaskPosDto.packagePosGroup(groups, task, endCode, TaskPosDto.PosType.DEST_STA, sameGroupXy); @@ -321,8 +321,8 @@ oriSta = staService.getById(task.getOriSta()); destLoc = locService.getById(task.getDestLoc()); - startCode = codeService.getById(oriSta.getCode()); - endCode = codeService.getById(destLoc.getCode()); + startCode = codeService.getCacheById(oriSta.getCode()); + endCode = codeService.getCacheById(destLoc.getCode()); TaskPosDto.packagePosGroup(groups, task, startCode, TaskPosDto.PosType.ORI_STA, sameGroupXy); TaskPosDto.packagePosGroup(groups, task, endCode, TaskPosDto.PosType.DEST_LOC, sameGroupXy); @@ -331,8 +331,8 @@ oriSta = staService.getById(task.getOriSta()); destSta = staService.getById(task.getDestSta()); - startCode = codeService.getById(oriSta.getCode()); - endCode = codeService.getById(destSta.getCode()); + startCode = codeService.getCacheById(oriSta.getCode()); + endCode = codeService.getCacheById(destSta.getCode()); TaskPosDto.packagePosGroup(groups, task, startCode, TaskPosDto.PosType.ORI_STA, sameGroupXy); TaskPosDto.packagePosGroup(groups, task, endCode, TaskPosDto.PosType.DEST_STA, sameGroupXy); @@ -397,7 +397,7 @@ } // re-order by agv current position - Code currCode = codeService.getById(agvDetail.getRecentCode()); + Code currCode = codeService.getCacheById(agvDetail.getRecentCode()); Double[] currPosition = new Double[] {currCode.getX(), currCode.getY()}; List<List<TaskPosDto>> pickGroups = new ArrayList<>(); @@ -517,7 +517,7 @@ List<FuncSta> idleFunStaList = funcStaService.findInIdleStatus(FuncStaType.query(taskType), agvId); if (!Cools.isEmpty(idleFunStaList)) { FuncSta funcSta = funcStaService.checkoutClosestFunSta(agvDetail.getRecentCode(), idleFunStaList); - endCode = codeService.getById(funcSta.getCode()); + endCode = codeService.getCacheById(funcSta.getCode()); } if (null == endCode) { log.warn("AGV[{}] failed to search destination锛宼here hadn't any idle funSta锛孴askTypeType锛歿}", agvNo, taskType.toString()); @@ -666,7 +666,7 @@ List<Action> actionList = new ArrayList<>(); // start node - Code lastCode = codeService.getById(agvDetail.getRecentCode()); + Code lastCode = codeService.getCacheById(agvDetail.getRecentCode()); Double lastDirection = agvDetail.getAgvAngle(); if (!lastCode.getData().equals(pathList.get(0))) { throw new CoolException("AGV[" + agvNo + "]瀹氫綅鍋忕Щ..."); @@ -679,7 +679,7 @@ Task task = taskService.getById(segment.getTaskId()); // 鑺傜偣鏉$爜 - Code code = codeService.getById(segment.getEndNode()); + Code code = codeService.getCacheById(segment.getEndNode()); // 闇�瑕佽蛋琛� if (!lastCode.getData().equals(code.getData())) { diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java index 4ad4904..d6c2b61 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java @@ -117,7 +117,7 @@ return floydNavigateService.calculatePath(startIdx, endIdx).stream().map(path -> { Long codeId = floydNavigateService.getCodeId(path); - Code code = codeService.getById(codeId); + Code code = codeService.getCacheById(codeId); return code.getData(); }).collect(Collectors.toList()); } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java index f2cc9ea..07399a5 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java @@ -100,7 +100,7 @@ public Code getDestinationCode(String agvNo, AgvDetail agvDetail) { Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class); - Code startCode = codeService.getById(agvDetail.getRecentCode()); + Code startCode = codeService.getCacheById(agvDetail.getRecentCode()); List<String> notInCodeList = new ArrayList<>(); notInCodeList.add("00000301"); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java index 9f990f3..a2a0f9f 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java @@ -133,8 +133,8 @@ } // checkout path - Code startCode = codeService.getById(agvDetail.getRecentCode()); - Code endCode = codeService.getById(endNode); + Code startCode = codeService.getCacheById(agvDetail.getRecentCode()); + Code endCode = codeService.getCacheById(endNode); long startTime = System.currentTimeMillis(); List<String> pathList = this.checkoutPath(agv, startCode, endCode, segment); // System.out.println("checkoutPath: " + (System.currentTimeMillis() - startTime)); @@ -309,7 +309,7 @@ // block vehicle info Long blockAgvId = agvService.getAgvId(blockAgvNo); - String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgvId).getRecentCode()).getData(); + String blockAgvCode = codeService.getCacheById(agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()).getData(); // create new jam if already notify the avoid vehicle if (!Cools.isEmpty(jam.getAvoAgv(), jam.getAvoSeg()) && !blockAgvId.equals(jam.getAvoAgv())) { diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java index bf7d1d3..1c75b7f 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java @@ -127,8 +127,8 @@ oriLoc = locService.getById(task.getOriLoc()); destLoc = locService.getById(task.getDestLoc()); - startCode = codeService.getById(oriLoc.getCode()); - endCode = codeService.getById(destLoc.getCode()); + startCode = codeService.getCacheById(oriLoc.getCode()); + endCode = codeService.getCacheById(destLoc.getCode()); if (null == startCode) { throw new BusinessException("oriLoc锛�" + oriLoc.getLocNo() + " hasn't been bound to a QrCode yet"); } @@ -145,8 +145,8 @@ oriLoc = locService.getById(task.getOriLoc()); destSta = staService.getById(task.getDestSta()); - startCode = codeService.getById(oriLoc.getCode()); - endCode = codeService.getById(destSta.getCode()); + startCode = codeService.getCacheById(oriLoc.getCode()); + endCode = codeService.getCacheById(destSta.getCode()); if (null == startCode) { throw new BusinessException("oriLoc锛�" + oriLoc.getLocNo() + " hasn't been bound to QrCode yet"); } @@ -163,8 +163,8 @@ oriSta = staService.getById(task.getOriSta()); destLoc = locService.getById(task.getDestLoc()); - startCode = codeService.getById(oriSta.getCode()); - endCode = codeService.getById(destLoc.getCode()); + startCode = codeService.getCacheById(oriSta.getCode()); + endCode = codeService.getCacheById(destLoc.getCode()); if (null == startCode) { throw new BusinessException("oriSta锛�" + oriSta.getStaNo() + " hasn't bound to QrCode yet"); } @@ -181,8 +181,8 @@ oriSta = staService.getById(task.getOriSta()); destSta = staService.getById(task.getDestSta()); - startCode = codeService.getById(oriSta.getCode()); - endCode = codeService.getById(destSta.getCode()); + startCode = codeService.getCacheById(oriSta.getCode()); + endCode = codeService.getCacheById(destSta.getCode()); if (null == startCode) { throw new BusinessException("oriSta锛�" + oriSta.getStaNo() + " hasn't been bound to a QrCode yet"); } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java index 0a2285c..72b5182 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java @@ -364,9 +364,9 @@ return; } for (Route route : routeList) { - Code startCode = codeService.getById(route.getStartCode()); + Code startCode = codeService.getCacheById(route.getStartCode()); int[] startCodeIdx = getCodeMatrixIdx(lev, startCode.getData()); - Code endCode = codeService.getById(route.getEndCode()); + Code endCode = codeService.getCacheById(route.getEndCode()); int[] codeMatrixIdx = getCodeMatrixIdx(lev, endCode.getData()); String routeKey = RouteGenerator.generateRouteKey(startCode.getData(), endCode.getData()); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java index 6e576bc..dfa6833 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java @@ -56,7 +56,7 @@ @PreAuthorize("hasAuthority('manager:code:list')") @GetMapping("/code/{id}") public R get(@PathVariable("id") Long id) { - return R.ok().add(codeService.getById(id)); + return R.ok().add(codeService.getCacheById(id)); } @PreAuthorize("hasAuthority('manager:code:save')") diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java index 7159bb3..0f5df78 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java @@ -55,7 +55,7 @@ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId()); if (null == agvDetail) { continue; } - Code currCode = codeService.getById(agvDetail.getCode()); + Code currCode = codeService.getCacheById(agvDetail.getCode()); if (null == currCode) { continue; } vo.synPosition(currCode.getX(), 0, currCode.getY()); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java index 17132b5..c5f98be 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java @@ -161,7 +161,7 @@ vo.setVol(String.valueOf(agvDetail.getVol())); vo.setSoc(String.valueOf(agvDetail.getSoc())); vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1); - Code code = codeService.getById(agvDetail.getRecentCode()); + Code code = codeService.getCacheById(agvDetail.getRecentCode()); if (null != code) { vo.setCode(code.getData()); } @@ -427,7 +427,7 @@ for (Agv agv : agvList) { AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId()); if (null == agvDetail) { continue; } - Code currCode = codeService.getById(agvDetail.getCode()); + Code currCode = codeService.getCacheById(agvDetail.getCode()); MapAgvDto agvDto = new MapAgvDto(); agvDto.setUuid(agv.getUuid()); agvDto.setCurrCode(currCode==null?null:currCode.getData()); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java index 7292254..8fc8f90 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java @@ -87,8 +87,8 @@ return R.error("Save Fail"); } - Code startCode = codeService.getById(route.getStartCode()); - Code endCode = codeService.getById(route.getEndCode()); + Code startCode = codeService.getCacheById(route.getStartCode()); + Code endCode = codeService.getCacheById(route.getEndCode()); if (null == startCode || null == endCode) { return R.error("Save Fail"); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java index 155e1d4..b65e2a3 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java @@ -52,7 +52,7 @@ this.setSoc(String.valueOf(agvDetail.getSoc())); } if (null != agvDetail.getRecentCode()) { - this.setCode(codeService.getById(agvDetail.getRecentCode()).getData()); + this.setCode(codeService.getCacheById(agvDetail.getRecentCode()).getData()); } List<Task> tasks = taskService.selectInSts(agvDetail.getAgvId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS); if (!Cools.isEmpty(tasks)) { diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java index 95f8cbf..b9d13d7 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java @@ -171,7 +171,7 @@ AgvDetail detail = agvDetailService.selectByAgvId(agv.getId()); VehicleDto dto = new VehicleDto(); dto.setVehicle(agv.getUuid()); - dto.setPosCode(codeService.getById(detail.getRecentCode()).getData()); + dto.setPosCode(codeService.getCacheById(detail.getRecentCode()).getData()); res.add(dto); } return res; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java index 1542f2f..7286830 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java @@ -146,7 +146,7 @@ } if (null != codeId) { - Code currCode = codeService.getById(codeId); + Code currCode = codeService.getCacheById(codeId); Double[] startPos = new Double[]{currCode.getX(), currCode.getY()}; // checkout one funSta which is the closest @@ -155,10 +155,10 @@ funcStaList.sort(new Comparator<FuncSta>() { @Override public int compare(FuncSta o1, FuncSta o2) { - Code o1Code = codeService.getById(o1.getCode()); + Code o1Code = codeService.getCacheById(o1.getCode()); int o1Distance = CommonUtil.calcDistance(startPos, new Double[]{o1Code.getX(), o1Code.getY()}); - Code o2Code = codeService.getById(o2.getCode()); + Code o2Code = codeService.getCacheById(o2.getCode()); int o2Distance = CommonUtil.calcDistance(startPos, new Double[]{o2Code.getX(), o2Code.getY()}); return o1Distance - o2Distance; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java index 69a38e9..630daac 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java @@ -70,7 +70,7 @@ Long recentCode = agvDetail.getRecentCode(); String currCode = null; if (null != recentCode) { - currCode = codeService.getById(recentCode).getData(); + currCode = codeService.getCacheById(recentCode).getData(); } // action ------------------------------- diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java index 009aba4..5ae805e 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java @@ -57,10 +57,10 @@ List<String> neighborCodeList = new ArrayList<>(); for (Route route : this.list(new LambdaQueryWrapper<Route>().eq(Route::getStartCode, code))) { - neighborCodeList.add(codeService.getById(route.getEndCode()).getData()); + neighborCodeList.add(codeService.getCacheById(route.getEndCode()).getData()); } for (Route route : this.list(new LambdaQueryWrapper<Route>().eq(Route::getEndCode, code))) { - neighborCodeList.add(codeService.getById(route.getStartCode()).getData()); + neighborCodeList.add(codeService.getCacheById(route.getStartCode()).getData()); } return neighborCodeList; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java index 9074ef0..601782b 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java @@ -139,7 +139,7 @@ if (null == codeId) { return null; } - return laneService.search(codeService.getById(codeId).getData()); + return laneService.search(codeService.getCacheById(codeId).getData()); } @Override @@ -162,7 +162,7 @@ if (null == codeId) { return null; } - return laneService.search(codeService.getById(codeId).getData()); + return laneService.search(codeService.getCacheById(codeId).getData()); } @Override -- Gitblit v1.9.1