| | |
| | | @Override |
| | | public IPage<WorkstationRealTimeStatusVO> getRealTimeStatus(WorkstationRealTimeStatusDTO dto, Query query) { |
| | | List<String> workStationGroupIdList = dto.getWorkStationGroupIdList(); |
| | | if (workStationGroupIdList.size() == 1) { |
| | | if (workStationGroupIdList !=null && workStationGroupIdList.size() == 1) { |
| | | List<String> workStationGroupIdByParentList = getCommonGroupIds(workStationGroupIdList, new ArrayList<>()).stream().map(item -> { |
| | | return String.valueOf(item.getId()); |
| | | }).collect(Collectors.toList()); |
| | |
| | | |
| | | @Override |
| | | public IPage<Workstation> listWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Query query, Integer shift, Integer type) { |
| | | return ((WorkstationMapper) this.baseMapper).listWorkStationOnShiftIndex(Condition.getPage(query), Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shift, type, ids); |
| | | return this.baseMapper.listWorkStationOnShiftIndex(Condition.getPage(query), localDate.getYear(), DateUtil.formatDate(localDate), shift, type, ids); |
| | | } |
| | | |
| | | @Override |
| | |
| | | if (Func.isEmpty(i.getMachineId())) { |
| | | filter = false; |
| | | } |
| | | |
| | | List<RealTimeStatusVO> properties = realTimePropertiesMap.get(i.getId()); |
| | | if (Func.isNotEmpty(deviceStatus)) { |
| | | if (Func.isEmpty(properties)) { |