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/SuperAggregateStateServiceImpl.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
index a83eda9..5e7142f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
@@ -51,7 +51,7 @@
this.workstationService = workstationService;
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getStatusData(List<Long> workstationIds, StatisticalMethodEnum statisticalMethod, LocalDate startDate, LocalDate endDate) {
List<SuperAggregateState> statusDataList;
if (StatisticalMethodEnum.SHIFT.equals(statisticalMethod) || StatisticalMethodEnum.DAY.equals(statisticalMethod) || StatisticalMethodEnum.WEEK.equals(statisticalMethod) || StatisticalMethodEnum.MONTH.equals(statisticalMethod)) {
@@ -62,8 +62,9 @@
return buildDuration(statusDataList);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getStatusDataWithFeedback(List<Long> workstationIds, StatisticalMethodEnum statisticalMethod, LocalDate startDate, LocalDate endDate) {
+ //绋煎姩鐜囨煡璇�
List<SuperAggregateState> statusDataList;
if (StatisticalMethodEnum.SHIFT.equals(statisticalMethod) || StatisticalMethodEnum.DAY.equals(statisticalMethod) || StatisticalMethodEnum.WEEK.equals(statisticalMethod) || StatisticalMethodEnum.MONTH.equals(statisticalMethod)) {
statusDataList = this.aggregateStateFeedbackMapper.getStatusDataByFactoryDate(workstationIds, LocalDateTimeUtil.format(startDate, "yyyyMMdd"), LocalDateTimeUtil.format(endDate, "yyyyMMdd"));
@@ -73,19 +74,19 @@
return buildDuration(statusDataList);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getStatusByCondition(List<Long> workstationIds, LocalDateTime startTime, LocalDateTime endTime) {
List<SuperAggregateState> statusDataList = this.baseMapper.getStatusData(workstationIds, LocalDateTimeUtil.format(startTime, DateConstant.PATTERN_DATE_TIME), LocalDateTimeUtil.format(endTime, DateConstant.PATTERN_DATE_TIME));
return buildDuration(statusDataList);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getStatusByTimeSection(List<Long> workstationIds, LocalDateTime startTime, LocalDateTime endTime) {
List<SuperAggregateState> statusDataList = this.baseMapper.getStatusDataByTimeSection(workstationIds, LocalDateTimeUtil.format(startTime, DateConstant.PATTERN_DATE_TIME), LocalDateTimeUtil.format(endTime, DateConstant.PATTERN_DATE_TIME));
return buildDuration(startTime, statusDataList);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<StatusTimeTopVO> getStatusTimeByWcs(List<Long> workstationIds, LocalDateTime startTime, LocalDateTime endTime, Integer status, Integer top) {
List<StatusTimeTopVO> voList = new ArrayList<>();
Map<Long, Workstation> workstationMap = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
@@ -119,44 +120,44 @@
return voList;
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getOeeAnalysis(List<Long> workStationIdList, LocalDateTime startTime, LocalDateTime endTime) {
List<SuperAggregateState> statusDataList = this.baseMapper.getEquipmentStatusDuration(workStationIdList, LocalDateTimeUtil.format(startTime, DateConstant.PATTERN_DATE_TIME), LocalDateTimeUtil.format(endTime, DateConstant.PATTERN_DATE_TIME), null);
return buildDuration(startTime, FilterOffUtils.filterOffDay(statusDataList, OpenTypeEnums.OEE));
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getShiftStatusData(List<Long> workstationIdList, String factoryDate, Integer shiftIndex) {
List<SuperAggregateState> statusDataShift = this.baseMapper.getStatusDataShift(Integer.valueOf(factoryDate.replace("-", "")), shiftIndex, workstationIdList);
return buildDuration(statusDataShift);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getStatusByFactory(List<Long> workstationIdList, String factoryDate, Integer shiftIndex) {
List<SuperAggregateState> statusDataShift = this.baseMapper.getStatusByFactory(Integer.valueOf(Func.toInt(factoryDate.replace("-", ""))), shiftIndex, workstationIdList);
return buildDuration(statusDataShift);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> listsState(List<Long> ids, LocalDate queryTime, List<Integer> shiftIndex) {
String factoryDate = DateUtil.format(queryTime, DateConstant.PATTERN_DATE);
List<SuperAggregateState> statusDataShift = this.baseMapper.listsState(Integer.valueOf(Func.toInt(factoryDate.replace("-", ""))), ids, shiftIndex);
return buildDuration(statusDataShift);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getDataByWeek(List<Long> ids, Integer year, List<Integer> weekList) {
List<SuperAggregateState> data = this.baseMapper.getDataByWeek(ids, year, weekList);
return buildDuration(data);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getDataByMonth(List<Long> ids, Integer year, List<Integer> monthList) {
List<SuperAggregateState> data = this.baseMapper.getDataByMonth(ids, year, monthList);
return buildDuration(data);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> crossDay(LocalDateTime start, LocalDateTime end) {
String startTime = DateUtil.formatDateTime(start);
String endTime = DateUtil.formatDateTime(end);
@@ -164,7 +165,7 @@
return buildDuration(res);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public void saveState(List<SuperAggregateState> collect) {
Map<Long, List<SuperAggregateState>> map = collect.stream().collect(Collectors.groupingBy(SuperAggregate::getWorkstationId));
map.forEach(this.baseMapper::saveState);
@@ -177,7 +178,7 @@
map.forEach(this::saveState);*/
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getStatusDataByTime(List<Long> workstationIdList, LocalDateTime start, LocalDateTime end) {
List<SuperAggregateState> superAggregateStateList = new ArrayList<>();
String startTime = LocalDateTimeUtil.format(start, "yyyy-MM-dd HH:mm:ss.SSS");
@@ -212,73 +213,73 @@
return superAggregateStateList;
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByDay(Long workstationId, String startTime, String endTime, Long employeeId) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByDay(workstationId, startTime, endTime, employeeId);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByWeek(Long workstationId, List<Integer> weeks, Long employeeId) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByWeek(workstationId, weeks, employeeId);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByMonth(Long workstationId, List<Integer> months, Long employeeId) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByMonth(workstationId, months, employeeId);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByEtDay(Long employeeId, String queryTime) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByEtDay(employeeId, queryTime);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByEtWeek(Long employeeId, Integer week) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByEtWeek(employeeId, week);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByEtMonth(Long employeeId, Integer month) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByEtMonth(employeeId, month);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByWtDay(Long workstationId, String time) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByWtDay(workstationId, time);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByWtWeek(Long workstationId, Integer week) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByWtWeek(workstationId, week);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> queryPerfByWtMonth(Long workstationId, Integer month) {
List<SuperAggregateState> states = this.baseMapper.queryPerfByWtMonth(workstationId, month);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getCurrMonthState(List<Long> ids, Integer month) {
List<SuperAggregateState> states = this.baseMapper.getCurrMonthState(ids, month);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getCurrMonthAlarmState(List<Long> workIds, Integer month, Integer code) {
List<SuperAggregateState> states = this.baseMapper.getCurrMonthAlarmState(workIds, month, code);
return buildDuration(states);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateStateService
+ @Override
public List<SuperAggregateState> getCurrWeekAlarmState(List<Long> workIds, Integer week, Integer code) {
List<SuperAggregateState> states = this.baseMapper.getCurrWeekAlarmState(workIds, week, code);
return buildDuration(states);
--
Gitblit v1.9.3