| | |
| | | @Autowired |
| | | private BasRgvErrLogService basRgvErrLogService; |
| | | @Autowired |
| | | private BasRgvOptService basRgvOptService; |
| | | @Autowired |
| | | private BasRgvService basRgvService; |
| | | @Autowired |
| | | private MainServiceImpl mainService; |
| | |
| | | return R.ok().add(result); |
| | | } |
| | | |
| | | @PostMapping("/ring/through/task/wrk/mast/position/data/v1") |
| | | // @ManagerAuth(memo = "作业信息") |
| | | public R ringThroughTaskWrkMastV1(){ |
| | | List<BasRgvOpt> result = new ArrayList<>(); |
| | | for (int i = 1 ; i<11; i ++){ |
| | | BasRgvOpt basRgvOpt = basRgvOptService.selectOne(new EntityWrapper<BasRgvOpt>().eq("rgv_no", i).orderBy("id", false)); |
| | | if (basRgvOpt!=null){ |
| | | result.add(basRgvOpt); |
| | | } |
| | | } |
| | | return R.ok().add(result); |
| | | } |
| | | |
| | | @PostMapping("/task/rgv/circular/shuttle/mast/position/data") |
| | | // @ManagerAuth(memo = "作业信息") |
| | | public R rgvCircularShuttle(){ |
| | |
| | | return R.ok(); |
| | | } |
| | | |
| | | @PostMapping("/disable/task/delete1") |
| | | // @ManagerAuth(memo = "初始化任务") |
| | | public R taskDisabledelete1(@RequestParam Long wrkNo){ |
| | | Date now = new Date(); |
| | | log.info("/disable/task/delete1===》初始化任务!!!wrkNo:{},data:{}",wrkNo,new Date()); |
| | | WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo)); |
| | | if (Cools.isEmpty(wrkMast)){ |
| | | return R.error().add("未找到此任务,异常!!!"); |
| | | } |
| | | wrkMast.setWrkSts(1L); |
| | | wrkMast.setRgvNo(0); |
| | | wrkMast.setAppeTime(now); |
| | | wrkMast.setLogErrTime(now); |
| | | if (wrkMastService.updateById(wrkMast)){ |
| | | return R.ok(); |
| | | } |
| | | return R.error("初始化失败!!!"); |
| | | } |
| | | |
| | | } |