zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
@@ -44,6 +44,8 @@ private AgvModelService agvModelService; @Autowired private StaService staService; @Autowired private SegmentService segmentService; // @Autowired // private ConveyorStationService siemensConveyorStationService; @Autowired @@ -56,9 +58,8 @@ @RequestMapping(value = "/system/demo", method = {RequestMethod.GET, RequestMethod.POST}) public R demo() { Sta sta = staService.selectByStaNo("1006"); boolean b = siemensConveyorStationService.allowAgvWork(sta, null, null, StaReserveType.IN); return R.ok().add(b); List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(8L, 42L); return R.ok(usedBackpacks); } // http://localhost:8088/demo/auto/go/standby @@ -151,8 +152,6 @@ @Autowired private MapService mapService; @Autowired private SegmentService segmentService; @GetMapping("/astarDemo") // astar spend time: 3866, count:3855 public R astarDemo() { zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
@@ -51,9 +51,9 @@ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>() .ge(Loc::getRow, 31).eq(Loc::getLocSts, LocStsType.IDLE.val())); if (Cools.isEmpty(locList)) { log.error("there is no such idle loc"); break; } log.error("there is no such idle loc"); Collections.shuffle(locList); Loc loc = locList.get(0); dto.setDestLoc(loc.getLocNo()); zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -188,7 +188,7 @@ @Override public List<Integer> selectUsedBackpacks(Long travelId, Long agvId) { return this.baseMapper.selectUsedBackpacks(agvId, travelId); return this.baseMapper.selectUsedBackpacks(travelId, agvId); } @Override
