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/mapper/TimeUsedAnalysisMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageUpdateVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessMainUpdateDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationCreateMessageDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/WorkstationFeedBackConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TimestampToProductionTimeCacheDto.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolModelVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/AlarmDTO.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CheckItemSubmitDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftInfoDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolModelDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryTreeVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/util/CellStyleUtil.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/StatisticalMethodEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolChangeRecordController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java | 9 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamSaveDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseStationDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayWarehouseAreaDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/TimeUsedAnalysisWorkstationVO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolModelController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamResDTO.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java | 21 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolManageExcel.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolCategory.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftTimeSlicesDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateOutputServiceImpl.java | 21 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolDischargeVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/RowRangeDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java | 9
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/constant/ToolConstant.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/interceptor/CustomCellWriteHandler.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/ConfigVO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessParameterRealVO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolCategoryController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatisticsService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupFeedbackCacheDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java | 13 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperNewCollectData.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolChangeRecordService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java | 11
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayFaceDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolParameterService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientCalendarCodesDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedDateExcel.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolParameter.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/Tool.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductCountDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IAlarmService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolParameterDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/SuperAggregateDataDto.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolCategoryMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeStateEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java | 5
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolParameterMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolCategoryConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackDetailMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/controller/OuterAppConfigController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordQueryVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationFeedBackQueryDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CacheBuildDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceMaintainInDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/RemoveIdsDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCheckDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolParameterController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolManageConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateOutputService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageEquipmentVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountResult.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftCacheDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/FactoryDayInfoDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolModel.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolModelMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineRepairDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailInfoDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/KeyNameDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/MixShiftDetailsDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/OrganizationDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/InitMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemUpdateVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedExport.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolManageController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolUseStateEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/VersionLineDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/StatusRecordExport.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolChangeRecordExcel.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/WcsStatusEnums.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolModelConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationCollectData.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDmpDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ParamDTO.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftRestTimeDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageSaveVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductTypeDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeNameDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/StatusDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationDmpDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationAlarmDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java | 16 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolQueryVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/TimeUsedAnalysisServiceImpl.java | 78 ++--------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseAreaDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndImmediateFeedBackDTO.java | 1
smart-man-boot/src/main/resources/application-dev.yml | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NameIdDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperNewCollectMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MainProcessSaveDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/AlarmConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCacheDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupWorkDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseGridDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/IntervalDateDto.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamSheetDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolParameterConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftIndexInfoDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IOutputStatisticsService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ToolAppendixDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessNmUpdateDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcel.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceSimpleDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ITimeUsedAnalysisService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountStatusDTO.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceTypePageDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/config/TheadPoolTaskConfig.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CraftVersionDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolManageMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationParamTypeDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainProjectItemAddDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/EfficiencyAnalysisExport.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageTreeVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateOutputMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationAnalysisService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationRealTimeStatusDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCodeShiftDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcelForOther.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CodeMapDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDetailDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineExtDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolOperationTypeEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolCategoryService.java | 1
smart-man-boot/src/main/resources/log/logback-test.xml | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolChangeRecordConvert.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProcessParamEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurrentShiftInfoDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/OutputShiftIndexSheetExcel.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurShiftDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ICollectDataService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolManageService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndAndStartImmediateFeedBackDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemExportDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/WorkstationBandShiftVO.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarDateDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java | 11
smart-man-boot/src/main/resources/application-test.yml | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolCategoryDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationImmediateFeedBackDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolChangeRecordMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessWcsDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationNoImmediateFeedBackDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDTO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/TimeDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterSaveVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductDTO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolChangeRecord.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeCountMethodEnum.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolModelService.java | 1
201 files changed, 90 insertions(+), 326 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java
index 1fd6c86..3593c0a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/InitController.java
@@ -65,12 +65,7 @@
public R<Boolean> initSystem(@Validated @RequestBody InitSettingVO initSettingVO) {
initSettingVO.setAppList(this.initService.getApp().stream().map(AppVO::getCode).collect(Collectors.toList()));
return R.data(this.initService.init(initSettingVO));
- /*
- initSettingVO.setAppList((List) this.initService.getApp().stream().map((v0) -> {
- return v0.getCode();
- }).collect(Collectors.toList()));
- return R.data(this.initService.init(initSettingVO));
- */
+
}
@PostMapping({"/license-upload"})
@@ -96,7 +91,7 @@
}
List<AppEnum> enums = AppEnum.of(detailDTO.getModules().toArray(new Integer[0]));
- Map<String, List<String>> collect = (Map<String, List<String>>)enums.stream().map(e -> AppNameDesDTO.builder().business(e.getBusiness()).desc(e.getDesc()).build()).collect(Collectors.groupingBy(AppNameDesDTO::getBusiness,
+ Map<String, List<String>> collect = enums.stream().map(e -> AppNameDesDTO.builder().business(e.getBusiness()).desc(e.getDesc()).build()).collect(Collectors.groupingBy(AppNameDesDTO::getBusiness,
Collectors.mapping(AppNameDesDTO::getDesc, Collectors.toList())));
LicenseDetailVO detailVO = LicenseConverter.INSTANCE.convert(detailDTO, collect);
return R.data(detailVO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CacheBuildDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CacheBuildDTO.java
index 1b5f9a4..a972856 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CacheBuildDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CacheBuildDTO.java
@@ -10,7 +10,6 @@
import java.util.Set;
@ApiModel(value = "鐢熶骇鏃ュ巻鏍￠獙鍏ュ弬", description = "鐢熶骇鏃ュ巻鏍￠獙鍏ュ弬")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CacheBuildDTO.class */
public class CacheBuildDTO implements Serializable {
private static final long serialVersionUID = 1;
private Set<String> tenantIds;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCacheDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCacheDTO.java
index 32df98a..13132e4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCacheDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCacheDTO.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CalendarCacheDTO.class */
public class CalendarCacheDTO {
@JSONField(serialize = false)
private String calendarCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCheckDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCheckDTO.java
index dbf01da..6c13770 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCheckDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCheckDTO.java
@@ -5,7 +5,6 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CalendarCheckDTO.class */
public class CalendarCheckDTO implements Serializable {
private static final long serialVersionUID = 1;
@NotBlank(message = "calendar code cannot be empty")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCodeShiftDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCodeShiftDTO.java
index 80c893e..2c854f0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCodeShiftDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarCodeShiftDTO.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/dto/CalendarCodeShiftDTO.class */
public class CalendarCodeShiftDTO implements Serializable {
private static final long serialVersionUID = 1;
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarDateDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarDateDTO.java
index dc348c4..7f669fa 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarDateDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarDateDTO.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/cps/dto/CalendarDateDTO.class */
public class CalendarDateDTO implements Serializable {
private static final long serialVersionUID = 1;
@JsonDeserialize(using = LocalDateDeserializer.class)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDTO.java
index 8282009..65bab1d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CalendarShiftDTO.class */
public class CalendarShiftDTO implements Serializable {
private static final long serialVersionUID = -1824203085457327485L;
private String calendarDate;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDetailDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDetailDTO.java
index 566b237..017cdce 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDetailDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftDetailDTO.java
@@ -2,7 +2,6 @@
import java.util.Date;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CalendarShiftDetailDTO.class */
public class CalendarShiftDetailDTO {
private String code;
private String factoryDate;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftTimeSlicesDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftTimeSlicesDTO.java
index b27582b..a2e5577 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftTimeSlicesDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CalendarShiftTimeSlicesDTO.java
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.util.Date;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CalendarShiftTimeSlicesDTO.class */
public class CalendarShiftTimeSlicesDTO implements Serializable {
private static final long serialVersionUID = -1858167373477278048L;
private String factoryDate;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CheckItemSubmitDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CheckItemSubmitDTO.java
index ab93134..82cdffd 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CheckItemSubmitDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CheckItemSubmitDTO.java
@@ -6,7 +6,6 @@
import javax.validation.constraints.NotNull;
@ApiModel(description = "鏂板鐐规椤逛俊鎭�")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CheckItemSubmitDTO.class */
public class CheckItemSubmitDTO implements Serializable {
private static final long serialVersionUID = 8394695443078255718L;
@NotNull(message = "{cps.check.item.name.not.null}")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CodeMapDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CodeMapDTO.java
index 95e4b6c..39e44b4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CodeMapDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CodeMapDTO.java
@@ -3,7 +3,6 @@
import java.util.List;
import java.util.Map;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CodeMapDTO.class */
public class CodeMapDTO {
private Map<String, String> shortCodeMap;
private Map<String, String> pinCodeMap;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CraftVersionDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CraftVersionDTO.java
index f76bc48..d680fcc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CraftVersionDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CraftVersionDTO.java
@@ -6,7 +6,6 @@
import com.qianwen.smartman.common.constant.DateConstant;
import org.springframework.format.annotation.DateTimeFormat;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CraftVersionDTO.class */
public class CraftVersionDTO {
@ApiModelProperty("涓婚敭id")
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurShiftDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurShiftDTO.java
index 00565f9..6347ef7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurShiftDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurShiftDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CurShiftDTO.class */
public class CurShiftDTO implements Serializable {
private static final long serialVersionUID = 1;
private String calendarCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurrentShiftInfoDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurrentShiftInfoDTO.java
index 652f533..c25bebe 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurrentShiftInfoDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/CurrentShiftInfoDTO.java
@@ -4,7 +4,6 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/CurrentShiftInfoDTO.class */
public class CurrentShiftInfoDTO implements Serializable {
private static final long serialVersionUID = 1;
private String calendarCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceMaintainInDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceMaintainInDTO.java
index f27f77d..1aca990 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceMaintainInDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceMaintainInDTO.java
@@ -2,7 +2,6 @@
import java.time.LocalDateTime;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/DeviceMaintainInDTO.class */
public class DeviceMaintainInDTO {
private LocalDateTime lastMaintainTime;
private LocalDateTime nextMaintainTime;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceSimpleDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceSimpleDTO.java
index 8677be1..a617c6d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceSimpleDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceSimpleDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/DeviceSimpleDTO.class */
public class DeviceSimpleDTO implements Serializable {
private Long deviceId;
private String code;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceTypePageDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceTypePageDTO.java
index 65f7228..fd1ac1f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceTypePageDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/DeviceTypePageDTO.java
@@ -5,7 +5,6 @@
import com.qianwen.core.mp.support.Query;
@ApiModel(description = "鏈哄櫒绫诲瀷鍒嗛〉鏌ヨ淇℃伅")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/DeviceTypePageDTO.class */
public class DeviceTypePageDTO {
@ApiModelProperty("鍒嗛〉淇℃伅")
private Query query;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeDTO.java
index a654fba..27438b7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeDTO.java
@@ -3,7 +3,7 @@
import java.io.Serializable;
import java.util.Date;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/EmployeeDTO.class */
+
public class EmployeeDTO implements Serializable {
private static final long serialVersionUID = 1;
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeNameDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeNameDTO.java
index 2f7e5f0..36eb3e7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeNameDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/EmployeeNameDTO.java
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.util.HashMap;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/EmployeeNameDTO.class */
public class EmployeeNameDTO implements Serializable {
private static final long serialVersionUID = 1;
private HashMap<String, Long> employeeNameMap;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/FactoryDayInfoDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/FactoryDayInfoDTO.java
index 5f3841a..5f9c5c8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/FactoryDayInfoDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/FactoryDayInfoDTO.java
@@ -8,7 +8,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/FactoryDayInfoDTO.class */
+
public class FactoryDayInfoDTO implements Serializable {
private static final long serialVersionUID = 1;
private String calendarCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/KeyNameDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/KeyNameDTO.java
index 6024e96..b92c6ed 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/KeyNameDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/KeyNameDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/KeyNameDTO.class */
public class KeyNameDTO implements Serializable {
private static final long serialVersionUID = 1;
@ApiModelProperty("key")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineDTO.java
index 01c6143..797a2ad 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineDTO.java
@@ -4,7 +4,6 @@
import com.qianwen.core.tenant.mp.TenantEntity;
@TableName("blade_machine")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/MachineDTO.class */
public class MachineDTO extends TenantEntity {
private static final long serialVersionUID = -883848031177958203L;
public String extendId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineExtDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineExtDTO.java
index 6788468..6410339 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineExtDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineExtDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/MachineExtDTO.class */
public class MachineExtDTO implements Serializable {
private static final long serialVersionUID = 8002136424403628039L;
private String extendId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineRepairDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineRepairDTO.java
index f476271..628e82f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineRepairDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MachineRepairDTO.java
@@ -2,7 +2,6 @@
import java.util.Date;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/MachineRepairDTO.class */
public class MachineRepairDTO {
private Date lastRepairTime;
private Long deviceId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MainProcessSaveDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MainProcessSaveDTO.java
index 070525b..631d0f9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MainProcessSaveDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MainProcessSaveDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/MainProcessSaveDTO.class */
public class MainProcessSaveDTO implements Serializable {
private static final long serialVersionUID = -3288821415413216308L;
@ApiModelProperty("鐗堟湰id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemExportDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemExportDTO.java
index 927099c..5126eeb 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemExportDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemExportDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/MaintainItemExportDTO.class */
public class MaintainItemExportDTO implements Serializable {
@ApiModelProperty("鍏抽敭璇�")
private String keyWord;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemUpdateVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemUpdateVO.java
index d278f57..423ac23 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemUpdateVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainItemUpdateVO.java
@@ -5,7 +5,6 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/MaintainItemUpdateVO.class */
public class MaintainItemUpdateVO implements Serializable {
private static final long serialVersionUID = 1;
@NotNull(message = "淇濆吇椤笽d涓嶈兘涓虹┖")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainProjectItemAddDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainProjectItemAddDTO.java
index daab4c3..8c8364a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainProjectItemAddDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/MaintainProjectItemAddDTO.java
@@ -6,7 +6,6 @@
import java.io.Serializable;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/MaintainProjectItemAddDTO.class */
public class MaintainProjectItemAddDTO implements Serializable {
private static final long serialVersionUID = 1;
@NotNull(message = "淇濆吇椤圭洰Id涓嶈兘涓虹┖")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/OrganizationDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/OrganizationDTO.java
index 068aa90..70a522f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/OrganizationDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/OrganizationDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/OrganizationDTO.class */
public class OrganizationDTO implements Serializable {
private static final long serialVersionUID = 1;
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessDTO.java
index ac39b3b..9b00110 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ProcessDTO.class */
public class ProcessDTO implements Serializable {
private static final long serialVersionUID = 1;
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessMainUpdateDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessMainUpdateDTO.java
index 358f393..d0c666f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessMainUpdateDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessMainUpdateDTO.java
@@ -4,7 +4,6 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ProcessMainUpdateDTO.class */
public class ProcessMainUpdateDTO implements Serializable {
private static final long serialVersionUID = 4035640649769982933L;
@ApiModelProperty("涓婚敭id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessNmUpdateDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessNmUpdateDTO.java
index 19405fe..d9057a9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessNmUpdateDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProcessNmUpdateDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ProcessNmUpdateDTO.class */
public class ProcessNmUpdateDTO implements Serializable {
private static final long serialVersionUID = 6740695848062674950L;
@ApiModelProperty("涓婚敭id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductCountDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductCountDTO.java
index fc62694..6801dbe 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductCountDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductCountDTO.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ProductCountDTO.class */
public class ProductCountDTO {
private Long productId;
private Integer count;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductDTO.java
index 2410a1c..6d9168a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductDTO.java
@@ -1,5 +1,4 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ProductDTO.class */
public class ProductDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductTypeDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductTypeDTO.java
index 9ac17a7..34d16e2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductTypeDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ProductTypeDTO.java
@@ -1,5 +1,4 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ProductTypeDTO.class */
public class ProductTypeDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/RemoveIdsDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/RemoveIdsDTO.java
index a59eed2..a7a8af4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/RemoveIdsDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/RemoveIdsDTO.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/RemoveIdsDTO.class */
public class RemoveIdsDTO {
private Long id;
private Long othersId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftCacheDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftCacheDTO.java
index 7f15913..c88ca4b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftCacheDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftCacheDTO.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftCacheDTO.class */
public class ShiftCacheDTO {
private Integer shiftIndex;
private Integer shiftTimeType;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailDTO.java
index 35ef6c2..0c38815 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailDTO.java
@@ -6,7 +6,6 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftDetailDTO.class */
public class ShiftDetailDTO implements Serializable {
private static final long serialVersionUID = 1;
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailInfoDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailInfoDTO.java
index bb7936e..295ada0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailInfoDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftDetailInfoDTO.java
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.time.LocalDate;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftDetailInfoDTO.class */
public class ShiftDetailInfoDTO implements Serializable {
private static final long serialVersionUID = 1;
private LocalDate calendarDate;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftIndexInfoDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftIndexInfoDTO.java
index d1dfc72..e5fa07d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftIndexInfoDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftIndexInfoDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftIndexInfoDTO.class */
public class ShiftIndexInfoDTO implements Serializable {
private static final long serialVersionUID = 1;
private Integer shiftIndex;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftInfoDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftInfoDTO.java
index b2dc9e2..059716e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftInfoDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftInfoDTO.java
@@ -4,7 +4,6 @@
import java.io.Serializable;
import com.qianwen.core.tool.utils.Func;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftInfoDTO.class */
public class ShiftInfoDTO implements Serializable {
private static final long serialVersionUID = 1;
@ApiModelProperty("宸ヤ綅Id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftRestTimeDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftRestTimeDTO.java
index 3695c5c..0fcc4b8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftRestTimeDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftRestTimeDTO.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/dto/ShiftRestTimeDTO.class */
public class ShiftRestTimeDTO implements Serializable {
private static final long serialVersionUID = 1;
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientCalendarCodesDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientCalendarCodesDTO.java
index cda382e..8c4b7cd 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientCalendarCodesDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientCalendarCodesDTO.java
@@ -4,7 +4,6 @@
import java.time.LocalDate;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftSlicesClientCalendarCodesDTO.class */
public class ShiftSlicesClientCalendarCodesDTO implements Serializable {
private static final long serialVersionUID = 1;
private String tenantId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientDTO.java
index 0bb08fe..6885d52 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesClientDTO.java
@@ -3,7 +3,7 @@
import java.io.Serializable;
import java.time.LocalDate;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftSlicesClientDTO.class */
+
public class ShiftSlicesClientDTO implements Serializable {
private static final long serialVersionUID = 1;
private String tenantId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesDTO.java
index 4a89211..51f2059 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ShiftSlicesDTO.java
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.time.LocalDateTime;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ShiftSlicesDTO.class */
public class ShiftSlicesDTO implements Serializable {
private static final long serialVersionUID = 1;
private LocalDateTime startTime;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TimestampToProductionTimeCacheDto.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TimestampToProductionTimeCacheDto.java
index 396b80f..4049399 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TimestampToProductionTimeCacheDto.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TimestampToProductionTimeCacheDto.java
@@ -3,7 +3,6 @@
import java.time.LocalDate;
import java.util.Map;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/TimestampToProductionTimeCacheDto.class */
public class TimestampToProductionTimeCacheDto {
private String TenantId;
private String CalendarCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ToolAppendixDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ToolAppendixDTO.java
index 69af198..407ddb4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ToolAppendixDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/ToolAppendixDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/ToolAppendixDTO.class */
public class ToolAppendixDTO implements Serializable {
private static final long serialVersionUID = 7318782816193263244L;
@ApiModelProperty(value = "鐖秈d", dataType = "java.lang.String")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayFaceDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayFaceDTO.java
index 684e108..12a72df 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayFaceDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayFaceDTO.java
@@ -5,7 +5,6 @@
import javax.validation.constraints.NotBlank;
import com.qianwen.smartman.common.constant.ExcelConstant;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/TrayFaceDTO.class */
public class TrayFaceDTO implements Serializable {
private static final long serialVersionUID = -3509847452596842033L;
@NotBlank(message = ExcelConstant.REQUIRED_FAIL_TEMPLATE)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayWarehouseAreaDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayWarehouseAreaDTO.java
index ecf3c3f..e7913ee 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayWarehouseAreaDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/TrayWarehouseAreaDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/TrayWarehouseAreaDTO.class */
public class TrayWarehouseAreaDTO implements Serializable {
private static final long serialVersionUID = -3509847452596842033L;
@ApiModelProperty("鎵樼洏缂栧彿")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/VersionLineDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/VersionLineDTO.java
index 78d8ecf..7106db9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/VersionLineDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/VersionLineDTO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/VersionLineDTO.class */
public class VersionLineDTO {
@ApiModelProperty("浜х嚎id")
private String groupId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseAreaDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseAreaDTO.java
index a0ebf48..e0eceba 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseAreaDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseAreaDTO.java
@@ -1,5 +1,5 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WarehouseAreaDTO.class */
+
public class WarehouseAreaDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseGridDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseGridDTO.java
index 96cea71..848c6f6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseGridDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseGridDTO.java
@@ -1,5 +1,4 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WarehouseGridDTO.class */
public class WarehouseGridDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseStationDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseStationDTO.java
index 4304550..c9d323b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseStationDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WarehouseStationDTO.java
@@ -1,5 +1,5 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WarehouseStationDTO.class */
+
public class WarehouseStationDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationAlarmDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationAlarmDTO.java
index dcb7869..93937fa 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationAlarmDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationAlarmDTO.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WorkstationAlarmDTO.class */
public class WorkstationAlarmDTO {
private String code;
private String msg;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationCreateMessageDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationCreateMessageDTO.java
index d54b091..ded2a8e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationCreateMessageDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationCreateMessageDTO.java
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.util.Date;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WorkstationCreateMessageDTO.class */
public class WorkstationCreateMessageDTO implements Serializable {
private static final long serialVersionUID = 7767723098083819778L;
private String workstationId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationDTO.java
index 45c5bd7..f3821b6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WorkstationDTO.class */
public class WorkstationDTO implements Serializable {
private Long id;
private String code;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationParamTypeDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationParamTypeDTO.java
index 655d53b..21e5a6b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationParamTypeDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationParamTypeDTO.java
@@ -1,6 +1,6 @@
package com.qianwen.smartman.modules.cps.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WorkstationParamTypeDTO.class */
+
public class WorkstationParamTypeDTO {
private Long id;
private Long workstationId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationRealTimeStatusDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationRealTimeStatusDTO.java
index 43d68f0..1642ceb 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationRealTimeStatusDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationRealTimeStatusDTO.java
@@ -4,7 +4,6 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WorkstationRealTimeStatusDTO.class */
public class WorkstationRealTimeStatusDTO implements Serializable {
@ApiModelProperty(value = "宸ヤ綅缁処d", dataType = "String")
private List<String> workStationGroupIdList;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDTO.java
index 9fa9ed5..8a659fd 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDTO.java
@@ -3,7 +3,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WorkstationWcsDTO.class */
+
public class WorkstationWcsDTO implements Serializable {
private static final long serialVersionUID = -8474615909932057153L;
@ApiModelProperty("id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDmpDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDmpDTO.java
index 1022b0a..aed58c5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDmpDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/dto/WorkstationWcsDmpDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/dto/WorkstationWcsDmpDTO.class */
public class WorkstationWcsDmpDTO implements Serializable {
private static final long serialVersionUID = -27216320873573146L;
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/InitMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/InitMapper.java
index 4bac3ae..bc5eb4a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/InitMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/mapper/InitMapper.java
@@ -3,7 +3,6 @@
import org.apache.ibatis.annotations.Param;
import com.qianwen.smartman.modules.cps.vo.InitSettingVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/mapper/InitMapper.class */
public interface InitMapper {
Integer checkIsNeedInit(@Param("dateBase") String dateBase, @Param("type") String type);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
index de16bec..b640884 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
@@ -85,7 +85,7 @@
@Override
public Boolean checkIsNeedInit() {
- return Boolean.valueOf(this.initMapper.checkIsNeedInit(this.configVO.getDatabase(), this.configVO.getType()).intValue() <= 0);
+ return this.initMapper.checkIsNeedInit(this.configVO.getDatabase(), this.configVO.getType()) <= 0;
}
@Override
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/ConfigVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/ConfigVO.java
index 2a4583c..ab5c99b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/ConfigVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/ConfigVO.java
@@ -8,7 +8,6 @@
@ApiModel(description = "閰嶇疆淇℃伅")
@Component
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/ConfigVO.class */
public class ConfigVO implements Serializable {
@Value("${oss.endpoint}")
@ApiModelProperty(name = "ossUrl")
@@ -38,7 +37,6 @@
@ApiModelProperty("ip")
private String url;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/ConfigVO$ConfigVOBuilder.class */
public static class ConfigVOBuilder {
private String ossUrl;
private String accessKey;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/config/TheadPoolTaskConfig.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/config/TheadPoolTaskConfig.java
index 8f3d484..c66cada 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/config/TheadPoolTaskConfig.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/config/TheadPoolTaskConfig.java
@@ -6,7 +6,6 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@Configuration
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/config/TheadPoolTaskConfig.class */
public class TheadPoolTaskConfig {
@Bean({"threadPoolTaskExecutor"})
public ThreadPoolTaskExecutor threadPoolTaskExecutor() {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java
index e14d714..6a69eb1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.constant;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/constant/CollectConstant.class */
public interface CollectConstant {
public static final Integer MAX_VALUE = 256;
public static final Integer STRING_DATA_TYPE = 11;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/AlarmConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/AlarmConvert.java
index e0a0297..227b61f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/AlarmConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/AlarmConvert.java
@@ -11,7 +11,6 @@
import com.qianwen.smartman.modules.mdc.vo.AlarmDataSheetVO;
@Mapper(builder = @Builder(disableBuilder = true), imports = {ConvertUtils.class})
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/convert/AlarmConvert.class */
public interface AlarmConvert {
public static final AlarmConvert INSTANCE = (AlarmConvert) Mappers.getMapper(AlarmConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/WorkstationFeedBackConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/WorkstationFeedBackConvert.java
index cf7633c..e9f1716 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/WorkstationFeedBackConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/convert/WorkstationFeedBackConvert.java
@@ -9,7 +9,6 @@
import com.qianwen.smartman.modules.mdc.vo.WorkstationFeedBackVO;
@Mapper(builder = @Builder(disableBuilder = true))
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/convert/WorkstationFeedBackConvert.class */
public interface WorkstationFeedBackConvert {
public static final WorkstationFeedBackConvert INSTANCE = (WorkstationFeedBackConvert) Mappers.getMapper(WorkstationFeedBackConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/AlarmDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/AlarmDTO.java
index 73670bb..c057637 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/AlarmDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/AlarmDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/AlarmDTO.class */
public class AlarmDTO implements Serializable {
private static final long serialVersionUID = 4568550286435619112L;
private String code;
@@ -10,7 +9,7 @@
private Long timestamp;
private Integer level;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/AlarmDTO$AlarmDTOBuilder.class */
+
public static class AlarmDTOBuilder {
private String code;
private String msg;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountResult.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountResult.java
index 5573547..d1597c9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountResult.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountResult.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/CountResult.class */
public class CountResult {
@ApiModelProperty("鏁伴噺")
private Integer nums;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountStatusDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountStatusDTO.java
index 296cea8..b06ef23 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountStatusDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/CountStatusDTO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/CountStatusDTO.class */
public class CountStatusDTO {
@ApiModelProperty("鐘舵�佹暟閲�")
private Long count;
@@ -11,7 +10,7 @@
@ApiModelProperty("code鐮�")
private String code;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/CountStatusDTO$CountStatusDTOBuilder.class */
+
public static class CountStatusDTOBuilder {
private Long count;
private String statusName;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupFeedbackCacheDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupFeedbackCacheDTO.java
index cee4a62..e426a93 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupFeedbackCacheDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupFeedbackCacheDTO.java
@@ -3,7 +3,6 @@
import java.util.List;
import com.qianwen.smartman.modules.mdc.vo.StatusRecordVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/GroupFeedbackCacheDTO.class */
public class GroupFeedbackCacheDTO {
private List<StatusRecordVO> recordList;
private int statusNum = 0;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupWorkDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupWorkDTO.java
index 078a1b0..55833db 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupWorkDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/GroupWorkDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/GroupWorkDTO.class */
public class GroupWorkDTO implements Serializable {
private static final long serialVersionUID = -2903238897638710247L;
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/IntervalDateDto.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/IntervalDateDto.java
index 29cfa44..2049182 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/IntervalDateDto.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/IntervalDateDto.java
@@ -2,7 +2,6 @@
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/IntervalDateDto.class */
public class IntervalDateDto {
private Integer year;
private List<Integer> weekList;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/MixShiftDetailsDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/MixShiftDetailsDTO.java
index 0e5c099..6d0fba3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/MixShiftDetailsDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/MixShiftDetailsDTO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/MixShiftDetailsDTO.class */
public class MixShiftDetailsDTO {
@ApiModelProperty("鐝涓嬫爣")
private Integer shiftIndex;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NameIdDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NameIdDTO.java
index 133937d..b1d0046 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NameIdDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NameIdDTO.java
@@ -4,7 +4,6 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/NameIdDTO.class */
public class NameIdDTO {
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("宸ヤ綅id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamDTO.java
index eaa63d3..d47a3d7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/NewParamDTO.class */
public class NewParamDTO implements Serializable {
private static final long serialVersionUID = 8655977093978301400L;
private Long ts;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamSaveDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamSaveDTO.java
index 2639d9d..1cb1086 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamSaveDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/NewParamSaveDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/NewParamSaveDTO.class */
public class NewParamSaveDTO implements Serializable {
private static final long serialVersionUID = 8381159539502968120L;
private Long ts;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ParamDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ParamDTO.java
index 49a43c9..3d45bc7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ParamDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ParamDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ParamDTO.class */
public class ParamDTO implements Serializable {
private static final long serialVersionUID = -4353208301080753423L;
@ApiModelProperty("鏃堕棿鐐�")
@@ -11,7 +10,7 @@
@ApiModelProperty("瀵瑰簲鐨勫��")
private String value;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ParamDTO$ParamDTOBuilder.class */
+
public static class ParamDTOBuilder {
private String time;
private String value;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamResDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamResDTO.java
index 03d4027..1a4e38e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamResDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamResDTO.java
@@ -4,7 +4,6 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ProParamResDTO.class */
public class ProParamResDTO implements Serializable {
private static final long serialVersionUID = -2983008804443599665L;
@ApiModelProperty("閲囬泦椤瑰悕绉�")
@@ -18,7 +17,7 @@
@ApiModelProperty("鐘舵�佹暟鎹�")
private List<ProcessWcsDTO> statusData;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ProParamResDTO$ProParamResDTOBuilder.class */
+
public static class ProParamResDTOBuilder {
private String collectItem;
private String collectRealItem;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamSheetDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamSheetDTO.java
index ed97446..385e68f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamSheetDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProParamSheetDTO.java
@@ -4,7 +4,6 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ProParamSheetDTO.class */
public class ProParamSheetDTO implements Serializable {
private static final long serialVersionUID = 5849438396598711205L;
@ApiModelProperty("鏍囬")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessParameterRealVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessParameterRealVO.java
index 8900041..582206c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessParameterRealVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessParameterRealVO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ProcessParameterRealVO.class */
public class ProcessParameterRealVO implements Serializable {
private static final long serialVersionUID = -1794674168753499898L;
private String time;
@@ -10,7 +9,6 @@
private String collectItem;
private String value;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ProcessParameterRealVO$ProcessParameterRealVOBuilder.class */
public static class ProcessParameterRealVOBuilder {
private String time;
private Long realTime;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessWcsDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessWcsDTO.java
index 091d489..35d995a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessWcsDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/ProcessWcsDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ProcessWcsDTO.class */
public class ProcessWcsDTO implements Serializable {
private static final long serialVersionUID = 5759334655353228802L;
private String time;
@@ -15,7 +14,6 @@
@ApiModelProperty("鐘舵�侀鑹�")
private String color;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/ProcessWcsDTO$ProcessWcsDTOBuilder.class */
public static class ProcessWcsDTOBuilder {
private String time;
private Long realTime;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/RowRangeDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/RowRangeDTO.java
index f4672b2..476cc9c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/RowRangeDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/RowRangeDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/RowRangeDTO.class */
public class RowRangeDTO implements Serializable {
private static final long serialVersionUID = 1867084810076047992L;
private Integer start;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/StatusDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/StatusDTO.java
index 90ff0c8..5936a7d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/StatusDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/StatusDTO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/StatusDTO.class */
public class StatusDTO implements Serializable {
private static final long serialVersionUID = -4353208301080753423L;
@ApiModelProperty("鏃堕棿鐐�")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/SuperAggregateDataDto.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/SuperAggregateDataDto.java
index df342c0..8c5300c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/SuperAggregateDataDto.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/SuperAggregateDataDto.java
@@ -4,7 +4,6 @@
import com.qianwen.smartman.modules.mdc.entity.SuperAggregateOutput;
import com.qianwen.smartman.modules.mdc.entity.SuperAggregateState;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/SuperAggregateDataDto.class */
public class SuperAggregateDataDto {
List<SuperAggregateOutput> superAggregateOutputs;
List<SuperAggregateState> superAggregateStates;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/TimeDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/TimeDTO.java
index 676c2c0..cc26f5a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/TimeDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/TimeDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/TimeDTO.class */
public class TimeDTO implements Serializable {
private static final long serialVersionUID = -3851767521941943590L;
private Long startTime;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationDmpDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationDmpDTO.java
index aca8d4e..852725f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationDmpDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationDmpDTO.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/WorkstationDmpDTO.class */
public class WorkstationDmpDTO implements Serializable {
private static final long serialVersionUID = 2505656773607588758L;
private Long workstationId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndAndStartImmediateFeedBackDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndAndStartImmediateFeedBackDTO.java
index 9b0f7bb..41ab8b5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndAndStartImmediateFeedBackDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndAndStartImmediateFeedBackDTO.java
@@ -4,7 +4,6 @@
import java.util.Date;
import javax.validation.constraints.NotBlank;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/WorkstationEndAndStartImmediateFeedBackDTO.class */
public class WorkstationEndAndStartImmediateFeedBackDTO {
@NotBlank
@ApiModelProperty("宸ヤ綅Id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndImmediateFeedBackDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndImmediateFeedBackDTO.java
index 06b1859..d39a060 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndImmediateFeedBackDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationEndImmediateFeedBackDTO.java
@@ -7,7 +7,6 @@
import com.qianwen.smartman.common.constant.DateConstant;
import org.springframework.format.annotation.DateTimeFormat;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/WorkstationEndImmediateFeedBackDTO.class */
public class WorkstationEndImmediateFeedBackDTO {
@NotBlank
@ApiModelProperty("鍙嶉Id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationFeedBackQueryDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationFeedBackQueryDTO.java
index d003490..b00a0c6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationFeedBackQueryDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationFeedBackQueryDTO.java
@@ -7,7 +7,6 @@
import com.qianwen.smartman.common.constant.DateConstant;
import org.springframework.format.annotation.DateTimeFormat;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/WorkstationFeedBackQueryDTO.class */
public class WorkstationFeedBackQueryDTO {
@ApiModelProperty("鐘舵��")
private List<String> feedBackStatus;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationImmediateFeedBackDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationImmediateFeedBackDTO.java
index e63d497..bdd6093 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationImmediateFeedBackDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationImmediateFeedBackDTO.java
@@ -4,7 +4,6 @@
import java.util.List;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/WorkstationImmediateFeedBackDTO.class */
public class WorkstationImmediateFeedBackDTO {
@ApiModelProperty("宸ヤ綅Id鍒楄〃")
private List<String> workstationIds;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationNoImmediateFeedBackDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationNoImmediateFeedBackDTO.java
index 5275bec..cf7e8e3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationNoImmediateFeedBackDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/WorkstationNoImmediateFeedBackDTO.java
@@ -10,7 +10,6 @@
import com.qianwen.smartman.common.constant.DateConstant;
import org.springframework.format.annotation.DateTimeFormat;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/dto/WorkstationNoImmediateFeedBackDTO.class */
public class WorkstationNoImmediateFeedBackDTO {
@NotBlank
@ApiModelProperty("鐘舵�佺爜")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java
index 6a6f993..e6dd596 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregate.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/SuperAggregate.class */
public class SuperAggregate implements Serializable {
private static final long serialVersionUID = 1074211007569731042L;
private String calendarCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java
index 8c4fefb..f2ffe03 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateOutput.java
@@ -2,7 +2,6 @@
import java.sql.Timestamp;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/SuperAggregateOutput.class */
public class SuperAggregateOutput extends SuperAggregate {
private static final long serialVersionUID = 1074211007569731042L;
private Timestamp ts;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
index a4f1db6..d29435b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAggregateState.java
@@ -2,7 +2,6 @@
import java.sql.Timestamp;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/SuperAggregateState.class */
public class SuperAggregateState extends SuperAggregate {
private Timestamp startTime;
private Timestamp endTime;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java
index b763526..123387e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperAlarm.java
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.sql.Timestamp;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/SuperAlarm.class */
public class SuperAlarm extends SuperAggregate implements Serializable {
private static final long serialVersionUID = 1123326427413588953L;
private Timestamp ts;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperNewCollectData.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperNewCollectData.java
index 57ac970..c19f58d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperNewCollectData.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/SuperNewCollectData.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.entity;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/SuperNewCollectData.class */
public class SuperNewCollectData {
private Long ts;
private String n;
@@ -8,7 +7,7 @@
private Long workstationId;
private String item;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/SuperNewCollectData$SuperNewCollectDataBuilder.class */
+
public static class SuperNewCollectDataBuilder {
private Long ts;
private String n;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationCollectData.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationCollectData.java
index 6b34015..3b6976a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationCollectData.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/entity/WorkstationCollectData.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
@TableName("iot_data.super_collect_data")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/entity/WorkstationCollectData.class */
public class WorkstationCollectData {
private Long ts;
private String n;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java
index f7d055d..5c01046 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackStatus.java
@@ -2,7 +2,6 @@
import java.util.stream.Stream;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/FeedbackStatus.class */
public enum FeedbackStatus {
WAIT_SYNC("寰呮墽琛�", 1),
SYNCING("鎵ц涓�", 2),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java
index affb0dd..81822f3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/FeedbackType.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.enums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/FeedbackType.class */
public enum FeedbackType {
TIME_RANGE("鏃堕棿娈靛弽棣�", 0),
IMMEDIATE("鍗虫椂鍙嶉", 1);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProcessParamEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProcessParamEnum.java
index d1cf711..88a9e89 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProcessParamEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/ProcessParamEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.enums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/ProcessParamEnum.class */
public enum ProcessParamEnum {
SHIFT(1, "鐝"),
HOUR(2, "灏忔椂");
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/StatisticalMethodEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/StatisticalMethodEnum.java
index c528eeb..ece1846 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/StatisticalMethodEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/StatisticalMethodEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.enums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/StatisticalMethodEnum.class */
public enum StatisticalMethodEnum {
SHIFT(1, "鐝"),
DAY(2, "鏃�"),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/WcsStatusEnums.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/WcsStatusEnums.java
index 7a42d0f..a05f3c1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/WcsStatusEnums.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/enums/WcsStatusEnums.java
@@ -3,7 +3,6 @@
import com.google.common.collect.Lists;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/enums/WcsStatusEnums.class */
public enum WcsStatusEnums {
ALARM(1, "鎶ヨ"),
RUNNING(2, "杩愯"),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcel.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcel.java
index 0bdac5c..4af032e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcel.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcel.java
@@ -9,7 +9,6 @@
@HeadRowHeight(20)
@ColumnWidth(16)
@ContentRowHeight(18)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/excel/AlarmDataSheetExcel.class */
public class AlarmDataSheetExcel implements Serializable {
private static final long serialVersionUID = 8916841183037573536L;
@ExcelProperty({"鏃ユ湡"})
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcelForOther.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcelForOther.java
index 84dfa7f..43c7ee8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcelForOther.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/AlarmDataSheetExcelForOther.java
@@ -9,7 +9,6 @@
@HeadRowHeight(20)
@ColumnWidth(16)
@ContentRowHeight(18)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/excel/AlarmDataSheetExcelForOther.class */
public class AlarmDataSheetExcelForOther implements Serializable {
private static final long serialVersionUID = 8916841183037573536L;
@ExcelProperty({"鏃ユ湡"})
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/EfficiencyAnalysisExport.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/EfficiencyAnalysisExport.java
index f35a743..085e1cd 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/EfficiencyAnalysisExport.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/EfficiencyAnalysisExport.java
@@ -10,7 +10,6 @@
@HeadRowHeight(20)
@ColumnWidth(16)
@ContentRowHeight(18)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/excel/EfficiencyAnalysisExport.class */
public class EfficiencyAnalysisExport implements Serializable {
private static final long serialVersionUID = 5137988533735539904L;
@ExcelProperty(value = {"鏃ユ湡"}, index = 0)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/OutputShiftIndexSheetExcel.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/OutputShiftIndexSheetExcel.java
index b6da7d9..6f8cade 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/OutputShiftIndexSheetExcel.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/OutputShiftIndexSheetExcel.java
@@ -9,7 +9,6 @@
@HeadRowHeight(20)
@ColumnWidth(16)
@ContentRowHeight(18)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/excel/OutputShiftIndexSheetExcel.class */
public class OutputShiftIndexSheetExcel {
@ExcelProperty(value = {"鏃ユ湡"}, index = 0)
private String date;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/StatusRecordExport.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/StatusRecordExport.java
index 39a2603..13c9a4b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/StatusRecordExport.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/StatusRecordExport.java
@@ -10,7 +10,6 @@
@HeadRowHeight(20)
@ColumnWidth(16)
@ContentRowHeight(18)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/excel/StatusRecordExport.class */
public class StatusRecordExport implements Serializable {
private static final long serialVersionUID = 5137988533735539904L;
@ExcelProperty(value = {"鏃ユ湡"}, index = 0)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedDateExcel.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedDateExcel.java
index cc0c005..e650763 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedDateExcel.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedDateExcel.java
@@ -10,7 +10,6 @@
@HeadRowHeight(20)
@ColumnWidth(16)
@ContentRowHeight(18)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/excel/TimeUsedDateExcel.class */
public class TimeUsedDateExcel implements Serializable {
private static final long serialVersionUID = -1941308140397536285L;
@ExcelProperty(value = {"鏃ユ湡"}, index = 0)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedExport.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedExport.java
index 60726f2..4b2fe6d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedExport.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/excel/TimeUsedExport.java
@@ -10,7 +10,6 @@
@HeadRowHeight(20)
@ColumnWidth(16)
@ContentRowHeight(18)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/excel/TimeUsedExport.class */
public class TimeUsedExport implements Serializable {
private static final long serialVersionUID = -4830514731073165689L;
@ExcelProperty(value = {"鏃ユ湡"}, index = 0)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateOutputMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateOutputMapper.java
index c119497..1d18017 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateOutputMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateOutputMapper.java
@@ -6,7 +6,6 @@
import com.qianwen.smartman.modules.mdc.entity.SuperAggregateOutput;
@DS("tdengine")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/SuperAggregateOutputMapper.class */
public interface SuperAggregateOutputMapper {
List<SuperAggregateOutput> getOutputDataByNaturalDate(@Param("workstationIds") List<Long> workstationIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.java
index 4e9f368..47a4916 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.java
@@ -9,7 +9,6 @@
@DS("tdengine")
@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.class */
public interface SuperAggregateStateFeedbackMapper {
List<SuperAggregateState> getStatusDataByFactoryDate(@Param("workstationIds") List<Long> workstationIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java
index c143a09..3384fdf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java
@@ -12,7 +12,6 @@
@DS("tdengine")
@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/SuperAggregateStateMapper.class */
public interface SuperAggregateStateMapper {
void createTable(@Param("workstationId") Long workstationId);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java
index b41c0dd..4cf90f8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAlarmMapper.java
@@ -18,7 +18,6 @@
@DS("tdengine")
@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/SuperAlarmMapper.class */
public interface SuperAlarmMapper extends BaseMapper<SuperAlarm> {
List<AlarmAnalysisWorkstationVO> alarmByWorkstation(@Param("workstationId") String workstationId, @Param("start") Integer start, @Param("end") Integer end);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.java
index b951d02..b5f226e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.java
@@ -10,7 +10,6 @@
@DS("tdengine")
@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/SuperCollectJsonMapper.class */
public interface SuperCollectJsonMapper {
void insertValueJson(List<NewParamSaveDTO> data);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperNewCollectMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperNewCollectMapper.java
index 32594a7..9e6607c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperNewCollectMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperNewCollectMapper.java
@@ -11,7 +11,6 @@
@DS("tdengine")
@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/SuperNewCollectMapper.class */
public interface SuperNewCollectMapper extends BaseMapper<SuperNewCollectData> {
void createSuperTable();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java
index 504a36e..5913d39 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperProcessParameterMapper.java
@@ -8,7 +8,6 @@
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
@DS("tdengine")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/SuperProcessParameterMapper.class */
public interface SuperProcessParameterMapper {
List<WorkstationCollectData> queryLastParameter(@Param("workstationId") String workstationId);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/TimeUsedAnalysisMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/TimeUsedAnalysisMapper.java
index 31fb14b..3655628 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/TimeUsedAnalysisMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/TimeUsedAnalysisMapper.java
@@ -15,7 +15,6 @@
import org.springframework.stereotype.Component;
@Component
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/TimeUsedAnalysisMapper.class */
public class TimeUsedAnalysisMapper {
private final JdbcTemplate jdbcTemplate;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackDetailMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackDetailMapper.java
index f26a87f..9a9062c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackDetailMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackDetailMapper.java
@@ -7,7 +7,6 @@
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.modules.mdc.entity.WorkstationFeedbackDetail;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/WorkstationFeedbackDetailMapper.class */
public interface WorkstationFeedbackDetailMapper extends BaseMapper<WorkstationFeedbackDetail> {
public static final String BASE_WRAPPER_SQL = "select * from blade_wcs_feedback_detail ${ew.customSqlSegment} ";
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackMapper.java
index a6e43b2..3b1fb36 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/WorkstationFeedbackMapper.java
@@ -3,6 +3,5 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qianwen.smartman.modules.mdc.entity.WorkstationFeedback;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/mapper/WorkstationFeedbackMapper.class */
public interface WorkstationFeedbackMapper extends BaseMapper<WorkstationFeedback> {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IAlarmService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IAlarmService.java
index eded0a2..3cc3381 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IAlarmService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IAlarmService.java
@@ -11,7 +11,6 @@
import com.qianwen.smartman.modules.mdc.vo.AlarmSummaryGraphShiftVO;
import com.qianwen.smartman.modules.mdc.vo.AlarmSummaryGraphVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IAlarmService.class */
public interface IAlarmService {
IPage<AlarmDataSheetVO> pageAlarm(Query query, AlarmShiftSearchVO vo);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ICollectDataService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ICollectDataService.java
index 7841b60..d439b8c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ICollectDataService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ICollectDataService.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.mdc.service;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/ICollectDataService.class */
public interface ICollectDataService {
void cacheNowCollectData();
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IOutputStatisticsService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IOutputStatisticsService.java
index cb0b27e..f96d789 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IOutputStatisticsService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IOutputStatisticsService.java
@@ -5,7 +5,6 @@
import com.qianwen.smartman.modules.mdc.vo.StatisticsAnalysisQueryVO;
import com.qianwen.smartman.modules.mdc.vo.StatisticsVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IOutputStatisticsService.class */
public interface IOutputStatisticsService {
StatisticsVO outputStatistics(StatisticsAnalysisQueryVO statisticsAnalysisQueryVO, Query query);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java
index 331cf4f..d79f5b2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IRealTimeDataService.java
@@ -5,7 +5,6 @@
import com.qianwen.smartman.modules.cps.vo.DmpVariablesVO;
import com.qianwen.smartman.modules.mdc.vo.WorkstationVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IRealTimeDataService.class */
public interface IRealTimeDataService {
List<DmpStatusVariableVO> getWorkstationRealTimeStatus(WorkstationVO workstationVO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatisticsService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatisticsService.java
index e32970f..77a6ba1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatisticsService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatisticsService.java
@@ -3,7 +3,6 @@
import com.qianwen.smartman.modules.mdc.vo.AnalysisFilterVO;
import com.qianwen.smartman.modules.mdc.vo.SplitFilterListVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IStatisticsService.class */
public interface IStatisticsService {
SplitFilterListVO organizeQueryConditions(AnalysisFilterVO input);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java
index 83a3704..012aa04 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java
@@ -16,7 +16,6 @@
import com.qianwen.smartman.modules.mdc.vo.SuperAggregateStateVO;
import com.qianwen.smartman.modules.mdc.vo.excel.StatusRecordExcelVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IStatusRecordService.class */
public interface IStatusRecordService {
IPage<StatusRecordDateVO> getStatusRecordByDate(IPage<StatusRecordDateVO> page, StatusRecordDateSelectVO statusRecordDateSelectVO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateOutputService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateOutputService.java
index f3c5aa9..46e80c7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateOutputService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateOutputService.java
@@ -5,7 +5,6 @@
import com.qianwen.smartman.modules.mdc.entity.SuperAggregateOutput;
import com.qianwen.smartman.modules.mdc.enums.StatisticalMethodEnum;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/ISuperAggregateOutputService.class */
public interface ISuperAggregateOutputService {
List<SuperAggregateOutput> getOutputData(List<Long> workstationIds, StatisticalMethodEnum statisticalMethod, LocalDate startDate, LocalDate endDate);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java
index a216b90..a8bb827 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java
@@ -7,7 +7,6 @@
import com.qianwen.smartman.modules.mdc.enums.StatisticalMethodEnum;
import com.qianwen.smartman.modules.mdc.vo.StatusTimeTopVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/ISuperAggregateStateService.class */
public interface ISuperAggregateStateService {
List<SuperAggregateState> getStatusData(List<Long> workstationIds, StatisticalMethodEnum statisticalMethod, LocalDate startDate, LocalDate endDate);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java
index e279471..adce897 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java
@@ -2,7 +2,6 @@
import java.util.Set;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/ISuperNewCollectService.class */
public interface ISuperNewCollectService {
void insertData(Set<String> workstationIds);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ITimeUsedAnalysisService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ITimeUsedAnalysisService.java
index 9cfb559..efb4e61 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ITimeUsedAnalysisService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ITimeUsedAnalysisService.java
@@ -12,7 +12,6 @@
import com.qianwen.smartman.modules.mdc.vo.WorkstationBandShiftVO;
import com.qianwen.smartman.modules.mdc.vo.excel.TimeUsedExcelVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/ITimeUsedAnalysisService.class */
public interface ITimeUsedAnalysisService {
TimeUsedAnalysisWorkstationVO timeUsedStatisticsByWorkstation(TimeUsedStatisticsByWorkstationVO stationVO, Query query);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationAnalysisService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationAnalysisService.java
index f28cbf4..0169417 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationAnalysisService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IWorkstationAnalysisService.java
@@ -8,7 +8,6 @@
import com.qianwen.smartman.modules.mdc.vo.StatusAnalysisWorkstationVO;
import com.qianwen.smartman.modules.mdc.vo.StatusTimeTotalVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/IWorkstationAnalysisService.class */
public interface IWorkstationAnalysisService {
List<StatusAnalysisWorkstationVO> statusByWorkstation(String workstationId);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
index 544b284..82426a8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
@@ -57,7 +57,6 @@
import cn.hutool.core.util.StrUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/OutputStatisticsServiceImpl.class */
public class OutputStatisticsServiceImpl implements IOutputStatisticsService {
private static final String ZERO = "0";
private final IWorkstationService workstationService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java
index bffccea..0ad22ce 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/RealTimeDataServiceImpl.java
@@ -16,12 +16,12 @@
import com.qianwen.smartman.modules.cps.service.IWorkstationOfMachineService;
import com.qianwen.smartman.modules.cps.vo.DmpStatusVariableVO;
import com.qianwen.smartman.modules.cps.vo.DmpVariablesVO;
+import com.qianwen.smartman.modules.cps.vo.WorkstationRealTimeStatusVO;
import com.qianwen.smartman.modules.mdc.service.IRealTimeDataService;
import com.qianwen.smartman.modules.mdc.vo.WorkstationVO;
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/RealTimeDataServiceImpl.class */
public class RealTimeDataServiceImpl implements IRealTimeDataService {
private final WorkstationMapper workstationMapper;
private final IWorkstationOfMachineService workstationOfMachineService;
@@ -33,18 +33,16 @@
this.dmpVariablesService = dmpVariablesService;
}
- @Override // org.springblade.modules.mdc.service.IRealTimeDataService
+ @Override
public List<DmpStatusVariableVO> getWorkstationRealTimeStatus(WorkstationVO workstationVO) {
List<Long> workstationIdList = workstationVO.getWorkstationIdList();
if (Func.isEmpty(workstationIdList)) {
- List<String> workstationGroupIdList = (List) workstationVO.getWorkstationGroupIdList().stream().map(x -> {
+ List<String> workstationGroupIdList = workstationVO.getWorkstationGroupIdList().stream().map(x -> {
return String.valueOf(x);
}).collect(Collectors.toList());
WorkstationRealTimeStatusDTO workstationRealTimeStatusDTO = new WorkstationRealTimeStatusDTO();
workstationRealTimeStatusDTO.setWorkStationGroupIdList(workstationGroupIdList);
- workstationIdList = (List) this.workstationMapper.getWorkstationListByWorkStationGroupIdList(null, workstationRealTimeStatusDTO).stream().map((v0) -> {
- return v0.getId();
- }).collect(Collectors.toList());
+ workstationIdList = this.workstationMapper.getWorkstationListByWorkStationGroupIdList(null, workstationRealTimeStatusDTO).stream().map(WorkstationRealTimeStatusVO::getId).collect(Collectors.toList());
}
List<DmpStatusVariableVO> dmpStatusVariableList = this.dmpVariablesService.getDmpVariablesByWorkstationIdList(workstationIdList);
dmpStatusVariableList.forEach(x2 -> {
@@ -57,15 +55,13 @@
return dmpStatusVariableList;
}
- @Override // org.springblade.modules.mdc.service.IRealTimeDataService
+ @Override
public List<DmpVariablesVO> getWorkstationDmpVariables(Long workstationId) {
WorkstationOfMachine workstationOfMachine = this.workstationOfMachineService.getWorkstationOfMachineByWorkstationId(workstationId);
if (Func.isEmpty(workstationOfMachine)) {
throw new ServiceException(MessageUtils.message("workstation.not.turn.on.acquisition.function", new Object[0]));
}
List<DmpVariablesVO> dmpVariables = this.dmpVariablesService.getDmpVariablesByWorkstationId(Long.valueOf(workstationId.longValue()));
- return (List) dmpVariables.stream().filter((v0) -> {
- return v0.getRealTimeData();
- }).collect(Collectors.toList());
+ return dmpVariables.stream().filter(DmpVariablesVO::getRealTimeData).collect(Collectors.toList());
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java
index f303785..8773cad 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatisticsServiceImpl.java
@@ -23,7 +23,7 @@
@Service
public class StatisticsServiceImpl implements IStatisticsService {
- @Override // org.springblade.modules.mdc.service.IStatisticsService
+ @Override
public SplitFilterListVO organizeQueryConditions(AnalysisFilterVO input) {
List<IntervalDateDto> intervalDateDtoList;
Map<String, String> shiftKeyNameMap = MdcConvertUtil.keyNameToMap(input.getShiftList());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateOutputServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateOutputServiceImpl.java
index 1a4ead4..9df33e4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateOutputServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateOutputServiceImpl.java
@@ -11,7 +11,6 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/SuperAggregateOutputServiceImpl.class */
public class SuperAggregateOutputServiceImpl implements ISuperAggregateOutputService {
private final SuperAggregateOutputMapper baseMapper;
@@ -19,7 +18,7 @@
this.baseMapper = baseMapper;
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> getOutputData(List<Long> workstationIds, StatisticalMethodEnum statisticalMethodEnum, LocalDate startDate, LocalDate endDate) {
List<SuperAggregateOutput> superAggregateOutputList;
if (StatisticalMethodEnum.SHIFT.equals(statisticalMethodEnum) || StatisticalMethodEnum.DAY.equals(statisticalMethodEnum) || StatisticalMethodEnum.WEEK.equals(statisticalMethodEnum) || StatisticalMethodEnum.MONTH.equals(statisticalMethodEnum)) {
@@ -30,47 +29,47 @@
return superAggregateOutputList;
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByDay(Long workstationId, String startTime, String endTime, Long employeeId) {
return this.baseMapper.queryPerfByDay(workstationId, startTime, endTime, employeeId);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByWeek(Long workstationId, List<Integer> weeks, Long employeeId) {
return this.baseMapper.queryPerfByWeek(workstationId, weeks, employeeId);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByMonth(Long workstationId, List<Integer> months, Long employeeId) {
return this.baseMapper.queryPerfByMonth(workstationId, months, employeeId);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByEtDay(Long employeeId, String time) {
return this.baseMapper.queryPerfByEtDay(employeeId, time);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByEtWeek(Long employeeId, Integer week) {
return this.baseMapper.queryPerfByEtWeek(employeeId, week);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByEtMonth(Long employeeId, Integer month) {
return this.baseMapper.queryPerfByEtMonth(employeeId, month);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByWtDay(Long workstationId, String time) {
return this.baseMapper.queryPerfByWtDay(workstationId, time);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByWtWeek(Long workstationId, Integer week) {
return this.baseMapper.queryPerfByWtWeek(workstationId, week);
}
- @Override // org.springblade.modules.mdc.service.ISuperAggregateOutputService
+ @Override
public List<SuperAggregateOutput> queryPerfByWtMonth(Long workstationId, Integer month) {
return this.baseMapper.queryPerfByWtMonth(workstationId, month);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
index b7f5149..f571767 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
@@ -20,7 +20,6 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/service/impl/SuperNewCollectServiceImpl.class */
public class SuperNewCollectServiceImpl implements ISuperNewCollectService {
private final SuperCollectJsonMapper collectJsonMapper;
private static final Logger log = LoggerFactory.getLogger(SuperNewCollectServiceImpl.class);
@@ -40,7 +39,7 @@
this.collectJsonMapper = collectJsonMapper;
}
- @Override // org.springblade.modules.mdc.service.ISuperNewCollectService
+ @Override
public void insertData(Set<String> workstationIds) {
List<NewParamSaveDTO> data = workstationIds.stream().map(workstationId -> {
Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(workstationId);
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 f4d714e..7ef3974 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
@@ -96,7 +96,7 @@
this.calendarService = calendarService;
}
- @Override // org.springblade.modules.mdc.service.ITimeUsedAnalysisService
+ @Override
public TimeUsedAnalysisWorkstationVO timeUsedStatisticsByWorkstation(TimeUsedStatisticsByWorkstationVO stationVO, Query query) {
Integer type = stationVO.getType();
if (MdcConstant.WORK_STATION.equals(type)) {
@@ -116,18 +116,7 @@
.eq(Workstation::getStatus, CommonConstant.ENABLE)
.isNotNull(Workstation::getCalendarCode)
.orderByAsc(Workstation::getCode));
- /*
- IPage<Workstation> page = this.workstationService.page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in(Func.isNotEmpty(ids), (v0) -> {
- return v0.getId();
- }, ids).eq((v0) -> {
- return v0.getType();
- }, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).isNotNull((v0) -> {
- return v0.getCalendarCode();
- })).orderByAsc((v0) -> {
- return v0.getCode();
- }));*/
+
long total = page.getTotal();
List<Workstation> workstations = page.getRecords();
if (Func.isEmpty(workstations)) {
@@ -159,16 +148,16 @@
}).collect(Collectors.toList());
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
- Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
- return Integer.valueOf(Integer.parseInt(c.getCode()));
+ Set<Integer> wcsSet = listGlobalWcs().stream().map(c -> {
+ return Integer.parseInt(c.getCode());
}).collect(Collectors.toSet());
List<SuperAggregateState> stateList = this.baseMapper.dateState(DateUtil.format(queryTime, "yyyyMMdd"), ids);
- Map<Long, Map<Integer, Long>> map = buildStateMap(wcsList, stateList);
+ Map<Long, Map<Integer, Long>> map = buildStateMap(wcsSet, stateList);
for (Workstation workstation : workstations) {
workStationDetails.add(NameIdDTO.builder().id(workstation.getId()).name(workstation.getName() + "\n" + workstation.getCode()).build());
Long id = workstation.getId();
- Map<Integer, Long> countResults = mergeMap(map.get(id), wcsList);
+ Map<Integer, Long> countResults = mergeMap(map.get(id), wcsSet);
log.info("day鍚堝苟鍚�:{}", countResults);
countStatus.add(buildCountStatus(countResults));
}
@@ -182,7 +171,7 @@
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
- return Integer.valueOf(Integer.parseInt(c.getCode()));
+ return Integer.parseInt(c.getCode());
}).collect(Collectors.toSet());
List<SuperAggregateState> stateList = this.baseMapper.weekState(ids, year, week);
Map<Long, Map<Integer, Long>> map = buildStateMap(wcsList, stateList);
@@ -221,24 +210,20 @@
List<NameIdDTO> workStationDetails = Lists.newArrayList();
List<List<CountStatusDTO>> countStatus = Lists.newArrayList();
IPage<Workstation> workstationPages = this.workstationService.listWorkStationOnShiftIndex(ids, queryTime, query, shiftIndex, WorkstationTypeEnum.MACHINE.getCode());
- Set<Integer> wcsList = listGlobalWcs().stream().map(c -> {
- return Integer.valueOf(Integer.parseInt(c.getCode()));
- }).collect(Collectors.toSet());
- LinkedHashMap<String, List<Workstation>> calendarMap = workstationPages.getRecords().stream().collect(Collectors.groupingBy((v0) -> {
- return v0.getCalendarCode();
- }, LinkedHashMap::new, Collectors.toList()));
+
+ Set<Integer> wcsSet = listGlobalWcs().stream().map(c -> Integer.parseInt(c.getCode())).collect(Collectors.toSet());
+
+ LinkedHashMap<String, List<Workstation>> calendarMap = workstationPages.getRecords().stream().collect(Collectors.groupingBy(Workstation::getCalendarCode, LinkedHashMap::new, Collectors.toList()));
calendarMap.forEach((calendarCode, workStationsList) -> {
- List<Long> workStationIds = workStationsList.stream().map((v0) -> {
- return v0.getId();
- }).collect(Collectors.toList());
+ List<Long> workStationIds = workStationsList.stream().map(Workstation::getId).collect(Collectors.toList());
List<SuperAggregateState> stateList = this.baseMapper.shiftState(workStationIds, DateUtil.format(queryTime, "yyyyMMdd"), shiftIndex, calendarCode);
- Map<Long, Map<Integer, Long>> map = buildStateMap(wcsList, stateList);
+ Map<Long, Map<Integer, Long>> map = buildStateMap(wcsSet, stateList);
Iterator<Workstation> it = workStationsList.iterator();
while (it.hasNext()) {
Workstation workstation = it.next();
workStationDetails.add(NameIdDTO.builder().id(workstation.getId()).name(workstation.getName() + "\n" + workstation.getCode()).build());
Long id = workstation.getId();
- Map<Integer, Long> countResults = mergeMap(map.get(id), wcsList);
+ Map<Integer, Long> countResults = mergeMap(map.get(id), wcsSet);
log.info("month鍚堝苟鍚�:{}", countResults);
countStatus.add(buildCountStatus(countResults));
}
@@ -257,29 +242,13 @@
.eq(CommonGroup::getGroupType, groupType)
.eq(CommonGroup::getGroupCategory, groupCategory)
.in(Func.isNotEmpty(ids), CommonGroup::getId, ids));
- /*
- long total = this.commonGroupService.count(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getGroupType();
- }, groupType)).eq((v0) -> {
- return v0.getGroupCategory();
- }, groupCategory)).in(Func.isNotEmpty(ids), (v0) -> {
- return v0.getId();
- }, ids));*/
+
IPage<CommonGroup> page = this.commonGroupService.page(Condition.getPage(query), Wrappers.<CommonGroup>lambdaQuery()
.eq(CommonGroup::getGroupType, groupType)
.eq(CommonGroup::getGroupCategory, groupCategory)
.in(Func.isNotEmpty(ids), CommonGroup::getId, ids)
.orderByAsc(CommonGroup::getCode));
- /*
- IPage<CommonGroup> page = this.commonGroupService.page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getGroupType();
- }, groupType)).eq((v0) -> {
- return v0.getGroupCategory();
- }, groupCategory)).in(Func.isNotEmpty(ids), (v0) -> {
- return v0.getId();
- }, ids).orderByAsc((v0) -> {
- return v0.getCode();
- }));*/
+
List<CommonGroup> groups = page.getRecords();
if (Func.isEmpty(groups)) {
return new TimeUsedAnalysisWorkstationVO();
@@ -442,7 +411,7 @@
}).collect(Collectors.toList());
}
- private Map<Long, Map<Integer, Long>> buildStateMap(Set<Integer> wcsList, List<SuperAggregateState> stateList) {
+ private Map<Long, Map<Integer, Long>> buildStateMap(Set<Integer> wcsSet, List<SuperAggregateState> stateList) {
List<SuperAggregateState> stateList2 = FilterOffUtils.filterOffDay(stateList, OpenTypeEnums.TIME_USED_ANALYSIS);
Timestamp ts = new Timestamp(System.currentTimeMillis());
return stateList2.stream().peek(c -> {
@@ -451,15 +420,8 @@
c.setEndTime(ts);
}
c.setDurationCollect(Long.valueOf(LocalDateTimeUtils.betweenTwoTime(c.getStartTime().toLocalDateTime(), c.getEndTime().toLocalDateTime(), ChronoUnit.MILLIS)));
- }).filter(c2 -> {
- return (!wcsList.contains(c2.getValueCollect()) || c2.getValueCollect() == null || c2.getDurationCollect() == null) ? false : true;
- }).collect(Collectors.groupingBy((v0) -> {
- return v0.getWorkstationId();
- }, Collectors.groupingBy((v0) -> {
- return v0.getValueCollect();
- }, Collectors.summingLong((v0) -> {
- return v0.getDurationCollect();
- }))));
+ }).filter(c -> (wcsSet.contains(c.getValueCollect()) && c.getValueCollect() != null && c.getDurationCollect() != null))
+ .collect(Collectors.groupingBy(SuperAggregateState::getWorkstationId, Collectors.groupingBy(SuperAggregateState::getValueCollect, Collectors.summingLong(SuperAggregateState::getDurationCollect))));
}
private Map<Integer, Long> buildStateGroupMap(Set<Integer> wcsList, List<SuperAggregateState> stateList) {
@@ -899,7 +861,7 @@
List<MixShiftDetailsDTO> result = Lists.newArrayList();
calendarCodeMap.forEach((calendarCode, workstationList) -> {
List<ShiftIndexNameDTO> shiftDetails = this.calendarService.queryShiftIndexName(calendarCode, Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
- this.calendarService.queryShiftIndexName(calendarCode, Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
+ //this.calendarService.queryShiftIndexName(calendarCode, Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate));
for (ShiftIndexNameDTO shiftDetail : shiftDetails) {
result.add(MixShiftDetailsDTO.builder().indexName(shiftDetail.getIndexName()).shiftIndex(shiftDetail.getShiftIndex()).mixShift(Boolean.FALSE).build());
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java
index 438f552..c542eae 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackDetailServiceImpl.java
@@ -31,7 +31,6 @@
import com.qianwen.smartman.modules.mdc.service.IWorkstationFeedbackService;
@Service
-
public class WorkstationFeedbackDetailServiceImpl extends ServiceImpl<WorkstationFeedbackDetailMapper, WorkstationFeedbackDetail> implements IWorkstationFeedbackDetailService {
private final IWorkstationFeedbackService workstationFeedbackService;
@@ -39,7 +38,7 @@
this.workstationFeedbackService = workstationFeedbackService;
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
+ @Override
public List<WorkstationFeedbackDetail> cancelFeedback(final LocalDate queryDate, final Long workstationId) {
return list(Lambda.eq(WorkstationFeedbackDetail::getWorkstationId, workstationId)
.dayBetween(queryDate, WorkstationFeedbackDetail::getStartTime, WorkstationFeedbackDetail::getEndTime)
@@ -58,7 +57,7 @@
}));*/
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
+ @Override
@Transactional
public boolean cancelWorkstationFeedbacks(final List<String> ids) {
List<WorkstationFeedbackDetail> detailList = new ArrayList<>();
@@ -132,7 +131,7 @@
});
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
+ @Override
public long toDayHaveFeedbackCount(final Long workstationId) {
return count(todayConditionWrapper(workstationId));
}
@@ -160,13 +159,13 @@
}, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue()));*/
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
+ @Override
public List<WorkstationFeedbackDetail> todayFeedback(final Long workstationId) {
List<WorkstationFeedbackDetail> list = list(todayConditionWrapper(workstationId));
return list;
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
+ @Override
public WorkstationFeedbackDetail latestFeedbackByWorkstationId(Long workstationId) {
return this.baseMapper.latestFeedbackByWorkstationId(Lambda.eq(WorkstationFeedbackDetail::getWorkstationId, workstationId)
.eq(WorkstationFeedbackDetail::getStatus, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue())));
@@ -178,7 +177,7 @@
}, Integer.valueOf(FeedbackDetailStatus.EFFECTED.getValue())));*/
}
- @Override // org.springblade.modules.mdc.service.IWorkstationFeedbackDetailService
+ @Override
public boolean overwriteFeedbackCheck(final WorkstationNoImmediateFeedBackDTO noImmediateFeedBackDTO) {
/*;
return noImmediateFeedBackDTO.getWorkstationIds().stream().
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/TimeUsedAnalysisWorkstationVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/TimeUsedAnalysisWorkstationVO.java
index a26c1f2..0461fc5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/TimeUsedAnalysisWorkstationVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/TimeUsedAnalysisWorkstationVO.java
@@ -6,7 +6,6 @@
import com.qianwen.smartman.modules.mdc.dto.CountStatusDTO;
import com.qianwen.smartman.modules.mdc.dto.NameIdDTO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/vo/TimeUsedAnalysisWorkstationVO.class */
public class TimeUsedAnalysisWorkstationVO implements Serializable {
private static final long serialVersionUID = -530938150418043787L;
@ApiModelProperty("宸ヤ綅璇︽儏")
@@ -16,7 +15,6 @@
@ApiModelProperty("鎬绘暟")
Long total;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/vo/TimeUsedAnalysisWorkstationVO$TimeUsedAnalysisWorkstationVOBuilder.class */
public static class TimeUsedAnalysisWorkstationVOBuilder {
private List<NameIdDTO> workStationDetails;
private List<List<CountStatusDTO>> countStatus;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/WorkstationBandShiftVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/WorkstationBandShiftVO.java
index 85a073a..a93ef92 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/WorkstationBandShiftVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/WorkstationBandShiftVO.java
@@ -4,11 +4,10 @@
import java.util.List;
import com.qianwen.smartman.modules.mdc.dto.MixShiftDetailsDTO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/vo/WorkstationBandShiftVO.class */
public class WorkstationBandShiftVO implements Serializable {
List<MixShiftDetailsDTO> shiftDetails;
- /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/vo/WorkstationBandShiftVO$WorkstationBandShiftVOBuilder.class */
+
public static class WorkstationBandShiftVOBuilder {
private List<MixShiftDetailsDTO> shiftDetails;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/controller/OuterAppConfigController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/controller/OuterAppConfigController.java
index 4631102..bf8d6ee 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/controller/OuterAppConfigController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/controller/OuterAppConfigController.java
@@ -33,7 +33,6 @@
@Api(value = "绗笁鏂瑰簲鐢ㄩ厤缃鐞�", tags = {"绗笁鏂瑰簲鐢ㄩ厤缃鐞�"})
@RequestMapping({"blade-sync/outer-app-config"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/controller/OuterAppConfigController.class */
public class OuterAppConfigController extends BladeController {
private IOuterAppConfigService outerAppConfigService;
private final IWechatSyncService wechatSyncService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
index 316c925..e91b1ff 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
@@ -44,7 +44,6 @@
@RestController
@ApiResource({"blade-system/tenant"})
@NonDS
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/TenantController.class */
public class TenantController extends BladeController {
private final ITenantService tenantService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/constant/ToolConstant.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/constant/ToolConstant.java
index 93f0f3c..ef23e57 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/constant/ToolConstant.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/constant/ToolConstant.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.tool.constant;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/constant/ToolConstant.class */
public interface ToolConstant {
public static final String TOOL_CATEGORY_DICT_KEY = "ToolCategory";
public static final String TOOL_MANAGE = "ToolManage";
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolCategoryController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolCategoryController.java
index 758e036..a34c7e3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolCategoryController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolCategoryController.java
@@ -22,7 +22,6 @@
@Api(value = "鍒�鍏风被鍨嬬鐞�", tags = {"鍒�鍏风被鍨嬬鐞�"})
@ApiResource({"blade-tool/tool-category"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/controller/ToolCategoryController.class */
public class ToolCategoryController extends BladeController {
private final IToolCategoryService toolCategoryService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolChangeRecordController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolChangeRecordController.java
index d630f29..7d30d15 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolChangeRecordController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolChangeRecordController.java
@@ -21,7 +21,6 @@
@Api(value = "鍒�鍏疯鍗歌褰曠鐞�", tags = {"鍒�鍏疯鍗歌褰曠鐞�"})
@ApiResource({"blade-tool/tool-change-record"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/controller/ToolChangeRecordController.class */
public class ToolChangeRecordController extends BladeController {
private final IToolChangeRecordService toolChangeRecordService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolManageController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolManageController.java
index 42088e1..d3f5bf6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolManageController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolManageController.java
@@ -30,7 +30,6 @@
@Api(value = "鍒�鍏风鐞�", tags = {"鍒�鍏风鐞�"})
@ApiResource({"blade-tool/tool-manage"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/controller/ToolManageController.class */
public class ToolManageController extends BladeController {
private final IToolManageService toolManageService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolModelController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolModelController.java
index f35e398..85d5ee6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolModelController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolModelController.java
@@ -25,7 +25,6 @@
@Api(value = "鍒�鍏峰瀷鍙风鐞�", tags = {"鍒�鍏峰瀷鍙风鐞�"})
@ApiResource({"blade-tool/tool-model"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/controller/ToolModelController.class */
public class ToolModelController extends BladeController {
private final IToolModelService toolModelService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolParameterController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolParameterController.java
index c179845..2304420 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolParameterController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/controller/ToolParameterController.java
@@ -25,7 +25,6 @@
@Api(value = "鍒�鍏峰弬鏁扮鐞�", tags = {"鍒�鍏峰弬鏁扮鐞�"})
@ApiResource({"blade-tool/tool-parameter"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/controller/ToolParameterController.class */
public class ToolParameterController extends BladeController {
private final IToolParameterService toolParameterService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolCategoryConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolCategoryConvert.java
index 3ab1b86..14d860f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolCategoryConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolCategoryConvert.java
@@ -12,7 +12,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolCategoryVO;
@Mapper
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/convert/ToolCategoryConvert.class */
public interface ToolCategoryConvert {
public static final ToolCategoryConvert INSTANCE = (ToolCategoryConvert) Mappers.getMapper(ToolCategoryConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolChangeRecordConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolChangeRecordConvert.java
index f0b23b0..3190faf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolChangeRecordConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolChangeRecordConvert.java
@@ -13,7 +13,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolChangeRecordVO;
@Mapper
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/convert/ToolChangeRecordConvert.class */
public interface ToolChangeRecordConvert {
public static final ToolChangeRecordConvert INSTANCE = (ToolChangeRecordConvert) Mappers.getMapper(ToolChangeRecordConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolManageConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolManageConvert.java
index 6a21363..7aed567 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolManageConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolManageConvert.java
@@ -17,7 +17,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolManageVO;
@Mapper
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/convert/ToolManageConvert.class */
public interface ToolManageConvert {
public static final ToolManageConvert INSTANCE = (ToolManageConvert) Mappers.getMapper(ToolManageConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolModelConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolModelConvert.java
index dbfe2fc..da9ba49 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolModelConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolModelConvert.java
@@ -11,7 +11,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolModelVO;
@Mapper
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/convert/ToolModelConvert.class */
public interface ToolModelConvert {
public static final ToolModelConvert INSTANCE = (ToolModelConvert) Mappers.getMapper(ToolModelConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolParameterConvert.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolParameterConvert.java
index 77cc949..c07ddb3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolParameterConvert.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/convert/ToolParameterConvert.java
@@ -11,7 +11,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolParameterVO;
@Mapper
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/convert/ToolParameterConvert.class */
public interface ToolParameterConvert {
public static final ToolParameterConvert INSTANCE = (ToolParameterConvert) Mappers.getMapper(ToolParameterConvert.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolCategoryDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolCategoryDTO.java
index 0fe82ab..4d5f3a5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolCategoryDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolCategoryDTO.java
@@ -1,5 +1,4 @@
package com.qianwen.smartman.modules.tool.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/dto/ToolCategoryDTO.class */
public class ToolCategoryDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolModelDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolModelDTO.java
index dab46e1..80ad749 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolModelDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolModelDTO.java
@@ -1,5 +1,4 @@
package com.qianwen.smartman.modules.tool.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/dto/ToolModelDTO.class */
public class ToolModelDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolParameterDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolParameterDTO.java
index 006c09b..4b5580f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolParameterDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/dto/ToolParameterDTO.java
@@ -1,5 +1,4 @@
package com.qianwen.smartman.modules.tool.dto;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/dto/ToolParameterDTO.class */
public class ToolParameterDTO {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/Tool.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/Tool.java
index 715e57e..cef4742 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/Tool.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/Tool.java
@@ -8,7 +8,6 @@
@ApiModel(value = "Tool瀵硅薄", description = "鍒�鍏�")
@TableName("blade_tool")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/entity/Tool.class */
public class Tool extends BaseEntity {
private static final long serialVersionUID = 1;
@ApiModelProperty("绉熸埛ID")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolCategory.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolCategory.java
index 32cb5aa..572e1d7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolCategory.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolCategory.java
@@ -7,7 +7,6 @@
@ApiModel(value = "ToolCategory瀵硅薄", description = "鍒�鍏风被鍨�")
@TableName("blade_tool_category")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/entity/ToolCategory.class */
public class ToolCategory extends BaseEntity {
private static final long serialVersionUID = 1;
@ApiModelProperty("绉熸埛ID")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolChangeRecord.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolChangeRecord.java
index b170ee2..02c263a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolChangeRecord.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolChangeRecord.java
@@ -7,7 +7,6 @@
@ApiModel(value = "ToolChangeRecord瀵硅薄", description = "瑁呭嵏鍒�璁板綍")
@TableName("blade_tool_change_record")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/entity/ToolChangeRecord.class */
public class ToolChangeRecord extends BaseEntity {
private static final long serialVersionUID = 1;
@ApiModelProperty("绉熸埛ID")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolModel.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolModel.java
index 0e0896a..464cf8f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolModel.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolModel.java
@@ -7,7 +7,6 @@
@ApiModel(value = "ToolModel瀵硅薄", description = "鍒�鍏峰瀷鍙�")
@TableName("blade_tool_model")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/entity/ToolModel.class */
public class ToolModel extends BaseEntity {
private static final long serialVersionUID = 1;
@ApiModelProperty("绉熸埛ID")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolParameter.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolParameter.java
index a7df86e..56dd272 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolParameter.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/entity/ToolParameter.java
@@ -7,7 +7,6 @@
@ApiModel(value = "ToolParameter瀵硅薄", description = "鍒�鍏峰弬鏁�")
@TableName("blade_tool_parameter")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/entity/ToolParameter.class */
public class ToolParameter extends BaseEntity {
private static final long serialVersionUID = 1;
@ApiModelProperty("绉熸埛ID")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeCountMethodEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeCountMethodEnum.java
index 8b88afb..6e3bc8c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeCountMethodEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeCountMethodEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.tool.enums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/enums/ToolLifeCountMethodEnum.class */
public enum ToolLifeCountMethodEnum {
NUMBER(1, "鎸夎鏁�"),
TIME(2, "鎸夋椂闂�");
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeStateEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeStateEnum.java
index 7167868..80d6280 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeStateEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolLifeStateEnum.java
@@ -2,7 +2,6 @@
import com.qianwen.smartman.common.constant.CheckProjectConstant;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/enums/ToolLifeStateEnum.class */
public enum ToolLifeStateEnum {
WARN(2, "璀﹀憡"),
NORMAL(1, CheckProjectConstant.CHECK_RESULT_OK),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolOperationTypeEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolOperationTypeEnum.java
index eb08dc5..6e215c8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolOperationTypeEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolOperationTypeEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.tool.enums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/enums/ToolOperationTypeEnum.class */
public enum ToolOperationTypeEnum {
EQUIP(1, "瑁呭垁"),
DISCHARGE(0, "鍗稿垁");
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolUseStateEnum.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolUseStateEnum.java
index 7dcd425..e19ad0d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolUseStateEnum.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/enums/ToolUseStateEnum.java
@@ -1,6 +1,5 @@
package com.qianwen.smartman.modules.tool.enums;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/enums/ToolUseStateEnum.class */
public enum ToolUseStateEnum {
ADD(2, "鏂板"),
EQUIP(1, "瑁呭垁"),
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolChangeRecordExcel.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolChangeRecordExcel.java
index ea764c6..72c7ac9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolChangeRecordExcel.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolChangeRecordExcel.java
@@ -3,7 +3,6 @@
import com.alibaba.excel.annotation.ExcelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/excel/ToolChangeRecordExcel.class */
public class ToolChangeRecordExcel implements Serializable {
@ExcelProperty({"鍒�鍏风紪鍙�"})
private String toolCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolManageExcel.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolManageExcel.java
index 21a4c74..eae6831 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolManageExcel.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/excel/ToolManageExcel.java
@@ -4,7 +4,6 @@
import com.alibaba.excel.annotation.ExcelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/excel/ToolManageExcel.class */
public class ToolManageExcel implements Serializable {
@ExcelProperty({"鍒�鍏风姸鎬佹姤琛�", "", "鍒�鍏风紪鍙�"})
private String toolCode;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/interceptor/CustomCellWriteHandler.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/interceptor/CustomCellWriteHandler.java
index a8cf514..0488ff3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/interceptor/CustomCellWriteHandler.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/interceptor/CustomCellWriteHandler.java
@@ -13,7 +13,6 @@
import org.apache.poi.ss.usermodel.Workbook;
import com.qianwen.smartman.modules.tool.util.CellStyleUtil;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/interceptor/CustomCellWriteHandler.class */
public class CustomCellWriteHandler implements CellWriteHandler {
public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer integer, Integer integer1, Boolean aBoolean) {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolCategoryMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolCategoryMapper.java
index 77dae05..2093a3b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolCategoryMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolCategoryMapper.java
@@ -5,7 +5,6 @@
import com.qianwen.smartman.modules.tool.entity.ToolCategory;
import com.qianwen.smartman.modules.tool.vo.ToolCategoryTreeVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/mapper/ToolCategoryMapper.class */
public interface ToolCategoryMapper extends BaseMapper<ToolCategory> {
List<ToolCategoryTreeVO> listCategoryList();
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolChangeRecordMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolChangeRecordMapper.java
index 95a118a..a94e424 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolChangeRecordMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolChangeRecordMapper.java
@@ -3,6 +3,5 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qianwen.smartman.modules.tool.entity.ToolChangeRecord;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/mapper/ToolChangeRecordMapper.class */
public interface ToolChangeRecordMapper extends BaseMapper<ToolChangeRecord> {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolManageMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolManageMapper.java
index 17640da..ee636ee 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolManageMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolManageMapper.java
@@ -9,7 +9,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolManageVO;
import com.qianwen.smartman.modules.tool.vo.ToolQueryVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/mapper/ToolManageMapper.class */
public interface ToolManageMapper extends BaseMapper<Tool> {
List<ToolManageTreeVO> getToolTreeList();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolModelMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolModelMapper.java
index 1a2c3f6..d78d311 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolModelMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolModelMapper.java
@@ -7,7 +7,6 @@
import com.qianwen.smartman.modules.tool.entity.ToolModel;
import com.qianwen.smartman.modules.tool.vo.ToolModelVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/mapper/ToolModelMapper.class */
public interface ToolModelMapper extends BaseMapper<ToolModel> {
ToolModelVO detail(@Param("id") String id);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolParameterMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolParameterMapper.java
index 9df0dff..41672b9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolParameterMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/mapper/ToolParameterMapper.java
@@ -3,6 +3,5 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qianwen.smartman.modules.tool.entity.ToolParameter;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/mapper/ToolParameterMapper.class */
public interface ToolParameterMapper extends BaseMapper<ToolParameter> {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolCategoryService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolCategoryService.java
index 50e7254..113bb71 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolCategoryService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolCategoryService.java
@@ -6,7 +6,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolCategoryTreeVO;
import com.qianwen.smartman.modules.tool.vo.ToolCategoryVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/IToolCategoryService.class */
public interface IToolCategoryService extends BaseService<ToolCategory> {
List<ToolCategoryTreeVO> tree();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolChangeRecordService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolChangeRecordService.java
index 9765df1..d650b7b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolChangeRecordService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolChangeRecordService.java
@@ -10,7 +10,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolChangeRecordQueryVO;
import com.qianwen.smartman.modules.tool.vo.ToolChangeRecordVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/IToolChangeRecordService.class */
public interface IToolChangeRecordService extends BaseService<ToolChangeRecord> {
IPage<ToolChangeRecordVO> pageToolChangeRecord(ToolChangeRecordQueryVO toolChangeRecordQueryVO, Query query);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolManageService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolManageService.java
index 2bb598d..399abf8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolManageService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolManageService.java
@@ -14,7 +14,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolManageVO;
import com.qianwen.smartman.modules.tool.vo.ToolQueryVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/IToolManageService.class */
public interface IToolManageService extends BaseService<Tool> {
Boolean saveTool(ToolManageSaveVO toolManageSaveVO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolModelService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolModelService.java
index 3174f07..d4c8f4e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolModelService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolModelService.java
@@ -7,7 +7,6 @@
import com.qianwen.smartman.modules.tool.entity.ToolModel;
import com.qianwen.smartman.modules.tool.vo.ToolModelVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/IToolModelService.class */
public interface IToolModelService extends BaseService<ToolModel> {
IPage<ToolModelVO> page(String keyWord, Long categoryId, Boolean isShowChild, Query query);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolParameterService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolParameterService.java
index b61686b..4e5d312 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolParameterService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/IToolParameterService.java
@@ -5,7 +5,6 @@
import com.qianwen.smartman.modules.tool.entity.ToolParameter;
import com.qianwen.smartman.modules.tool.vo.ToolParameterVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/IToolParameterService.class */
public interface IToolParameterService extends BaseService<ToolParameter> {
ToolParameterVO save(ToolParameterVO toolParameterVO);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java
index 831e03d..b678f05 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolCategoryServiceImpl.java
@@ -43,7 +43,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolCategoryVO;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolCategoryServiceImpl.class */
public class ToolCategoryServiceImpl extends BaseServiceImpl<ToolCategoryMapper, ToolCategory> implements IToolCategoryService {
@Autowired
private IDictService dictService;
@@ -59,7 +58,7 @@
private final Integer MIN_SORT = 1;
- @Override // org.springblade.modules.tool.service.IToolCategoryService
+ @Override
public List<ToolCategoryTreeVO> tree() {
List<ToolCategoryTreeVO> toolCategoryList = ((ToolCategoryMapper) this.baseMapper).listCategoryList();
List<ToolCategoryTreeVO> tree = ForestNodeMerger.merge(toolCategoryList);
@@ -78,7 +77,7 @@
return allItemNum;
}
- @Override // org.springblade.modules.tool.service.IToolCategoryService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public ToolCategoryVO save(ToolCategoryVO toolCategoryVO) {
checkName(null, toolCategoryVO.getName());
@@ -188,7 +187,7 @@
this.basCoderuleService.submitCoderule(basCoderuleDTO);
}
- @Override // org.springblade.modules.tool.service.IToolCategoryService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean updateName(Long id, String newName) {
checkName(id, newName);
@@ -201,7 +200,7 @@
return null;
}
- @Override // org.springblade.modules.tool.service.IToolCategoryService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean remove(List<Long> ids) {
List<Long> categoryIds = getChildrenIds(ids, ids);
@@ -268,7 +267,7 @@
}
}
- @Override // org.springblade.modules.tool.service.IToolCategoryService
+ @Override
public List<Long> getChildrenIds(List<Long> queryIdList, List<Long> ids) {
List<Long> categoryIdList = list(Lambda.in((v0) -> {
return v0.getParentId();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java
index b54f7b6..baa783f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolChangeRecordServiceImpl.java
@@ -45,7 +45,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolChangeRecordVO;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolChangeRecordServiceImpl.class */
public class ToolChangeRecordServiceImpl extends BaseServiceImpl<ToolChangeRecordMapper, ToolChangeRecord> implements IToolChangeRecordService {
private static final Logger log = LoggerFactory.getLogger(ToolChangeRecordServiceImpl.class);
private final IToolParameterService toolParameterService;
@@ -63,7 +62,7 @@
this.toolCategoryService = toolCategoryService;
}
- @Override // org.springblade.modules.tool.service.IToolChangeRecordService
+ @Override
public IPage<ToolChangeRecordVO> pageToolChangeRecord(ToolChangeRecordQueryVO toolChangeRecordQueryVO, Query query) {
IPage<ToolChangeRecord> toolChangeRecordIPage = page(Condition.getPage(query),Wrappers.<ToolChangeRecord>lambdaQuery()
.eq((Func.isNotEmpty(toolChangeRecordQueryVO.getToolCategoryId()) && !Objects.equals(toolChangeRecordQueryVO.getToolCategoryId(), "1")), ToolChangeRecord::getToolCategoryId, toolChangeRecordQueryVO.getToolCategoryId())
@@ -90,7 +89,7 @@
return toolChangeRecordVOIPage;
}
- @Override // org.springblade.modules.tool.service.IToolChangeRecordService
+ @Override
public BladeFile exportToolChangeRecord(ToolChangeRecordQueryVO toolChangeRecordQueryVO) throws Exception {
List<List<String>> head = getHead();
List<List<Object>> data = getData(toolChangeRecordQueryVO);
@@ -182,7 +181,7 @@
return list;
}
- @Override // org.springblade.modules.tool.service.IToolChangeRecordService
+ @Override
public void dischargeToolChangeRecord(List<Tool> toolManageList, Long employeeId) {
List<ToolChangeRecord> toolChangeRecords = ToolChangeRecordConvert.INSTANCE.toolToConvert(toolManageList);
Employee employee = (Employee) this.employeeService.getById(employeeId);
@@ -209,7 +208,7 @@
saveBatch(toolChangeRecords);
}
- @Override // org.springblade.modules.tool.service.IToolChangeRecordService
+ @Override
public void equipmentToolChangeRecord(Tool toolManage, Long employeeId) {
Employee employee = (Employee) this.employeeService.getById(employeeId);
Map<Long, String> modelNameMap = this.toolModelService.list().stream().collect(Collectors.toMap((v0) -> {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java
index 2ba9fe5..efa5f7b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolManageServiceImpl.java
@@ -75,7 +75,6 @@
import com.qianwen.smartman.modules.tpm.enums.MetaTypeEnum;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolManageServiceImpl.class */
public class ToolManageServiceImpl extends BaseServiceImpl<ToolManageMapper, Tool> implements IToolManageService {
private static final Logger log = LoggerFactory.getLogger(ToolManageServiceImpl.class);
private final IToolCategoryService toolCategoryService;
@@ -102,7 +101,7 @@
this.toolParameterService = toolParameterService;
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
public Boolean saveTool(ToolManageSaveVO toolManageSaveVO) {
Set<String> toolManageCodeSet = list().stream().map((v0) -> {
return v0.getCode();
@@ -126,18 +125,18 @@
return Boolean.valueOf(save(toolManage));
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
public Boolean updateTool(ToolManageUpdateVO toolManageUpdateVO) {
Tool toolManage = ToolManageConvert.INSTANCE.updateToConvert(toolManageUpdateVO);
return Boolean.valueOf(updateById(toolManage));
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
public IPage<ToolManageVO> pageTool(ToolQueryVO toolQueryVO, Query query) {
return ((ToolManageMapper) this.baseMapper).page(Condition.getPage(query), toolQueryVO);
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
public Boolean removeTool(List<Long> ids) {
List<Tool> toolManageList = list(Lambda.in((v0) -> {
return v0.getId();
@@ -153,7 +152,7 @@
}, ids)));
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public List<ToolManageVO> dischargeTool(ToolDischargeVO toolDischargeVO) {
List<Tool> toolList = list(Lambda.in(Tool::getId, toolDischargeVO.getIds()).eq(Tool::getUseState, ToolUseStateEnum.DISCHARGE.getCode()));
@@ -194,7 +193,7 @@
return ToolManageConvert.INSTANCE.convert(toolManageList);
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public ToolManageVO equipmentTool(ToolManageEquipmentVO toolManageEquipmentVO) {
@@ -231,7 +230,7 @@
return ToolManageConvert.INSTANCE.convert(toolManage);
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean resetTool(Long id) {
Tool toolManage = (Tool) getById(id);
@@ -271,7 +270,7 @@
return true;
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
public BladeFile exportToolManage(ToolQueryVO toolQueryVO) throws Exception {
List<ToolManageVO> toolManageVOList = pageTool(toolQueryVO, new Query().setSize(-1)).getRecords();
List<Tool> toolManageList = ToolManageConvert.INSTANCE.convertVO(toolManageVOList);
@@ -288,7 +287,7 @@
return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
public Boolean isExistCodeRule(String ruleFieldDictKey) {
return Boolean.valueOf((this.basCoderuleService.count(Wrappers.<BasCodeRule>lambdaQuery().eq(BasCodeRule::getRuleFieldDictKey, ruleFieldDictKey)) > 0L));
/*
@@ -297,7 +296,7 @@
}, ruleFieldDictKey)) > 0);*/
}
- @Override // org.springblade.modules.tool.service.IToolManageService
+ @Override
public List<ToolManageTreeVO> tree() {
List<ToolManageTreeVO> list = Lists.newArrayList();
List<ToolCategory> toolCategoryList = this.toolCategoryService.list();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java
index 4ebce04..22b82ed 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolModelServiceImpl.java
@@ -26,7 +26,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolModelVO;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolModelServiceImpl.class */
public class ToolModelServiceImpl extends BaseServiceImpl<ToolModelMapper, ToolModel> implements IToolModelService {
@Autowired
@Lazy
@@ -36,7 +35,7 @@
private IToolManageService toolManageService;
- @Override // org.springblade.modules.tool.service.IToolModelService
+ @Override
public IPage<ToolModelVO> page(String keyWord, Long categoryId, Boolean isShowChild, Query query) {
if (Func.isEmpty(isShowChild)) {
isShowChild = true;
@@ -48,7 +47,7 @@
return ((ToolModelMapper) this.baseMapper).listByIds(Condition.getPage(query), categoryId, categoryIdList, keyWord);
}
- @Override // org.springblade.modules.tool.service.IToolModelService
+ @Override
public ToolModelVO save(ToolModelVO toolModelVO) {
checkName(toolModelVO);
if (Func.isNotEmpty(toolModelVO.getId())) {
@@ -78,7 +77,7 @@
}
}
- @Override // org.springblade.modules.tool.service.IToolModelService
+ @Override
public boolean remove(List<Long> ids) {
long count = this.toolManageService.count(Wrappers.<Tool>lambdaQuery().in(Tool::getToolModelId, ids));
/*
@@ -91,8 +90,8 @@
return removeBatchByIds(ids);
}
- @Override // org.springblade.modules.tool.service.IToolModelService
+ @Override
public ToolModelVO detail(String id) {
- return ((ToolModelMapper) this.baseMapper).detail(id);
+ return this.baseMapper.detail(id);
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java
index 9db6d1a..6c0acd3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/service/impl/ToolParameterServiceImpl.java
@@ -20,7 +20,6 @@
import com.qianwen.smartman.modules.tool.vo.ToolParameterVO;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/service/impl/ToolParameterServiceImpl.class */
public class ToolParameterServiceImpl extends BaseServiceImpl<ToolParameterMapper, ToolParameter> implements IToolParameterService {
private final IUserService userService;
@@ -28,7 +27,7 @@
this.userService = userService;
}
- @Override // org.springblade.modules.tool.service.IToolParameterService
+ @Override
public ToolParameterVO save(ToolParameterVO toolParameterVO) {
long count = count(Wrappers.<ToolParameter>lambdaQuery()
.ne(Func.isNotEmpty(toolParameterVO.getId()), ToolParameter::getId, toolParameterVO.getId())
@@ -61,7 +60,7 @@
return ToolParameterConvert.INSTANCE.convert(toolParameter);
}
- @Override // org.springblade.modules.tool.service.IToolParameterService
+ @Override
public List<ToolParameterVO> list(String keyWord) {
Map<Long, String> userMap = this.userService.list().stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/util/CellStyleUtil.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/util/CellStyleUtil.java
index c631416..e05bfd2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/util/CellStyleUtil.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/util/CellStyleUtil.java
@@ -8,7 +8,6 @@
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/util/CellStyleUtil.class */
public class CellStyleUtil {
public static CellStyle cellStyle(Workbook workbook) {
CellStyle cellStyle = workbook.createCellStyle();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryTreeVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryTreeVO.java
index 485296f..037889f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryTreeVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryTreeVO.java
@@ -8,7 +8,6 @@
import com.qianwen.core.tool.node.INode;
@ApiModel(value = "ToolCategoryVo瀵硅薄", description = "鍒�鍏风被鍨�")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolCategoryTreeVO.class */
public class ToolCategoryTreeVO implements INode<ToolCategoryTreeVO> {
@ApiModelProperty("鐖朵富閿�")
private Long parentId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryVO.java
index 977b203..db820f9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolCategoryVO.java
@@ -6,7 +6,6 @@
import javax.validation.constraints.Size;
@ApiModel(value = "ToolCategoryVo瀵硅薄", description = "鍒�鍏风被鍨�")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolCategoryVO.class */
public class ToolCategoryVO implements Serializable {
private static final long serialVersionUID = 4349837500441028697L;
@ApiModelProperty("鐖朵富閿�")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordQueryVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordQueryVO.java
index 6e6bd85..96fc62c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordQueryVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordQueryVO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolChangeRecordQueryVO.class */
public class ToolChangeRecordQueryVO {
@ApiModelProperty("寮�濮嬫椂闂�")
private String StartTime;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordVO.java
index 0194db2..4e0dfaa 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolChangeRecordVO.java
@@ -5,7 +5,6 @@
import java.util.Date;
import javax.validation.constraints.Size;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolChangeRecordVO.class */
public class ToolChangeRecordVO implements Serializable {
private static final long serialVersionUID = 2280262106627113119L;
@ApiModelProperty("鍒�鍏风紪鍙�")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolDischargeVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolDischargeVO.java
index 3167954..a74f95c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolDischargeVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolDischargeVO.java
@@ -2,7 +2,6 @@
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolDischargeVO.class */
public class ToolDischargeVO {
private List<Long> ids;
private Long employeeId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageEquipmentVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageEquipmentVO.java
index 72209ca..5d3acd7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageEquipmentVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageEquipmentVO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.NonNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolManageEquipmentVO.class */
public class ToolManageEquipmentVO {
@ApiModelProperty("id")
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageSaveVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageSaveVO.java
index 994aa22..588da1a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageSaveVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageSaveVO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.Size;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolManageSaveVO.class */
public class ToolManageSaveVO {
private static final long serialVersionUID = 4572928446901612337L;
@ApiModelProperty("鍒�鍏风被鍨媔d")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageTreeVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageTreeVO.java
index 5d3f5b1..9aa8970 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageTreeVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageTreeVO.java
@@ -7,7 +7,6 @@
import com.qianwen.core.tool.node.INode;
@ApiModel(value = "ToolManageTreeVO瀵硅薄", description = "鍒�鍏风鐞嗘爲瀵硅薄")
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolManageTreeVO.class */
public class ToolManageTreeVO implements INode<ToolManageTreeVO> {
@ApiModelProperty(value = "涓婚敭", dataType = "java.lang.String")
private Long id;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageUpdateVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageUpdateVO.java
index fee9e0e..1c1a004 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageUpdateVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageUpdateVO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolManageUpdateVO.class */
public class ToolManageUpdateVO {
@ApiModelProperty("瀵垮懡璁℃暟鏂瑰紡(1.鎸夋鏁� 2.鎸夋椂闂�)")
private Integer lifeCountMethod;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageVO.java
index 97ce5d0..12cb47c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolManageVO.java
@@ -4,7 +4,6 @@
import java.io.Serializable;
import javax.validation.constraints.Size;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolManageVO.class */
public class ToolManageVO implements Serializable {
private static final long serialVersionUID = 4572928446901612337L;
@ApiModelProperty("鍒�鍏风被鍨媔d")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolModelVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolModelVO.java
index 6108431..e2cdcc0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolModelVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolModelVO.java
@@ -4,7 +4,6 @@
import java.io.Serializable;
import javax.validation.constraints.Size;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolModelVO.class */
public class ToolModelVO implements Serializable {
private static final long serialVersionUID = -6957793473987593959L;
@ApiModelProperty("鍒�鍏峰瀷鍙�")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterSaveVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterSaveVO.java
index 9b07a64..6ebd764 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterSaveVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterSaveVO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.Size;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolParameterSaveVO.class */
public class ToolParameterSaveVO {
private static final long serialVersionUID = 1;
@ApiModelProperty("id")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterVO.java
index 4e18c44..5c4f60b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolParameterVO.java
@@ -5,7 +5,6 @@
import java.util.Date;
import javax.validation.constraints.Size;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolParameterVO.class */
public class ToolParameterVO implements Serializable {
private static final long serialVersionUID = -7399818834179641398L;
@ApiModelProperty("鍙傛暟鍚嶇О")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolQueryVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolQueryVO.java
index 87c2e10..8a739d2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolQueryVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tool/vo/ToolQueryVO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/tool/vo/ToolQueryVO.class */
public class ToolQueryVO {
@ApiModelProperty("鍒�鍏风被鍨媔d")
private Long toolCategoryId;
diff --git a/smart-man-boot/src/main/resources/application-dev.yml b/smart-man-boot/src/main/resources/application-dev.yml
index dbc0fc4..041ba49 100644
--- a/smart-man-boot/src/main/resources/application-dev.yml
+++ b/smart-man-boot/src/main/resources/application-dev.yml
@@ -45,7 +45,7 @@
# tdengine
tdengine:
driver: com.taosdata.jdbc.TSDBDriver
- url: jdbc:TAOS://172.22.147.236:6030/iot_data?charset=UTF-8&locale=en_US.UTF-8&cfgdir=taos.cfg
+ url: jdbc:TAOS://116.63.155.153:6030/iot_data?charset=UTF-8&locale=en_US.UTF-8&cfgdir=taos.cfg
username: root
password: taosdata
diff --git a/smart-man-boot/src/main/resources/application-test.yml b/smart-man-boot/src/main/resources/application-test.yml
index 7b6ab27..26164f3 100644
--- a/smart-man-boot/src/main/resources/application-test.yml
+++ b/smart-man-boot/src/main/resources/application-test.yml
@@ -10,7 +10,8 @@
type: mysql
url: localhost
port: 3306
- database: blade_boot
+ #鏁版嵁搴撳唴濡傛灉娌℃湁琛紝浼氬紩鍙戣繘鍏ュ垵濮嬪寲鐣岄潰
+ database: smart_man
username: root
password: Kknd_1234
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/smart-man-boot/src/main/resources/log/logback-test.xml b/smart-man-boot/src/main/resources/log/logback-test.xml
index 9f80677..4a8ef26 100644
--- a/smart-man-boot/src/main/resources/log/logback-test.xml
+++ b/smart-man-boot/src/main/resources/log/logback-test.xml
@@ -3,7 +3,7 @@
<!--鍖呭惈etl tool 鐨刲ogback鏂囦欢-->
<include resource="logback/logback.xml"/>
<!-- 鑷畾涔夊弬鏁扮洃鍚� -->
- <contextListener class="org.qianwen.core.log.listener.LoggerStartupListener"/>
+ <contextListener class="com.qianwen.core.log.listener.LoggerStartupListener"/>
<springProperty scope="context" name="springAppName" source="spring.application.name"/>
<!-- 褰╄壊鏃ュ織渚濊禆鐨勬覆鏌撶被 -->
--
Gitblit v1.9.3