From 3e7e8a98434731121d4a8736fd35af4cd6cb7a9e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 四月 2024 22:54:09 +0800
Subject: [PATCH] remove commnet
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedback.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CalendarConstant.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java | 4 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/enums/WorkstationTypeEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ShiftIndexNameDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/StatusRecordConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java | 17 ++++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDateVO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedbackDetail.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java | 20 +++++-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/ChartDataVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDetailSelectVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IEmployeeService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java | 53 +++++++++++++-------------
smart-starter-mybatis/src/main/java/com/qianwen/core/mp/support/BaseEntityWrapper.java | 3 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/DmpVariablesVO.java | 3 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackDetailService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProductivityTypeEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackService.java | 1
21 files changed, 51 insertions(+), 66 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CalendarConstant.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CalendarConstant.java
index 024f367..1dcee8b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CalendarConstant.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CalendarConstant.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.common.constant;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/common/constant/CalendarConstant.class */
public interface CalendarConstant {
public static final String DEFAULT_CALENDAR = "#default#";
public static final int STATUS_NO_DELETE = 1;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/enums/WorkstationTypeEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/enums/WorkstationTypeEnum.java
index 3ba83a4..41d77db 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/enums/WorkstationTypeEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/enums/WorkstationTypeEnum.java
@@ -2,7 +2,6 @@
import com.qianwen.smartman.common.constant.MachineConstant;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/enums/WorkstationTypeEnum.class */
public enum WorkstationTypeEnum {
MACHINE(0, MachineConstant.TYPE_MACHINE),
ARTIFICIAL(1, MachineConstant.TYPE_HUMAN);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IEmployeeService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IEmployeeService.java
index 16901d2..0d7090d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IEmployeeService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IEmployeeService.java
@@ -20,7 +20,6 @@
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/IEmployeeService.class */
public interface IEmployeeService extends BaseService<Employee> {
@CacheEvict(cacheNames = {ExtCacheConstant.EMPLOYEE}, allEntries = true)
EmployeeVO submit(EmployeeSubmitVO employeeSubmitVO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
index ac38ff3..66cc3f4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
@@ -65,7 +65,7 @@
@Override
public List<DmpVariablesVO> getDmpVariablesByWorkstationId(Long workstationId) {
- return ((DmpVariablesMapper) this.baseMapper).getDmpVariablesByWorkstationId(workstationId);
+ return this.baseMapper.getDmpVariablesByWorkstationId(workstationId);
}
@Override
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/DmpVariablesVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/DmpVariablesVO.java
index ac9866f..acbedea 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/DmpVariablesVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/DmpVariablesVO.java
@@ -5,7 +5,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/DmpVariablesVO.class */
public class DmpVariablesVO implements Serializable {
private static final long serialVersionUID = -5852439219495925331L;
@JsonSerialize(using = ToStringSerializer.class)
@@ -54,7 +53,7 @@
private Long usageId;
private Long workstationId;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/DmpVariablesVO$DmpVariablesVOBuilder.class */
+
public static class DmpVariablesVOBuilder {
private Long id;
private String dmpDeviceId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java
index a496b50..b63e248 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java
@@ -40,7 +40,6 @@
@ApiResource({"blade-mdc/status-record"})
@Api(value = ExcelConstant.STATUS_RECORD, tags = {ExcelConstant.STATUS_RECORD})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/controller/StatusRecordController.class */
public class StatusRecordController {
private final IStatusRecordService statusRecordService;
private final IWorkstationFeedbackService feedbackService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/StatusRecordConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/StatusRecordConvert.java
index 71bf07c..feff00f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/StatusRecordConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/StatusRecordConvert.java
@@ -12,7 +12,6 @@
import com.qianwen.smartman.modules.system.constant.FieldConstant;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/convert/StatusRecordConvert.class */
public interface StatusRecordConvert {
public static final StatusRecordConvert INSTANCE = (StatusRecordConvert) Mappers.getMapper(StatusRecordConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ShiftIndexNameDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ShiftIndexNameDTO.java
index 41aaa60..7ee2f3f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ShiftIndexNameDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ShiftIndexNameDTO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ShiftIndexNameDTO.class */
public class ShiftIndexNameDTO {
@ApiModelProperty("鐝涓嬫爣")
private Integer shiftIndex;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedback.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedback.java
index df9415d..f1a15d7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedback.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedback.java
@@ -8,7 +8,6 @@
import java.util.Date;
@TableName("blade_wcs_feedback")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/WorkstationFeedback.class */
public class WorkstationFeedback extends Model<WorkstationFeedback> {
@ApiModelProperty("涓婚敭id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedbackDetail.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedbackDetail.java
index c432df1..fd09abe 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedbackDetail.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationFeedbackDetail.java
@@ -8,7 +8,6 @@
import java.util.Date;
@TableName("blade_wcs_feedback_detail")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/WorkstationFeedbackDetail.class */
public class WorkstationFeedbackDetail extends Model<WorkstationFeedbackDetail> {
@ApiModelProperty("涓婚敭id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProductivityTypeEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProductivityTypeEnum.java
index 932bc24..ff1371e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProductivityTypeEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProductivityTypeEnum.java
@@ -4,7 +4,6 @@
import java.util.List;
import com.qianwen.core.tool.utils.Func;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/ProductivityTypeEnum.class */
public enum ProductivityTypeEnum {
RUNNING(1, "杩愯鐜�"),
ALARM(2, "鎶ヨ鐜�"),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackDetailService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackDetailService.java
index 7a97519..dfc5f8f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackDetailService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackDetailService.java
@@ -8,7 +8,6 @@
import com.qianwen.smartman.modules.mdc.entity.WorkstationFeedbackDetail;
import org.springframework.cache.annotation.Cacheable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IWorkstationFeedbackDetailService.class */
public interface IWorkstationFeedbackDetailService extends IService<WorkstationFeedbackDetail> {
@Cacheable(cacheNames = {ExtCacheConstant.WORK_FEEDBACK_DETAIL}, key = "'list:cancel:workstationId:'.concat(#workstationId).concat(':').concat(#queryDate.toString())")
List<WorkstationFeedbackDetail> cancelFeedback(final LocalDate queryDate, final Long workstationId);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackService.java
index 1dacd7c..7dc5695 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationFeedbackService.java
@@ -19,7 +19,6 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.cache.annotation.Caching;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IWorkstationFeedbackService.class */
public interface IWorkstationFeedbackService extends IService<WorkstationFeedback> {
public static final String WORK_FEEDBACK_EXP = "blade:feedback#86400";
public static final String WORK_FEEDBACK_EXP3 = "blade:feedback#259200";
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
index 58d60d6..e175dae 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
@@ -86,7 +86,7 @@
this.ossBuilder = ossBuilder;
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public IPage<StatusRecordDateVO> getStatusRecordByDate(IPage<StatusRecordDateVO> page, StatusRecordDateSelectVO statusRecordDateSelectVO) {
List<StatusRecordDateVO> result = new ArrayList<>();
List<WorkstationInfoVO> workstationList = statusRecordDateSelectVO.getWorkstationInfoList();
@@ -127,7 +127,7 @@
return page.setRecords(result);
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public IPage<StatusRecordWorkstationVO> getStatusRecordByWorkstation(IPage<StatusRecordWorkstationVO> page, StatusRecordWorkstationSelectVO statusRecordWorkstationSelectVO) {
List<StatusRecordWorkstationVO> result = new ArrayList<>();
Long workstationId = statusRecordWorkstationSelectVO.getWorkstationId();
@@ -149,7 +149,7 @@
return page.setRecords(result);
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public List<ChartDataVO> getTimeDistribution(StatusRecordDetailSelectVO statusRecordDetailSelectVO) {
List<ChartDataVO> result = new ArrayList<>();
List<SuperAggregateState> superAggregateStateList = this.superAggregateStateService.getStatusData(Arrays.asList(statusRecordDetailSelectVO.getWorkstationId()), null, statusRecordDetailSelectVO.getDate(), statusRecordDetailSelectVO.getDate());
@@ -165,7 +165,7 @@
return result;
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
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());
@@ -180,7 +180,7 @@
return result;
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public List<StatusRecordShiftIndexChartVO> getShiftIndexStatusRecordChart(StatusRecordDetailSelectVO statusRecordDetailSelectVO) {
List<SuperAggregateState> statusData;
List<StatusRecordShiftIndexChartVO> result = new ArrayList<>();
@@ -198,7 +198,7 @@
}));
p.forEach(x -> {
List<StatusRecordVO> listRecord = Optional.ofNullable(StatusRecordConvert.INSTANCE.convert( shiftIndexStatusMap.get(x.getShiftIndex()))).map(list -> {
- return statusRecordDetailSelectVO.isHumanFeedback() ? WorkstationFeedbackWrapper.entityVO((List<StatusRecordVO>) list) : list;
+ return statusRecordDetailSelectVO.isHumanFeedback() ? WorkstationFeedbackWrapper.entityVO(list) : list;
}).orElse(null);
StatusRecordShiftIndexChartVO statusRecord = new StatusRecordShiftIndexChartVO().setShiftIndex(x.getShiftIndex()).setShiftIndexName(x.getShiftIndexName()).setStatusRecordList(listRecord);
result.add(statusRecord);
@@ -207,7 +207,7 @@
return result;
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public List<HashMap<String, String>> getShiftIndexStatusRecordTable(StatusRecordDetailSelectVO statusRecordDetailSelectVO) {
List<SuperAggregateState> statusData;
List<HashMap<String, String>> result = new ArrayList<>();
@@ -246,7 +246,7 @@
return result;
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public BladeFile exportStatusRecord(StatusRecordExcelVO vo) {
List<Long> ids;
List<Workstation> workstations;
@@ -316,7 +316,7 @@
return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public List<List<SuperAggregateStateVO>> crossDayState(CrossDayStateVO vo) {
LocalDate date = vo.getDate();
LocalDateTime start = LocalDateTime.of(date, LocalTime.MIN);
@@ -336,7 +336,7 @@
return list;
}
- @Override // org.springblade.modules.mdc.service.IStatusRecordService
+ @Override
public IPage<StatusRecordDateVO> getStatusRecordByDates(IPage<StatusRecordDateVO> page, StatusRecordDateTimeSelectVO statusRecordDateTimeSelectVO) {
List<StatusRecordDateVO> result = new ArrayList<>();
List<WorkstationInfoVO> workstationList = statusRecordDateTimeSelectVO.getWorkstationInfoList();
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);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java
index d908fb6..7796ed6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java
@@ -495,7 +495,7 @@
return WorkstationCache.getDefaultWcs();
}
- @Override // org.springblade.modules.mdc.service.ITimeUsedAnalysisService
+ @Override
public WorkstationBandShiftVO queryWorkStationShiftIndexName(QueryShiftIndexNameVO vo) {
Integer type = vo.getType();
if (MdcConstant.WORK_STATION.equals(type)) {
@@ -504,7 +504,7 @@
return getGroupShiftIndexName(vo);
}
- @Override // org.springblade.modules.mdc.service.ITimeUsedAnalysisService
+ @Override
public Map<Long, List<ShiftIndexNameDTO>> queryWorkStationShiftIndex(List<Long> workstationIds, LocalDate localDate) {
Map<Long, List<ShiftIndexNameDTO>> idToValue = Kv.newMap();
workstationIds.forEach(workstationId -> {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
index d6fddb0..728cf06 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
@@ -61,7 +61,6 @@
import cn.hutool.core.collection.ListUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.class */
public class WorkstationFeedbackServiceImpl extends ServiceImpl<WorkstationFeedbackMapper, WorkstationFeedback> implements IWorkstationFeedbackService {
static final String GROUP_FEEDBACK_CACHE_KEY = "group:feedback:list:";
@Resource
@@ -80,7 +79,7 @@
private IEmployeeService employeeService;
/* JADX WARN: Type inference failed for: r0v11, types: [org.springblade.modules.mdc.service.impl.WorkstationFeedbackServiceImpl$1] */
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
public IPage<WorkstationFeedbackInfoVO> workstationPage(Query query, boolean excludeImmediate) {
final List<WorkstationFeedback> immediateFeedback = this.selfService.getImmediateFeedback();
final List<Long> workstationList = immediateFeedback.stream().map((v0) -> {
@@ -116,7 +115,7 @@
}.pageVO(page);
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
public List<WorkstationFeedback> getImmediateFeedback() {
return list(Lambda.eq(WorkstationFeedback::getFeedbackType, Integer.valueOf(FeedbackType.IMMEDIATE.getValue()))
.isNull(WorkstationFeedback::getEndTime));
@@ -128,7 +127,7 @@
}));*/
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
public WorkstationFeedback getImmediateFeedback(Serializable workstationId) {
return getOne(Lambda.eq(WorkstationFeedback::getWorkstationId, workstationId)
.eq(WorkstationFeedback::getFeedbackType, Integer.valueOf(FeedbackType.IMMEDIATE.getValue()))
@@ -143,7 +142,7 @@
}));*/
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
@Transactional
public boolean startFeedbackByImmediate(WorkstationImmediateFeedBackDTO dto) {
Date now = new Date();
@@ -179,7 +178,7 @@
return true;
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
@Transactional
public boolean startFeedbackByNoImmediate(final WorkstationNoImmediateFeedBackDTO dto) {
if (dto.getEndTime().compareTo(new Date()) > 0) {
@@ -260,7 +259,7 @@
return employee;
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
@Transactional
public boolean endFeedback(WorkstationEndImmediateFeedBackDTO dto) {
WorkstationFeedback feedback = this.selfService.cachedById(dto.getFeedbackId());
@@ -284,7 +283,7 @@
return updateById(feedback);
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
@Transactional
public boolean endAndStartAgainFeedback(WorkstationEndAndStartImmediateFeedBackDTO dto) {
WorkstationEndImmediateFeedBackDTO endImmediateFeedBackDTO = new WorkstationEndImmediateFeedBackDTO();
@@ -334,7 +333,7 @@
})).collect(Collectors.toList());*/
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackService
+ @Override
public List<StatusRecordVO> groupStatusRecordWithFeedbackCache(final LocalDate statusTime, final Long workstationId, final List<StatusRecordVO> recordList) {
List<StatusRecordVO> statusRecordList = recordList == null ? new ArrayList<>() : recordList;
List<StatusRecordVO> cancelList = this.feedbackDetailService.cancelFeedback(statusTime, workstationId).stream().map(feedback -> {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/ChartDataVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/ChartDataVO.java
index e560536..352ef64 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/ChartDataVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/ChartDataVO.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.vo;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/vo/ChartDataVO.class */
public class ChartDataVO<T> {
private String name;
private T value;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDateVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDateVO.java
index 1035e94..2de404f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDateVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDateVO.java
@@ -4,7 +4,7 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/vo/StatusRecordDateVO.class */
+
public class StatusRecordDateVO implements Serializable {
private static final long serialVersionUID = 1;
@ApiModelProperty("宸ヤ綅淇℃伅")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDetailSelectVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDetailSelectVO.java
index d422616..85a9e95 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDetailSelectVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/StatusRecordDetailSelectVO.java
@@ -9,7 +9,6 @@
import java.time.LocalDate;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/vo/StatusRecordDetailSelectVO.class */
public class StatusRecordDetailSelectVO implements Serializable {
private static final long serialVersionUID = 1;
@NotNull(message = "宸ヤ綅ID涓嶈兘涓虹┖")
diff --git a/smart-starter-mybatis/src/main/java/com/qianwen/core/mp/support/BaseEntityWrapper.java b/smart-starter-mybatis/src/main/java/com/qianwen/core/mp/support/BaseEntityWrapper.java
index 97a7cf5..ce0f2a8 100644
--- a/smart-starter-mybatis/src/main/java/com/qianwen/core/mp/support/BaseEntityWrapper.java
+++ b/smart-starter-mybatis/src/main/java/com/qianwen/core/mp/support/BaseEntityWrapper.java
@@ -5,12 +5,11 @@
import java.util.List;
import java.util.stream.Collectors;
-/* loaded from: blade-starter-mybatis-9.3.0.0-SNAPSHOT.jar:org/springblade/core/mp/support/BaseEntityWrapper.class */
public abstract class BaseEntityWrapper<E, V> {
public abstract V entityVO(E entity);
public List<V> listVO(List<E> list) {
- return (List) list.stream().map(this::entityVO).collect(Collectors.toList());
+ return list.stream().map(this::entityVO).collect(Collectors.toList());
}
public IPage<V> pageVO(IPage<E> pages) {
--
Gitblit v1.9.3