| | |
|---|
| | | for (MdcEquipmentRunningSection entity : running) { |
|---|
| | | dto = new MdcEquipmentRunningSectionDto(); |
|---|
| | | BeanUtils.copyProperties(entity, dto); |
|---|
| | | if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist) { |
|---|
| | | if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist && !"ZUOLAN".equals(equip.getDrivetype())) { |
|---|
| | | List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime()); |
|---|
| | | if (esList != null && esList.size() > 1) { |
|---|
| | | dto.setSequenceNumber(esList.get(0).getSequencenumber()); |
|---|
| | |
|---|
| | | //整合加工和待机时间小于n秒的数据 |
|---|
| | | erts = mergeLessMinTimeRecords(erts, null); |
|---|
| | | List<MdcEquipmentRunningSection> running = mergeRunningTrace(erts); |
|---|
| | | if (running != null || !running.isEmpty()) { |
|---|
| | | if (running != null && !running.isEmpty()) { |
|---|
| | | this.ergodicTrim(running); |
|---|
| | | } |
|---|
| | | return running; |
|---|
| | |
|---|
| | | return this.baseMapper.selectAlarmList(mdcAlarmAnalyzeQueryVo, startDate, endDate); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<Integer> getDataList(String equipmentId, Date date) { |
|---|
| | | return this.baseMapper.getDataList(equipmentId, date); |
|---|
| | | } |
|---|
| | | |
|---|
| | | private Map<String, List<MdcEquipmentRunningSectionDto>> logCharts(MdcEquipmentRunningSectionVo equipmentRunningSectionVo, String date) { |
|---|
| | | Map<String, List<MdcEquipmentRunningSectionDto>> map = new HashMap<>(); |
|---|
| | | List<MdcEquipmentRunningSectionDto> normal = new ArrayList<>(); |
|---|
