| | |
| | | import com.zy.acs.manager.manager.service.AgvDetailService; |
| | | import com.zy.acs.manager.manager.service.AgvService; |
| | | import com.zy.acs.manager.manager.service.CodeService; |
| | | import com.zy.acs.manager.manager.service.TaskService; |
| | | import com.zy.acs.manager.system.controller.BaseController; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.security.access.prepost.PreAuthorize; |
| | |
| | | private AgvDetailService agvDetailService; |
| | | @Autowired |
| | | private CodeService codeService; |
| | | @Autowired |
| | | private TaskService taskService; |
| | | |
| | | // @PreAuthorize("hasAuthority('manager:agv:list')") |
| | | // @PostMapping("/agv/page") |
| | |
| | | PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class); |
| | | PageResult<AgvResult> page = agvService.pageRel(pageParam); |
| | | for (AgvResult result : page.getRecords()) { |
| | | result.sync(agvDetailService.selectByAgvId(result.getId()), codeService); |
| | | result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService); |
| | | } |
| | | return R.ok().add(page); |
| | | } |