From 258a769f6790f832d1c67839d59be04a118767e5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 28 四月 2024 10:50:48 +0800
Subject: [PATCH] 用时分析代码整理+注释整理
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java
index 2164fe8..6e32ca3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.java
@@ -65,7 +65,6 @@
import cn.hutool.core.util.StrUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/EfficiencyAnalysisServiceImpl.class */
public class EfficiencyAnalysisServiceImpl implements IEfficiencyAnalysisService {
private static final Logger log = LoggerFactory.getLogger(EfficiencyAnalysisServiceImpl.class);
private static final String ZERO = "0.00%";
@@ -91,26 +90,16 @@
this.statisticsService = statisticsService;
}
- @Override // org.springblade.modules.mdc.service.IEfficiencyAnalysisService
+ @Override
public StatisticsVO efficiencyAnalysis(StatisticsAnalysisQueryVO statisticsAnalysisQueryVO, Query query) {
List<SuperAggregateState> superAggregateStates;
List<String> workStationIdList = statisticsAnalysisQueryVO.getWorkStationIdList();
if (Func.isEmpty(workStationIdList)) {
workStationIdList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode()).eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().map(s -> Func.toStr(s.getId())).collect(Collectors.toList());
- /*
- workStationIdList = (List) this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getType();
- }, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).stream().map(s -> {
- return Func.toStr(s.getId());
- }).collect(Collectors.toList());*/
}
IPage<WorkstationVO> workstationVOPage = this.workstationMapper.queryWorkstationAndGroup(Condition.getPage(query), Func.toLongList(workStationIdList));
IPage<Workstation> workstationPage = WorkstationConvert.INSTANCE.convert(workstationVOPage);
- List<Long> workstationIds = workstationPage.getRecords().stream().map((v0) -> {
- return v0.getId();
- }).collect(Collectors.toList());
+ List<Long> workstationIds = workstationPage.getRecords().stream().map(Workstation::getId).collect(Collectors.toList());
List<IntervalDateDto> intervalDates = LocalDateTimeUtils.getIntervalDate(statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
if (statisticsAnalysisQueryVO.getProductivityType() == ProductivityTypeEnum.OEE) {
superAggregateStates = this.superAggregateStateService.getStatusDataWithFeedback(workstationIds, statisticsAnalysisQueryVO.getStatisticalMethod(), statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
@@ -118,13 +107,13 @@
superAggregateStates = this.superAggregateStateService.getStatusData(workstationIds, statisticsAnalysisQueryVO.getStatisticalMethod(), statisticsAnalysisQueryVO.getStartDate(), statisticsAnalysisQueryVO.getEndDate());
}
List<SuperAggregate> superAggregateList = superAggregateStates.stream().filter(x -> {
- return x.getWcs().intValue() > 0;
+ return x.getWcs() > 0;
}).collect(Collectors.toList());
StatisticsWrapperDto statisticsWrapperDto = new StatisticsWrapperDto(superAggregateList, statisticsAnalysisQueryVO, intervalDates, workstationPage, MdcConstant.STATE);
return this.wrapper.entityVO(statisticsWrapperDto);
}
- @Override // org.springblade.modules.mdc.service.IEfficiencyAnalysisService
+ @Override
public List<ColumnInfoVO> getIntervalDate(QueryIntervalDateVO queryIntervalDateVO) {
List<IntervalDateDto> intervalDate = LocalDateTimeUtils.getIntervalDate(queryIntervalDateVO.getStartDate(), queryIntervalDateVO.getEndDate());
List<ColumnInfoVO> columnInfoVOList = new ArrayList<>();
@@ -174,7 +163,7 @@
return columnInfoVOList;
}
- @Override // org.springblade.modules.mdc.service.IEfficiencyAnalysisService
+ @Override
public BladeFile exportEfficiencyAnalysis(StatisticsAnalysisQueryVO statisticsAnalysisQueryVO, HttpServletResponse response) {
List<SuperAggregateState> superAggregateStates;
List<String> workStationIdList = statisticsAnalysisQueryVO.getWorkStationIdList();
--
Gitblit v1.9.3