| | |
| | | package com.zy.asrs.controller; |
| | | |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| | | import com.core.annotations.ManagerAuth; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | |
| | | station.putAll(devpThread.getStation()); |
| | | } |
| | | // 持久数据 |
| | | List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no")); |
| | | List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>().orderByAsc("dev_no")); |
| | | for (BasDevp devp : basDevps) { |
| | | SiteTableVo vo = new SiteTableVo(); |
| | | vo.setDevNo(devp.getDevNo()); // 站点编号 |
| | |
| | | for (SteSlave ste : slaveProperties.getSte()) { |
| | | if (steNo.equals(ste.getId())) { |
| | | vo.setSteNo(ste.getId()); |
| | | BasSte basSte = basSteService.selectById(ste.getId()); |
| | | BasSte basSte = basSteService.getById(ste.getId()); |
| | | if (!Cools.isEmpty(basSte)) { |
| | | vo.setRow(basSte.getRow()); |
| | | vo.setBay(basSte.getBay()); |