| | |
|---|
| | | public List<ChartDataVO> getEquipmentEfficiency(StatusRecordDetailSelectVO statusRecordDetailSelectVO) { |
|---|
| | | List<ChartDataVO> result = new ArrayList<>(); |
|---|
| | | List<SuperAggregateState> superAggregateStateList = this.superAggregateStateService.getStatusData(Arrays.asList(statusRecordDetailSelectVO.getWorkstationId()), null, statusRecordDetailSelectVO.getDate(), statusRecordDetailSelectVO.getDate()); |
|---|
| | | List<SuperAggregateState> oeeAggregateStateList = this.superAggregateStateService.getStatusDataWithFeedback(Arrays.asList(statusRecordDetailSelectVO.getWorkstationId()), null, statusRecordDetailSelectVO.getDate(), statusRecordDetailSelectVO.getDate()); |
|---|
| | | |
|---|
| | | //下面一行不用了，应为稼动率再分析设置界面和这里不相符，我们同意使用状态数据，不用feedback的 |
|---|
| | | //List<SuperAggregateState> oeeAggregateStateList = this.superAggregateStateService.getStatusDataWithFeedback(Arrays.asList(statusRecordDetailSelectVO.getWorkstationId()), null, statusRecordDetailSelectVO.getDate(), statusRecordDetailSelectVO.getDate()); |
|---|
| | | ProductivityTypeEnum[] values = ProductivityTypeEnum.values(); |
|---|
| | | int length = values.length; |
|---|
| | | for (int i = 0; i < length; i++) { |
|---|
| | | ProductivityTypeEnum productivityTypeEnum = values[i]; |
|---|
| | | ChartDataVO chartData = new ChartDataVO().setName(productivityTypeEnum.getMessage()).setValue(EifficiencyUtils.calculationResults(productivityTypeEnum == ProductivityTypeEnum.OEE ? oeeAggregateStateList : superAggregateStateList, productivityTypeEnum)); |
|---|
| | | //ChartDataVO chartData = new ChartDataVO().setName(productivityTypeEnum.getMessage()).setValue(EifficiencyUtils.calculationResults(productivityTypeEnum == ProductivityTypeEnum.OEE ? oeeAggregateStateList : superAggregateStateList, productivityTypeEnum)); |
|---|
| | | //上面一行，去掉oee的传值 |
|---|
| | | ChartDataVO chartData = new ChartDataVO().setName(productivityTypeEnum.getMessage()).setValue(EifficiencyUtils.calculationResults(superAggregateStateList, productivityTypeEnum)); |
|---|
| | | result.add(chartData); |
|---|
| | | } |
|---|
| | | return result; |
|---|
| | |
|---|
| | | MultipartFile multipartFile = ExcelUtil.exportToMultipartFile(fileName, ExcelConstant.STATUS_RECORD, exportList, StatusRecordExport.class); |
|---|
| | | return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /* |
|---|
| | | @Override |
|---|
| | | public List<List<SuperAggregateStateVO>> crossDayState(CrossDayStateVO vo) { |
|---|
| | | LocalDate date = vo.getDate(); |
|---|
| | |
|---|
| | | }).collect(Collectors.toList()); |
|---|
| | | this.superAggregateStateService.saveState(collect); |
|---|
| | | return list; |
|---|
| | | } |
|---|
| | | }*/ |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public IPage<StatusRecordDateVO> getStatusRecordByDates(IPage<StatusRecordDateVO> page, StatusRecordDateTimeSelectVO statusRecordDateTimeSelectVO) { |
|---|
