From fa3428b4bb32179a42d5618357c22fe2695716ae Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:58:23 +0800
Subject: [PATCH] 修改全局的注入方式
---
src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java | 11
src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java | 21
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java | 18
src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java | 6
src/main/java/com/ruoyi/project/system/controller/SysMenuController.java | 20
src/main/java/com/ruoyi/production/service/impl/ProductionProductInputServiceImpl.java | 8
src/main/java/com/ruoyi/framework/security/service/TokenService.java | 9
src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java | 7
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 24
src/main/java/com/ruoyi/basic/service/impl/ReturnVisitReminderService.java | 9
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 22
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java | 6
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 4
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 16
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 8
src/main/java/com/ruoyi/quality/controller/QualityReportController.java | 3
src/main/java/com/ruoyi/project/common/CaptchaController.java | 26
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java | 18
src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java | 11
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 11
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 3
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java | 27
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsRequisitionRecordServiceImpl.java | 8
src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java | 12
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java | 29
src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java | 3
src/main/java/com/ruoyi/approve/service/impl/KnowledgeBaseServiceImpl.java | 6
src/main/java/com/ruoyi/account/controller/BorrowInfoController.java | 3
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java | 6
src/main/java/com/ruoyi/sales/service/impl/PaymentShippingServiceImpl.java | 6
src/main/java/com/ruoyi/project/system/controller/SysConfigController.java | 22
src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java | 5
src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java | 14
src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java | 27
src/main/java/com/ruoyi/collaborativeApproval/service/impl/SealApplicationManagementServiceImpl.java | 6
src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java | 34
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 18
src/main/java/com/ruoyi/project/system/controller/SysIndexController.java | 3
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java | 14
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 30
src/main/java/com/ruoyi/project/monitor/controller/CacheController.java | 26
src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java | 6
src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java | 3
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 6
src/main/java/com/ruoyi/account/controller/AccountingController.java | 4
src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java | 20
src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java | 6
src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java | 4
src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 17
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 30
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 50
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 3
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 15
src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java | 18
src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java | 3
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java | 3
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 11
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 7
src/main/java/com/ruoyi/project/system/controller/SysRoleController.java | 11
src/main/java/com/ruoyi/safe/service/impl/SafeTrainingDetailsServiceImpl.java | 17
src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java | 12
src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java | 6
src/main/java/com/ruoyi/sales/service/impl/ShipmentApprovalServiceImpl.java | 9
src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java | 11
src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java | 6
src/main/java/com/ruoyi/basic/service/impl/CustomerPrivatePoolServiceImpl.java | 29
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java | 6
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 43
src/main/java/com/ruoyi/safe/service/impl/SafeCertificationServiceImpl.java | 12
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java | 20
src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java | 21
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 53
src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java | 4
src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java | 10
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 26
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 5
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java | 8
src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java | 7
src/main/java/com/ruoyi/common/utils/MinioUtils.java | 10
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 73
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java | 41
src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java | 6
src/main/java/com/ruoyi/approve/service/impl/HolidaySettingsServiceImpl.java | 6
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java | 3
src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java | 3
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java | 6
src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 13
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 23
src/main/java/com/ruoyi/ScheduleTask.java | 9
src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java | 19
src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java | 15
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | 9
src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java | 5
src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java | 4
src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java | 27
src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java | 38
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 13
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java | 6
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java | 24
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 27
src/main/java/com/ruoyi/basic/controller/CustomerPrivateController.java | 20
src/main/java/com/ruoyi/purchase/service/impl/ProcurementBusinessSummaryServiceImpl.java | 8
src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java | 12
src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java | 13
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 7
src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java | 17
src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoStageHandleService.java | 6
src/main/java/com/ruoyi/staff/service/impl/AnalyticsServiceImpl.java | 11
src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java | 11
src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java | 18
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java | 4
src/main/java/com/ruoyi/framework/security/service/SysLoginService.java | 44
src/main/java/com/ruoyi/safe/controller/SafeHazardController.java | 6
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 5
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java | 10
src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java | 14
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 12
src/main/java/com/ruoyi/projectManagement/service/impl/handle/ContractInfoHandleService.java | 12
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 14
src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java | 3
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 3
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 3
src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java | 19
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 11
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 34
src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java | 6
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 7
src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java | 14
src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementServiceImpl.java | 7
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 26
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java | 25
src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java | 9
src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java | 6
src/main/java/com/ruoyi/sales/service/impl/SalespersonManagementServiceImpl.java | 6
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 10
src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java | 6
src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java | 16
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java | 4
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 6
src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java | 3
src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java | 10
src/main/java/com/ruoyi/safe/service/impl/SafeAccidentServiceImpl.java | 12
src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java | 3
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java | 38
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java | 4
src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java | 16
src/main/java/com/ruoyi/production/service/impl/ProductionProductOutputServiceImpl.java | 8
src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java | 34
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java | 4
src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java | 18
src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java | 3
src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java | 3
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 29
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 95
src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java | 6
src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java | 13
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java | 16
src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java | 24
src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java | 6
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java | 14
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java | 9
src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java | 6
src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java | 23
src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 22
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 17
src/main/java/com/ruoyi/collaborativeApproval/service/impl/StaffContactsPersonalServiceImpl.java | 8
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 10
src/main/java/com/ruoyi/basic/controller/ProductController.java | 2
src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java | 15
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java | 16
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 1
src/main/java/com/ruoyi/project/system/controller/SysProfileController.java | 19
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 9
src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java | 12
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 4
src/main/java/com/ruoyi/staff/controller/BankController.java | 4
src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java | 24
src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java | 3
src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java | 6
src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java | 10
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java | 30
src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java | 3
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 61
src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java | 4
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 40
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 5
src/main/java/com/ruoyi/safe/pojo/SafeHidden.java | 6
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java | 3
src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java | 9
src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java | 27
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 14
src/main/java/com/ruoyi/approve/service/impl/RpaProcessAutomationServiceImpl.java | 7
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java | 18
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPriceManagementServiceImpl.java | 11
src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 29
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 19
src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java | 13
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java | 6
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 65
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java | 12
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java | 9
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 119 -
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 13
src/main/java/com/ruoyi/project/system/controller/SysDeptController.java | 4
src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java | 3
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 11
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 11
src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java | 11
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 30
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 7
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | 2
src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java | 21
src/main/java/com/ruoyi/oA/controller/OaProjectController.java | 6
src/main/java/com/ruoyi/collaborativeApproval/service/impl/DutyPlanServiceImpl.java | 8
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java | 13
src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java | 3
src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java | 3
src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java | 27
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 48
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java | 6
src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceFileServiceImpl.java | 6
src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java | 1
src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java | 16
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 121 -
src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java | 20
src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java | 14
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java | 3
src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java | 64
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java | 16
src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java | 11
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 30
src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java | 3
src/main/java/com/ruoyi/staff/service/impl/HolidayApplicationServiceImpl.java | 6
src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java | 14
src/main/java/com/ruoyi/home/controller/HomeController.java | 8
src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java | 6
src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java | 34
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 7
src/main/java/com/ruoyi/staff/service/impl/PersonalShiftServiceImpl.java | 17
src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeServiceImpl.java | 6
src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java | 3
src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java | 25
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 8
src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java | 40
src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java | 3
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java | 11
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 10
src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java | 8
src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java | 4
src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java | 1
src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java | 3
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 15
src/main/java/com/ruoyi/safe/service/impl/SafeContingencyPlanServiceImpl.java | 12
src/main/java/com/ruoyi/inspectiontask/service/impl/QuartzConfig.java | 9
src/main/java/com/ruoyi/project/system/controller/SysPostController.java | 3
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 22
src/main/java/com/ruoyi/oA/service/impl/OaProjectServiceImpl.java | 9
src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java | 51
src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java | 7
src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java | 11
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java | 11
src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java | 18
src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java | 6
src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java | 3
src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java | 15
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java | 10
src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java | 4
src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java | 35
268 files changed, 1,563 insertions(+), 2,440 deletions(-)
diff --git a/src/main/java/com/ruoyi/ScheduleTask.java b/src/main/java/com/ruoyi/ScheduleTask.java
index 2cb1ad7..adddc70 100644
--- a/src/main/java/com/ruoyi/ScheduleTask.java
+++ b/src/main/java/com/ruoyi/ScheduleTask.java
@@ -5,7 +5,7 @@
import com.ruoyi.project.system.mapper.SysNoticeMapper;
import com.ruoyi.safe.mapper.SafeTrainingMapper;
import com.ruoyi.safe.pojo.SafeTraining;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -14,14 +14,13 @@
import java.util.List;
@Component
+@RequiredArgsConstructor
//瀹氭椂浠诲姟姹囨��
public class ScheduleTask {
- @Autowired
- private SafeTrainingMapper safeTrainingMapper;
+ private final SafeTrainingMapper safeTrainingMapper;
- @Autowired
- private SysNoticeMapper noticeMapper;
+ private final SysNoticeMapper noticeMapper;
//瀹氭椂浠诲姟(15鍒嗛挓鎵ц涓�娆�--鍒ゆ柇鍩硅璁″垝鏁版嵁,鐘舵�佸仛鍙樻洿)
@Scheduled(cron = "0 0/15 * * * ?")
diff --git a/src/main/java/com/ruoyi/account/controller/AccountingController.java b/src/main/java/com/ruoyi/account/controller/AccountingController.java
index 332fc95..0f0552d 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountingController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountingController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -19,10 +19,10 @@
@Api(tags = "浼氳鏍哥畻")
@RestController
@RequestMapping("/accounting")
+@AllArgsConstructor
public class AccountingController extends BaseController {
- @Autowired
private AccountingServiceImpl accountingService;
@ApiOperation("鎬昏")
diff --git a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
index 81436e1..7dd5473 100644
--- a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
+++ b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
@@ -9,6 +9,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,9 +28,9 @@
@Api(tags = "鍊熸淇℃伅琛�")
@RestController
@RequestMapping("/borrowInfo")
+@AllArgsConstructor
public class BorrowInfoController {
- @Autowired
private BorrowInfoService borrowInfoService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java b/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
index 7f256ab..6586580 100644
--- a/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
+++ b/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
@@ -7,6 +7,7 @@
import com.ruoyi.account.service.impl.SalesReceiptReturnServiceImpl;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,9 +23,9 @@
*/
@RestController
@RequestMapping("/salesReceiptReturn")
+@AllArgsConstructor
public class SalesReceiptReturnController {
- @Autowired
private SalesReceiptReturnService salesReceiptReturnService;
diff --git a/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java b/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
index daf35a4..942e721 100644
--- a/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
+++ b/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
@@ -6,6 +6,7 @@
import com.ruoyi.account.service.SalesRefundAmountOrderService;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,9 +24,9 @@
*/
@RestController
@RequestMapping("/salesRefundAmountOrder")
+@AllArgsConstructor
public class SalesRefundAmountOrderController {
- @Autowired
private SalesRefundAmountOrderService salesRefundAmountOrderService;
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
index e9a586f..0ed77af 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
@@ -17,10 +17,8 @@
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
-import com.ruoyi.procurementrecord.service.impl.ProcurementRecordOutServiceImpl;
-import com.ruoyi.procurementrecord.service.impl.ProcurementRecordServiceImpl;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -36,22 +34,14 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class AccountingServiceImpl {
- @Autowired
- private DeviceLedgerMapper deviceLedgerMapper;
-
- @Autowired
- private BorrowInfoMapper borrowInfoMapper;
-
- @Autowired
- private CustomStorageMapper customStorageMapper;
-
- @Autowired
- private ProcurementRecordMapper procurementRecordMapper;
-
- @Autowired
- private ProcurementRecordOutMapper procurementRecordOutMapper;
+ private final DeviceLedgerMapper deviceLedgerMapper;
+ private final BorrowInfoMapper borrowInfoMapper;
+ private final CustomStorageMapper customStorageMapper;
+ private final ProcurementRecordMapper procurementRecordMapper;
+ private final ProcurementRecordOutMapper procurementRecordOutMapper;
public AjaxResult total(Integer year) {
Map<String,Object> map = new HashMap<>();
diff --git a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
index 74692c4..773799d 100644
--- a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
@@ -2,20 +2,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.mapper.BorrowInfoMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.pojo.BorrowInfo;
-import com.ruoyi.account.mapper.BorrowInfoMapper;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.account.service.BorrowInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.sales.service.ReceiptPaymentService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -30,16 +29,12 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class BorrowInfoServiceImpl extends ServiceImpl<BorrowInfoMapper, BorrowInfo> implements BorrowInfoService {
- @Autowired
- private BorrowInfoMapper borrowInfoMapper;
-
- @Autowired
- private AccountIncomeService accountIncomeService;
-
- @Autowired
- private AccountExpenseService accountExpenseService;
+ private final BorrowInfoMapper borrowInfoMapper;
+ private final AccountIncomeService accountIncomeService;
+ private final AccountExpenseService accountExpenseService;
@Override
public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
diff --git a/src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java
index c04fdb5..3dcc1cd 100644
--- a/src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java
@@ -2,12 +2,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
-import com.ruoyi.account.pojo.SalesRefundAmountOrder;
-import com.ruoyi.account.mapper.SalesRefundAmountOrderMapper;
-import com.ruoyi.account.service.SalesRefundAmountOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
+import com.ruoyi.account.mapper.SalesRefundAmountOrderMapper;
+import com.ruoyi.account.pojo.SalesRefundAmountOrder;
+import com.ruoyi.account.service.SalesRefundAmountOrderService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -19,11 +19,11 @@
* @since 2026-03-07 10:16:47
*/
@Service
+@RequiredArgsConstructor
public class SalesRefundAmountOrderServiceImpl extends ServiceImpl<SalesRefundAmountOrderMapper, SalesRefundAmountOrder> implements SalesRefundAmountOrderService {
- @Autowired
- private SalesRefundAmountOrderMapper salesRefundAmountOrderMapper;
+ private final SalesRefundAmountOrderMapper salesRefundAmountOrderMapper;
@Override
public IPage<SalesRefundAmountOrderDto> pageSalesRefundAmountOrderDto(Page<SalesRefundAmountOrderDto> page, SalesRefundAmountOrderDto salesRefundAmountOrder) {
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
index 69b21c7..129403c 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
@@ -10,7 +10,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
@@ -25,9 +25,9 @@
@RestController
@Api(tags = "涓存湡鍞悗绠＄悊")
@RequestMapping("/afterSalesNearExpiryService")
+@AllArgsConstructor
public class AfterSalesNearExpiryController extends BaseController {
- @Autowired
private AfterSalesNearExpiryService afterSalesNearExpiryService;
/**
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index fdbc447..abb8797 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -17,12 +17,12 @@
import com.ruoyi.sales.service.ISalesLedgerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -34,16 +34,12 @@
@RestController
@Api(tags = "鍞悗鏈嶅姟")
@RequestMapping("/afterSalesService")
+@AllArgsConstructor
public class AfterSalesServiceController extends BaseController {
- @Autowired
private AfterSalesServiceService afterSalesServiceService;
-
- @Autowired
private SysUserMapper sysUserMapper;
-
- @Autowired
private ISalesLedgerService salesLedgerService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
index 4a09c05..e538fa1 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
@@ -9,6 +9,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -25,9 +26,9 @@
@RestController
@Api(tags = "鍞悗鏈嶅姟闄勪欢琛�")
@RequestMapping("/afterSalesService/file")
+@AllArgsConstructor
public class AfterSalesServiceFileController extends BaseController {
- @Autowired
private AfterSalesServiceFileService afterSalesServiceFileService;
@PostMapping("/upload")
diff --git a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceFileServiceImpl.java b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceFileServiceImpl.java
index c1e7bd5..e78dcbe 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceFileServiceImpl.java
@@ -13,8 +13,8 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -37,10 +37,10 @@
* @since 2026/03/02 11:19
*/
@Service
+@RequiredArgsConstructor
public class AfterSalesServiceFileServiceImpl extends ServiceImpl<AfterSalesServiceFileMapper, AfterSalesServiceFile> implements AfterSalesServiceFileService {
- @Autowired
- private AfterSalesServiceService afterSalesServiceService;
+ private final AfterSalesServiceService afterSalesServiceService;
@Value("${file.upload-dir}")
private String uploadDir;
diff --git a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
index 68dfa7f..a141327 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
@@ -21,9 +21,9 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -36,20 +36,14 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class AfterSalesServiceServiceImpl extends ServiceImpl<AfterSalesServiceMapper, AfterSalesService> implements AfterSalesServiceService {
- @Autowired
- private AfterSalesServiceMapper afterSalesServiceMapper;
-
- @Autowired
- private SysDeptMapper sysDeptMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
- @Autowired
- private ISalesLedgerProductService salesLedgerProductService;
- @Autowired
- private ISalesLedgerService salesLedgerService;
+ private final AfterSalesServiceMapper afterSalesServiceMapper;
+ private final SysDeptMapper sysDeptMapper;
+ private final SysUserMapper sysUserMapper;
+ private final ISalesLedgerProductService salesLedgerProductService;
+ private final ISalesLedgerService salesLedgerService;
@Override
public IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index 5cda3a3..e33cee8 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -5,7 +5,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -14,8 +14,9 @@
@Api(tags = "瀹℃壒璁板綍")
@RestController
@RequestMapping("/approveNode")
+@AllArgsConstructor
public class ApproveNodeController {
- @Autowired
+
private IApproveNodeService approveNodeService;
/**
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index bccc689..0699a79 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
@@ -14,28 +13,20 @@
import com.ruoyi.project.system.domain.SysDept;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.ParseException;
import java.util.List;
@RestController
@RequestMapping("/approveProcess")
+@AllArgsConstructor
@Api(tags = "瀹℃壒")
public class ApproveProcessController {
- @GetMapping("/test")
- public AjaxResult test() {
- System.out.println(1111);
- return AjaxResult.success("娴嬭瘯");
- }
-
-
- @Autowired
private IApproveProcessService approveProcessService;
/**銆�
* 鑾峰彇閮ㄩ棬鍒楄〃
diff --git a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
index 2ecf29f..97abe9f 100644
--- a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
+++ b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
@@ -18,13 +18,9 @@
@RequestMapping("/holidaySettings")
@AllArgsConstructor
public class HolidaySettingsController {
- @Autowired
private HolidaySettingsService holidaySettingsService;
- @Autowired
private AnnualLeaveSettingMapper annualLeaveSettingMapper;
- @Autowired
private OvertimeSettingMapper overtimeSettingMapper;
- @Autowired
private WorkingHoursSettingMapper workingHoursSettingMapper;
/**銆�
diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index b19c897..9dd669b 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -2,19 +2,16 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.mapper.KnowledgeBaseMapper;
import com.ruoyi.approve.pojo.KnowledgeBase;
-import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.KnowledgeBaseService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -22,7 +19,6 @@
@AllArgsConstructor
@Api(tags = "鐭ヨ瘑搴撶鐞�")
public class KnowledgeBaseController {
- @Autowired
private KnowledgeBaseService knowledgeBaseService;
/**銆�
diff --git a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
index e3ac566..a1796f8 100644
--- a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
+++ b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
@@ -19,11 +19,8 @@
@RequestMapping("/notificationManagement")
@AllArgsConstructor
public class NotificationManagementController {
- @Autowired
private NotificationManagementService notificationManagementService ;
- @Autowired
private OnlineMeetingMapper onlineMeetingMapper;
- @Autowired
private FileSharingMapper fileSharingMapper;
/**銆�
* 鑾峰彇鍒楄〃
diff --git a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
index f43fbfe..82b4192 100644
--- a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
+++ b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
@@ -1,23 +1,17 @@
package com.ruoyi.approve.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.RpaProcessAutomationService;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysDept;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -25,7 +19,6 @@
@AllArgsConstructor
@Api(tags = "RPA娴佺▼鑷姩鍖�")
public class RpaProcessAutomationController {
- @Autowired
private RpaProcessAutomationService rpaProcessAutomationService;
/**銆�
* 鑾峰彇鍒楄〃
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 00a53f5..410d17b 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -13,7 +13,6 @@
import com.ruoyi.approve.service.IApproveNodeService;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceRepair;
@@ -25,13 +24,16 @@
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.impl.PurchaseLedgerServiceImpl;
-import com.ruoyi.sales.mapper.*;
+import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.mapper.SalesQuotationMapper;
+import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -43,44 +45,23 @@
import java.util.List;
@Service
-//@RequiredArgsConstructor
+@RequiredArgsConstructor
public class ApproveNodeServiceImpl extends ServiceImpl<ApproveNodeMapper, ApproveNode> implements IApproveNodeService {
- @Autowired
- private ApproveNodeMapper approveNodeMapper;
- @Autowired
- private ApproveProcessMapper approveProcessMapper;
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private TempFileServiceImpl tempFileService;
- @Autowired
- private ISysNoticeService sysNoticeService;
-
- @Autowired
- private CommonFileMapper fileMapper;
- @Autowired
- private DeviceRepairMapper deviceRepairMapper;
-
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
-
- @Autowired
- private SalesQuotationMapper salesQuotationMapper;
-
- @Autowired
- private ShippingInfoMapper shippingInfoMapper;
-
- @Autowired
- private CommonFileServiceImpl commonFileService;
- @Autowired
- private StockUtils stockUtils;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
-
- @Autowired
- private PurchaseLedgerServiceImpl purchaseLedgerServiceImpl;
+ private final ApproveNodeMapper approveNodeMapper;
+ private final ApproveProcessMapper approveProcessMapper;
+ private final SysUserMapper sysUserMapper;
+ private final TempFileServiceImpl tempFileService;
+ private final ISysNoticeService sysNoticeService;
+ private final CommonFileMapper fileMapper;
+ private final DeviceRepairMapper deviceRepairMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
+ private final SalesQuotationMapper salesQuotationMapper;
+ private final ShippingInfoMapper shippingInfoMapper;
+ private final CommonFileServiceImpl commonFileService;
+ private final StockUtils stockUtils;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final PurchaseLedgerServiceImpl purchaseLedgerServiceImpl;
public ApproveProcess getApproveById(String id) {
@@ -94,7 +75,7 @@
}
@Override
- public void initApproveNodes(String approveUserIds,String approveID,Long tenantId) {
+ public void initApproveNodes(String approveUserIds, String approveID, Long tenantId) {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
String[] names = approveUserIds.split(",");
for (int i = 0; i < names.length; i++) {
@@ -102,7 +83,7 @@
if (sysUser == null) continue;
ApproveNode approveNode = new ApproveNode();
approveNode.setApproveProcessId(approveID);
- approveNode.setApproveNodeOrder(i +1);
+ approveNode.setApproveNodeOrder(i + 1);
approveNode.setApproveNodeUser(sysUser.getNickName());
approveNode.setApproveNodeUserId(sysUser.getUserId());
approveNode.setApproveNodeTime(new Date());
@@ -132,17 +113,17 @@
// .eq(ApproveProcess::getApproveStatus, 0)
.last("limit 1");
ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
- if(approveProcess != null && approveProcess.getApproveStatus() == 3){
+ if (approveProcess != null && approveProcess.getApproveStatus() == 3) {
return list;
}
for (ApproveNode approveNode : list) {
List<CommonFile> commonFiles = fileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
.eq(CommonFile::getCommonId, approveNode.getId())
.eq(CommonFile::getType, FileNameType.ApproveNode.getValue()));
- if(!CollectionUtils.isEmpty(commonFiles)){
+ if (!CollectionUtils.isEmpty(commonFiles)) {
approveNode.setUrl(commonFiles.get(0).getUrl());
}
- if(approveNode.getApproveNodeStatus() == 1){
+ if (approveNode.getApproveNodeStatus() == 1) {
continue;
}
approveNode.setIsShen(true);
@@ -151,13 +132,13 @@
return list;
}
- public void updateApproveProcessStatus(ApproveNode approveNode,Integer status) throws IOException {
+ public void updateApproveProcessStatus(ApproveNode approveNode, Integer status) throws IOException {
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
.eq(ApproveProcess::getApproveDelete, 0)
.last("limit 1");
ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
- if(approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
+ if (approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
.eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
@@ -166,21 +147,21 @@
.last("limit 1");
ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
approveProcess.setApproveStatus(status);
- if(approveNode1 != null){
+ if (approveNode1 != null) {
approveProcess.setApproveUserCurrentId(approveNode1.getApproveNodeUserId());
approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
}
- if(approveProcess.getApproveStatus().equals(2) || approveProcess.getApproveStatus().equals(3) || approveProcess.getApproveStatus().equals(4)){
+ if (approveProcess.getApproveStatus().equals(2) || approveProcess.getApproveStatus().equals(3) || approveProcess.getApproveStatus().equals(4)) {
approveProcess.setApproveOverTime(new Date());
}
approveProcessMapper.updateById(approveProcess);
DeviceRepair deviceRepair = deviceRepairMapper.selectById(approveProcess.getDeviceRepairId());
- if(ObjectUtils.isNotNull(deviceRepair)) {
- if(approveProcess.getApproveStatus().equals(2)){
+ if (ObjectUtils.isNotNull(deviceRepair)) {
+ if (approveProcess.getApproveStatus().equals(2)) {
// 鍚屾剰
deviceRepair.setStatus(1);
- }else if(approveProcess.getApproveStatus().equals(3)){
+ } else if (approveProcess.getApproveStatus().equals(3)) {
// 鎷掔粷
deviceRepair.setStatus(2);
}
@@ -188,11 +169,11 @@
}
//閲囪喘瀹℃牳
- if(approveProcess.getApproveType().equals(5)){
+ if (approveProcess.getApproveType().equals(5)) {
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
.eq(PurchaseLedger::getPurchaseContractNumber, approveProcess.getApproveReason())
.last("limit 1"));
- if(purchaseLedger != null) {
+ if (purchaseLedger != null) {
if (status.equals(2)) {
// 鍚屾剰
purchaseLedger.setApprovalStatus(3);
@@ -202,7 +183,7 @@
// 璐ㄦ
if (salesLedgerProduct.getIsChecked()) {
purchaseLedgerServiceImpl.addQualityInspect(purchaseLedger, salesLedgerProduct);
- }else {
+ } else {
//鐩存帴鍏ュ簱
stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
}
@@ -218,33 +199,33 @@
}
}
// 閿�鍞姤浠风姸鎬佷慨鏀�
- if(approveProcess.getApproveType().equals(6)){
+ if (approveProcess.getApproveType().equals(6)) {
SalesQuotation salesQuote = salesQuotationMapper.selectOne(new LambdaQueryWrapper<SalesQuotation>()
.eq(SalesQuotation::getQuotationNo, approveProcess.getApproveReason())
.last("limit 1"));
// 鍚屾剰
- if(status.equals(2) && salesQuote != null){
+ if (status.equals(2) && salesQuote != null) {
salesQuote.setStatus("閫氳繃");
- }else if(status.equals(3) && salesQuote != null){
+ } else if (status.equals(3) && salesQuote != null) {
salesQuote.setStatus("鎷掔粷");
- }else if(status.equals(1) && salesQuote != null){
+ } else if (status.equals(1) && salesQuote != null) {
salesQuote.setStatus("瀹℃牳涓�");
}
salesQuotationMapper.updateById(salesQuote);
}
// 鍑哄簱瀹℃壒淇敼
- if(approveProcess.getApproveType().equals(7)){
+ if (approveProcess.getApproveType().equals(7)) {
String[] split = approveProcess.getApproveReason().split(":");
ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
.eq(ShippingInfo::getShippingNo, split[1])
.orderByDesc(ShippingInfo::getCreateTime)
.last("limit 1"));
- if(shippingInfo != null){
- if(status.equals(2)){
+ if (shippingInfo != null) {
+ if (status.equals(2)) {
shippingInfo.setStatus("瀹℃牳閫氳繃");
- }else if(status.equals(3)){
+ } else if (status.equals(3)) {
shippingInfo.setStatus("瀹℃牳鎷掔粷");
- }else if(status.equals(1)){
+ } else if (status.equals(1)) {
shippingInfo.setStatus("瀹℃牳涓�");
}
shippingInfoMapper.updateById(shippingInfo);
@@ -252,7 +233,7 @@
}
// 缁戝畾闄勪欢
- if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
+ if (!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1) {
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
}
}
@@ -260,21 +241,21 @@
@Override
public void updateApproveNode(ApproveNode approveNode) throws IOException {
// 瀹℃壒鑺傜偣鐘舵��:1鍚屾剰锛�2鎷掔粷锛�0灏氭湭瀹℃牳
- switch (approveNode.getApproveNodeStatus()){
+ switch (approveNode.getApproveNodeStatus()) {
case 1:
updateApproveProcessStatus(approveNode, Boolean.TRUE.equals(approveNode.getIsLast()) ? 2 : 1);
/*娑堟伅閫氱煡*/
Integer nodeOrder = approveNode.getApproveNodeOrder();
ApproveProcess approveProcess = approveProcessMapper.selectList(Wrappers.<ApproveProcess>lambdaQuery()
.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())).get(0);
- if (approveProcess.getApproveUserIds().split(",").length > nodeOrder){
+ if (approveProcess.getApproveUserIds().split(",").length > nodeOrder) {
String id = approveProcess.getApproveUserIds().split(",")[nodeOrder];
- if (approveProcess.getApproveType()==8){
+ if (approveProcess.getApproveType() == 8) {
sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
"/safeProduction/safeWorkApproval?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
- }else {
+ } else {
sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
@@ -307,8 +288,8 @@
}
//瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
- private String approveProcessType(Integer approveType){
- switch (approveType){
+ private String approveProcessType(Integer approveType) {
+ switch (approveType) {
case 1:
return "鍏嚭绠＄悊";
case 2:
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 48ffd86..d7c39eb 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -12,12 +12,10 @@
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveNodeService;
import com.ruoyi.approve.service.IApproveProcessService;
-import com.ruoyi.approve.utils.DailyRedisCounter;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.OrderUtils;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysNotice;
@@ -32,53 +30,37 @@
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
-import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.io.IOException;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Service
-//@RequiredArgsConstructor
+@RequiredArgsConstructor
public class ApproveProcessServiceImpl extends ServiceImpl<ApproveProcessMapper, ApproveProcess> implements IApproveProcessService {
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd");
- @Autowired
- private StringRedisTemplate redisTemplate;
- @Autowired
- private DailyRedisCounter dailyRedisCounter;
- @Autowired
- private SysDeptMapper sysDeptMapper;
- @Autowired
- private IApproveNodeService approveNodeService;
- @Autowired
- private SysUserMapper sysUserMapper;
- @Autowired
- private ApproveProcessMapper approveProcessMapper;
- @Autowired
- private TempFileServiceImpl tempFileService;
- @Autowired
- private CommonFileMapper commonFileMapper;
- @Autowired
- private CommonFileServiceImpl commonFileService;
- @Autowired
- private ISysNoticeService sysNoticeService;
+ private final SysDeptMapper sysDeptMapper;
+ private final IApproveNodeService approveNodeService;
+ private final SysUserMapper sysUserMapper;
+ private final ApproveProcessMapper approveProcessMapper;
+ private final TempFileServiceImpl tempFileService;
+ private final CommonFileMapper commonFileMapper;
+ private final CommonFileServiceImpl commonFileService;
+ private final ISysNoticeService sysNoticeService;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
+ private final ShippingInfoMapper shippingInfoMapper;
+ private final ApproveNodeMapper approveNodeMapper;
@Override
public void addApprove(ApproveProcessVO approveProcessVO) throws Exception {
@@ -161,12 +143,6 @@
}
return sysDeptList;
}
-
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
-
- @Autowired
- private ShippingInfoMapper shippingInfoMapper;
@Override
public IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess) {
@@ -305,8 +281,6 @@
return one;
}
- @Autowired
- private ApproveNodeMapper approveNodeMapper;
// 鎶ヤ环瀹℃壒缂栬緫瀹℃牳浜�
public void updateApproveUser(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
diff --git a/src/main/java/com/ruoyi/approve/service/impl/HolidaySettingsServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/HolidaySettingsServiceImpl.java
index a0cfe37..4345072 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/HolidaySettingsServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/HolidaySettingsServiceImpl.java
@@ -6,13 +6,13 @@
import com.ruoyi.approve.mapper.HolidaySettingsMapper;
import com.ruoyi.approve.pojo.HolidaySettings;
import com.ruoyi.approve.service.HolidaySettingsService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class HolidaySettingsServiceImpl extends ServiceImpl<HolidaySettingsMapper, HolidaySettings> implements HolidaySettingsService {
- @Autowired
- private HolidaySettingsMapper holidaySettingsMapper;
+ private final HolidaySettingsMapper holidaySettingsMapper;
@Override
public IPage<HolidaySettings> listpage(Page page, HolidaySettings holidaySettings) {
diff --git a/src/main/java/com/ruoyi/approve/service/impl/KnowledgeBaseServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/KnowledgeBaseServiceImpl.java
index 57a3fa7..f9b2221 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/KnowledgeBaseServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/KnowledgeBaseServiceImpl.java
@@ -6,13 +6,13 @@
import com.ruoyi.approve.mapper.KnowledgeBaseMapper;
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.approve.service.KnowledgeBaseService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class KnowledgeBaseServiceImpl extends ServiceImpl<KnowledgeBaseMapper, KnowledgeBase> implements KnowledgeBaseService {
- @Autowired
- private KnowledgeBaseMapper knowledgeBaseMapper;
+ private final KnowledgeBaseMapper knowledgeBaseMapper;
@Override
public IPage<KnowledgeBase> listpage(Page page, KnowledgeBase knowledgeBase) {
diff --git a/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java
index fa13fa9..b124d68 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java
@@ -2,18 +2,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.mapper.NotificationManagementMapper;
import com.ruoyi.approve.pojo.NotificationManagement;
import com.ruoyi.approve.service.NotificationManagementService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class NotificationManagementServiceImpl extends ServiceImpl<NotificationManagementMapper, NotificationManagement> implements NotificationManagementService {
- @Autowired
- private NotificationManagementMapper notificationManagementMapper;
+ private final NotificationManagementMapper notificationManagementMapper;
@Override
public IPage<NotificationManagement> listpage(Page page, NotificationManagement notificationManagement) {
diff --git a/src/main/java/com/ruoyi/approve/service/impl/RpaProcessAutomationServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/RpaProcessAutomationServiceImpl.java
index ddb6083..930c952 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/RpaProcessAutomationServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/RpaProcessAutomationServiceImpl.java
@@ -1,19 +1,18 @@
package com.ruoyi.approve.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.mapper.RpaProcessAutomationMapper;
import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.RpaProcessAutomationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class RpaProcessAutomationServiceImpl extends ServiceImpl<RpaProcessAutomationMapper, RpaProcessAutomation> implements RpaProcessAutomationService {
- @Autowired
- private RpaProcessAutomationMapper rpaProcessAutomationMapper;
+ private final RpaProcessAutomationMapper rpaProcessAutomationMapper;
@Override
public IPage<RpaProcessAutomation> listpage(Page page, RpaProcessAutomation rpaProcessAutomation) {
return rpaProcessAutomationMapper.listpage(page,rpaProcessAutomation);
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index 0d4a3b4..1d1466a 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
@@ -18,14 +18,11 @@
//鍩轰簬redis鐨勪竴涓瘡鏃ヨ鏁板櫒
@Component
+@RequiredArgsConstructor
public class DailyRedisCounter {
private static final String KEY_PREFIX = "daily_counter:";
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd");
private final StringRedisTemplate redisTemplate;
-
- public DailyRedisCounter(StringRedisTemplate redisTemplate) {
- this.redisTemplate = redisTemplate;
- }
@Value("${ruoyi.approvalNumberPrefix}")
private String approvalNumberPrefix;
@@ -48,8 +45,7 @@
return count;
}
- @Autowired
- private ApproveProcessMapper approveProcessMapper;
+ private final ApproveProcessMapper approveProcessMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿鐨� 寮�濮嬫棩鏈� 锛岀粨鏉熸棩鏈�
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
index d10e370..0236b55 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
import com.ruoyi.basic.pojo.CustomerFollowUp;
import com.ruoyi.basic.pojo.CustomerReturnVisit;
import com.ruoyi.basic.service.CustomerFollowUpService;
@@ -12,11 +13,9 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
-import com.ruoyi.common.utils.SecurityUtils;
import java.util.List;
@@ -31,13 +30,12 @@
*/
@RestController
@RequestMapping("/basic/customer-follow")
+@AllArgsConstructor
public class CustomerFollowUpController extends BaseController {
- @Autowired
- private CustomerFollowUpService customerFollowUpService;
+ private final CustomerFollowUpService customerFollowUpService;
- @Autowired
- private CustomerReturnVisitService customerReturnVisitService;
+ private final CustomerReturnVisitService customerReturnVisitService;
/**
* 鏌ヨ瀹㈡埛璺熻繘鍒楄〃
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerPrivateController.java b/src/main/java/com/ruoyi/basic/controller/CustomerPrivateController.java
index 8079ae0..67b1755 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerPrivateController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerPrivateController.java
@@ -1,28 +1,19 @@
package com.ruoyi.basic.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.dto.CustomerPrivateDto;
import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
-import com.ruoyi.basic.pojo.Customer;
-import com.ruoyi.basic.pojo.CustomerPrivate;
import com.ruoyi.basic.service.CustomerPrivatePoolService;
import com.ruoyi.basic.service.CustomerPrivateService;
-import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
-
-import static com.ruoyi.framework.web.domain.AjaxResult.success;
/**
* <p>
@@ -34,12 +25,11 @@
*/
@RestController
@RequestMapping("/customerPrivate")
+@AllArgsConstructor
public class CustomerPrivateController {
- @Autowired
- private CustomerPrivateService customerPrivateService;
+ private final CustomerPrivateService customerPrivateService;
- @Autowired
- private CustomerPrivatePoolService customerPrivatePoolService;
+ private final CustomerPrivatePoolService customerPrivatePoolService;
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java b/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
index b28a96a..7ed08d0 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
@@ -3,21 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
-import com.ruoyi.basic.pojo.Customer;
-import com.ruoyi.basic.pojo.CustomerPrivatePool;
import com.ruoyi.basic.service.CustomerPrivatePoolService;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* <p>
@@ -30,10 +22,10 @@
@RestController
@Api(tags = "瀹㈡埛锛堢娴凤級")
@RequestMapping("/customerPrivatePool")
+@AllArgsConstructor
public class CustomerPrivatePoolController {
- @Autowired
- private CustomerPrivatePoolService customerPrivatePoolService;
+ private final CustomerPrivatePoolService customerPrivatePoolService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 65a5301..7fde4fe 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -34,9 +34,7 @@
public class ProductController extends BaseController {
private IProductService productService;
-
private IProductModelService productModelService;
- @Autowired
private ISalesLedgerProductService salesLedgerProductService;
/**
* 鏌ヨ浜у搧
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index 4867595..1a58500 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -2,26 +2,25 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplierManageDto;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/system/supplier")
+@AllArgsConstructor
public class SupplierManageController {
- @Autowired
private ISupplierService supplierService;
/**
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
index 628dcb4..1cc612d 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.basic.service.impl;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.stream.CollectorUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
@@ -11,7 +10,6 @@
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.common.vo.SimpleFileVo;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -30,11 +28,11 @@
* @since 2026/03/04 14:53
*/
@Service
+@RequiredArgsConstructor
public class CustomerFollowUpFileServiceImpl extends ServiceImpl<CustomerFollowUpFileMapper, CustomerFollowUpFile> implements CustomerFollowUpFileService {
- @Autowired
@Lazy
- private CustomerFollowUpService customerFollowUpService;
+ private final CustomerFollowUpService customerFollowUpService;
@Override
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java
index 12c7e06..29013d3 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
+import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
import com.ruoyi.basic.mapper.CustomerFollowUpMapper;
import com.ruoyi.basic.pojo.CustomerFollowUp;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
@@ -11,13 +12,11 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysUserService;
-
+import lombok.RequiredArgsConstructor;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,16 +43,15 @@
* @since 2026/03/04 14:48
*/
@Service
+@RequiredArgsConstructor
public class CustomerFollowUpServiceImpl extends ServiceImpl<CustomerFollowUpMapper, CustomerFollowUp> implements CustomerFollowUpService {
- @Autowired
- private CustomerFollowUpFileService customerFollowUpFileService;
+ private final CustomerFollowUpFileService customerFollowUpFileService;
@Value("${file.upload-dir}")
private String uploadDir;
- @Autowired
- private ISysUserService sysUserService;
+ private final ISysUserService sysUserService;
@Override
@Transactional(rollbackFor = Exception.class)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivatePoolServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivatePoolServiceImpl.java
index 0586c9b..0b14ee9 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivatePoolServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivatePoolServiceImpl.java
@@ -4,20 +4,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.CustomerDto;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
import com.ruoyi.basic.mapper.CustomerPrivateMapper;
-import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
+import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.sales.mapper.SalesLedgerMapper;
-import com.ruoyi.sales.pojo.SalesLedger;
-import org.checkerframework.checker.units.qual.A;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,24 +33,19 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class CustomerPrivatePoolServiceImpl extends ServiceImpl<CustomerPrivatePoolMapper, CustomerPrivatePool> implements CustomerPrivatePoolService {
- @Autowired
- private CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
- @Autowired
- private CustomerFollowUpService customerFollowUpService;
+ private final CustomerFollowUpService customerFollowUpService;
- @Autowired
- private CustomerReturnVisitService customerReturnVisitService;
+ private final CustomerReturnVisitService customerReturnVisitService;
- @Autowired
- private ICustomerService customerService;
+ private final ICustomerService customerService;
- @Autowired
- private CustomerFollowUpFileService customerFollowUpFileService;
- @Autowired
- private CustomerPrivateMapper customerPrivateMapper;
+ private final CustomerFollowUpFileService customerFollowUpFileService;
+ private final CustomerPrivateMapper customerPrivateMapper;
@Override
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java
index 95f6193..ae0ab05 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java
@@ -1,34 +1,29 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CustomerPrivateDto;
-import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
-import com.ruoyi.basic.mapper.CustomerMapper;
-import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
-import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.mapper.CustomerPrivateMapper;
+import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
+import com.ruoyi.basic.pojo.CustomerFollowUp;
+import com.ruoyi.basic.pojo.CustomerPrivate;
+import com.ruoyi.basic.pojo.CustomerPrivatePool;
+import com.ruoyi.basic.pojo.CustomerReturnVisit;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.CustomerPrivateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -42,24 +37,19 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class CustomerPrivateServiceImpl extends ServiceImpl<CustomerPrivateMapper, CustomerPrivate> implements CustomerPrivateService {
- @Autowired
- private CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
- @Autowired
- private CustomerFollowUpService customerFollowUpService;
+ private final CustomerFollowUpService customerFollowUpService;
- @Autowired
- private CustomerReturnVisitService customerReturnVisitService;
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
+ private final CustomerReturnVisitService customerReturnVisitService;
+ private final SalesLedgerMapper salesLedgerMapper;
- @Autowired
- private CustomerPrivateMapper customerPrivateMapper;
- @Autowired
- private CustomerPrivateService customerPrivateService;
+ private final CustomerPrivateMapper customerPrivateMapper;
+ private final CustomerPrivateService customerPrivateService;
@Override
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java
index 58bc422..9192d50 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerReturnVisitServiceImpl.java
@@ -8,8 +8,8 @@
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,10 +26,10 @@
* @since 2026/03/04 17:58
*/
@Service
+@RequiredArgsConstructor
public class CustomerReturnVisitServiceImpl extends ServiceImpl<CustomerReturnVisitMapper, CustomerReturnVisit> implements CustomerReturnVisitService {
- @Autowired
- private ReturnVisitReminderService returnVisitReminderService;
+ private final ReturnVisitReminderService returnVisitReminderService;
@Override
@Transactional(rollbackFor = Exception.class)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index e5f31ff..b4b0232 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -8,15 +8,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CustomerDto;
-import com.ruoyi.basic.dto.CustomerFollowUpDto;
-import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.CustomerFollowUp;
-import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.pojo.CustomerPrivatePool;
-import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.basic.service.ICustomerService;
@@ -25,19 +21,15 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -50,22 +42,15 @@
* @date 2025-05-07
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
- @Autowired
- private CustomerPrivatePoolMapper customerPrivatePoolMapper;
- @Autowired
- private CustomerMapper customerMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ private final CustomerMapper customerMapper;
- @Autowired
- private CustomerFollowUpService customerFollowUpService;
- @Autowired
- private CustomerFollowUpFileService customerFollowUpFileService;
- @Autowired
- private CustomerReturnVisitService customerReturnVisitService;
+ private final CustomerFollowUpService customerFollowUpService;
+ private final CustomerReturnVisitService customerReturnVisitService;
/**
* 鏌ヨ瀹㈡埛妗ｆ
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ReturnVisitReminderService.java b/src/main/java/com/ruoyi/basic/service/impl/ReturnVisitReminderService.java
index 819a47d..8f5f604 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ReturnVisitReminderService.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ReturnVisitReminderService.java
@@ -3,8 +3,8 @@
import com.ruoyi.basic.pojo.CustomerReturnVisit;
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.framework.redis.RedisCache;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.ZoneId;
@@ -20,15 +20,14 @@
*/
@Slf4j
@Service
+@RequiredArgsConstructor
public class ReturnVisitReminderService {
private static final String REMINDER_QUEUE_KEY = "return_visit:reminder:queue";
- @Autowired
- private RedisCache redisCache;
+ private final RedisCache redisCache;
- @Autowired
- private CustomerReturnVisitService customerReturnVisitService;
+ private final CustomerReturnVisitService customerReturnVisitService;
@SuppressWarnings("unchecked")
public void scheduleReminder(Long returnVisitId) {
diff --git a/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
index 1682d90..fbf1e00 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.enums.StorageAttachmentRecordType;
import com.ruoyi.common.utils.MinioUtils;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -26,17 +25,13 @@
@Service
@RequiredArgsConstructor
public class StorageAttachmentServiceImpl extends ServiceImpl<StorageAttachmentMapper, StorageAttachment> implements StorageAttachmentService {
- @Autowired
- private StorageBlobMapper storageBlobMapper;
+ private final StorageBlobMapper storageBlobMapper;
- @Autowired
- private StorageAttachmentMapper storageAttachmentMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
- @Autowired
- private StorageBlobService storageBlobService;
+ private final StorageBlobService storageBlobService;
- @Autowired
- private MinioUtils minioUtils;
+ private final MinioUtils minioUtils;
@Override
public List<StorageAttachment> selectStorageAttachments(Long recordId, StorageAttachmentRecordType recordType, String fileType) {
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index d2f4927..6adaf2a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -8,31 +8,28 @@
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.excel.SupplierManageExcelDto;
import com.ruoyi.basic.mapper.SupplierManageMapper;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
@Service
+@RequiredArgsConstructor
public class SupplierServiceImpl extends ServiceImpl<SupplierManageMapper,SupplierManage> implements ISupplierService {
- @Autowired
- private SupplierManageMapper supplierMapper;
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
+ private final SupplierManageMapper supplierMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
/**
* 渚涘簲鍟嗘柊澧�
diff --git a/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java b/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java
index 2b57ee7..edc3b54 100644
--- a/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java
+++ b/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java
@@ -6,12 +6,11 @@
import com.ruoyi.project.system.domain.SysUserClient;
import com.ruoyi.project.system.service.SysUserClientService;
import com.ruoyi.project.system.service.impl.UnipushService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.time.LocalDateTime;
import java.util.Set;
/**
@@ -25,21 +24,18 @@
*/
@Slf4j
@Component
+@RequiredArgsConstructor
public class ReturnVisitReminderTask {
private static final String REMINDER_QUEUE_KEY = "return_visit:reminder:queue";
- @Autowired
- private RedisCache redisCache;
+ private final RedisCache redisCache;
- @Autowired
- private CustomerReturnVisitService customerReturnVisitService;
+ private final CustomerReturnVisitService customerReturnVisitService;
- @Autowired
- private UnipushService unipushService;
+ private final UnipushService unipushService;
- @Autowired
- private SysUserClientService userClientService;
+ private final SysUserClientService userClientService;
@SuppressWarnings("unchecked")
@Scheduled(fixedDelay = 60000)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
index 4656bce..c5023eb 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
@@ -21,7 +21,6 @@
@RequestMapping("/dutyPlan")
@AllArgsConstructor
public class DutyPlanController {
- @Autowired
private DutyPlanService dutyPlanService;
@GetMapping("/getList")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
index 53ae816..dba3e77 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
@@ -6,6 +6,7 @@
import com.ruoyi.collaborativeApproval.pojo.NoticeType;
import com.ruoyi.collaborativeApproval.service.NoticeTypeService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +23,9 @@
*/
@RestController
@RequestMapping("/noticeType")
+@AllArgsConstructor
public class NoticeTypeController {
- @Autowired
private NoticeTypeService noticeTypeService;
/**
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index 7af02e8..6d7ba9c 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -24,9 +24,7 @@
@AllArgsConstructor
@Api(tags = "鍒跺害绠＄悊")
public class RulesRegulationsManagementController {
- @Autowired
private RulesRegulationsManagementService rulesRegulationsManagementService;
- @Autowired
private ReadingStatusMapper readingStatusMapper;
@GetMapping("/getList")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index 18b7280..31f9ad1 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -25,10 +25,7 @@
@RequestMapping("/sealApplicationManagement")
@Api(tags = "鐢ㄥ嵃鐢宠绠＄悊")
public class SealApplicationManagementController {
- @Autowired
private SealApplicationManagementService sealApplicationManagementService;
-
- @Autowired
private ISysNoticeService sysNoticeService;
@GetMapping("/getList")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
index f189872..0b924df 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
@@ -7,33 +7,29 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
@RestController
@RequestMapping("/staffContactsPersonal")
@AllArgsConstructor
public class StaffContactsPersonalController {
- @Autowired
private StaffContactsPersonalService staffContactsPersonalService;
+
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO ){
+ public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
return AjaxResult.success(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
}
@PostMapping("/add")
@ApiOperation("鏂板")
- public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal){
+ public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
return AjaxResult.success(staffContactsPersonalService.save(staffContactsPersonal));
}
@DeleteMapping("/delete/{id}")
@ApiOperation("鍒犻櫎")
- public AjaxResult delete(@PathVariable("id") Long id){
+ public AjaxResult delete(@PathVariable("id") Long id) {
// if (CollectionUtils.isEmpty(id)) {
// throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
// }
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/DutyPlanServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/DutyPlanServiceImpl.java
index b1dd3cb..8940162 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/DutyPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/DutyPlanServiceImpl.java
@@ -8,17 +8,17 @@
import com.ruoyi.collaborativeApproval.pojo.DutyPlan;
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@Service
+@RequiredArgsConstructor
public class DutyPlanServiceImpl extends ServiceImpl<DutyPlanMapper, DutyPlan> implements DutyPlanService {
- @Autowired
- private DutyPlanMapper dutyPlanMapper;
+ private final DutyPlanMapper dutyPlanMapper;
@Override
public IPage listPage(Page page, DutyPlanDTO dutyPlanDTO) {
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java
index 4e720e2..44ba04a 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
-import com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementFileMapper;
-import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementFileMapper;
+import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
+import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -19,10 +19,10 @@
* @since 2026-01-13 01:06:41
*/
@Service
+@RequiredArgsConstructor
public class RulesRegulationsManagementFileServiceImpl extends ServiceImpl<RulesRegulationsManagementFileMapper, RulesRegulationsManagementFile> implements RulesRegulationsManagementFileService {
- @Autowired
- private RulesRegulationsManagementFileMapper rulesRegulationsManagementFileMapper;
+ private final RulesRegulationsManagementFileMapper rulesRegulationsManagementFileMapper;
@Override
public IPage<RulesRegulationsManagementFile> listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementServiceImpl.java
index a4f912e..c40f817 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementServiceImpl.java
@@ -7,13 +7,14 @@
import com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementMapper;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class RulesRegulationsManagementServiceImpl extends ServiceImpl<RulesRegulationsManagementMapper, RulesRegulationsManagement> implements RulesRegulationsManagementService {
- @Autowired
- private RulesRegulationsManagementMapper rulesRegulationsManagementMapper;
+ private final RulesRegulationsManagementMapper rulesRegulationsManagementMapper;
+
@Override
public IPage<RulesRegulationsManagementDTO> listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement) {
return rulesRegulationsManagementMapper.listPage(page, rulesRegulationsManagement);
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/SealApplicationManagementServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/SealApplicationManagementServiceImpl.java
index 6cb8a2b..d63f2d2 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/SealApplicationManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/SealApplicationManagementServiceImpl.java
@@ -7,13 +7,13 @@
import com.ruoyi.collaborativeApproval.mapper.SealApplicationManagementMapper;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class SealApplicationManagementServiceImpl extends ServiceImpl<SealApplicationManagementMapper, SealApplicationManagement> implements SealApplicationManagementService {
- @Autowired
- private SealApplicationManagementMapper sealApplicationManagementMapper;
+ private final SealApplicationManagementMapper sealApplicationManagementMapper;
@Override
public IPage<SealApplicationManagementDTO> listPage(Page page, SealApplicationManagement sealApplicationManagement) {
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/StaffContactsPersonalServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/StaffContactsPersonalServiceImpl.java
index 1a77996..98ec12f 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/StaffContactsPersonalServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/StaffContactsPersonalServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.collaborativeApproval.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,13 +7,14 @@
import com.ruoyi.collaborativeApproval.mapper.StaffContactsPersonalMapper;
import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
import com.ruoyi.collaborativeApproval.service.StaffContactsPersonalService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class StaffContactsPersonalServiceImpl extends ServiceImpl<StaffContactsPersonalMapper, StaffContactsPersonal> implements StaffContactsPersonalService {
- @Autowired
- private StaffContactsPersonalMapper staffContactsPersonalMapper;
+ private final StaffContactsPersonalMapper staffContactsPersonalMapper;
+
@Override
public IPage listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
return staffContactsPersonalMapper.listPage(page, staffContactsPersonalDTO);
diff --git a/src/main/java/com/ruoyi/common/utils/MinioUtils.java b/src/main/java/com/ruoyi/common/utils/MinioUtils.java
index 9aef8e4..19f0dcd 100644
--- a/src/main/java/com/ruoyi/common/utils/MinioUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/MinioUtils.java
@@ -11,15 +11,15 @@
import io.minio.http.Method;
import io.minio.messages.DeleteError;
import io.minio.messages.DeleteObject;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -29,10 +29,10 @@
import java.util.stream.Collectors;
@Component
+@RequiredArgsConstructor
public class MinioUtils {
- @Autowired
- private MinioClient minioClient;
+ private final MinioClient minioClient;
@Value("${minio.preview-expiry}")
private Integer previewExpiry;
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index f5e8060..492b923 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -1,6 +1,5 @@
package com.ruoyi.compensationperformance.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -10,23 +9,20 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @author :yys
@@ -35,12 +31,10 @@
@RestController
@Api(tags = "钖叕缁╂晥")
@RequestMapping("/compensationPerformance")
+@AllArgsConstructor
public class CompensationPerformanceController extends BaseController {
- @Autowired
private CompensationPerformanceService compensationPerformanceService;
-
- @Autowired
private StaffOnJobMapper staffOnJobMapper;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
index b3b3aa7..019de96 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
@@ -6,8 +6,8 @@
import com.ruoyi.compensationperformance.mapper.CompensationPerformanceMapper;
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.compensationperformance.service.CompensationPerformanceService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -18,10 +18,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class CompensationPerformanceServiceImpl extends ServiceImpl<CompensationPerformanceMapper, CompensationPerformance> implements CompensationPerformanceService {
- @Autowired
- private CompensationPerformanceMapper compensationPerformanceMapper;
+ private final CompensationPerformanceMapper compensationPerformanceMapper;
@Override
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 6f293d4..23c322a 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -11,6 +11,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +23,9 @@
@RestController
@Api(tags = "瀹㈡埛鎷滆")
@RequestMapping("/customerVisits")
+@AllArgsConstructor
public class CustomerVisitsController extends BaseController {
- @Autowired
private CustomerVisitsServiceImpl customerVisitsService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
index f44742a..2e0a0b0 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -8,8 +8,8 @@
import com.ruoyi.customervisits.mapper.CustomerVisitsMapper;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.customervisits.service.CustomerVisitsService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,10 +19,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class CustomerVisitsServiceImpl extends ServiceImpl<CustomerVisitsMapper, CustomerVisits> implements CustomerVisitsService {
- @Autowired
- private CustomerVisitsMapper customerVisitsMapper;
+ private final CustomerVisitsMapper customerVisitsMapper;
@Override
public IPage<CustomerVisits> listPage(Page page, CustomerVisits customerVisits) {
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index 59b0b4f..574d150 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -7,14 +7,14 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@Api(tags = "璁惧缂洪櫡璁板綍绠＄悊")
@RequestMapping("/defect")
+@AllArgsConstructor
@RestController
public class DeviceDefectRecordController {
- @Autowired
private DeviceDefectRecordService deviceDefectRecordService;
@ApiOperation("璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
index 59309fd..bcd45ed 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -13,14 +13,13 @@
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.staff.dto.StaffOnJobExcelDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -28,15 +27,11 @@
@Api(tags = "璁惧鍙拌处绠＄悊")
@RequestMapping("/device/ledger")
@RestController
+@AllArgsConstructor
public class DeviceLedgerController {
- @Autowired
private IDeviceLedgerService deviceLedgerService;
-
- @Autowired
private DeviceLedgerMapper deviceLedgerMapper;
-
- @Autowired
private DeviceMaintenanceMapper deviceMaintenanceMapper;
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 59f24a3..338569a 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -10,22 +10,20 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
@Api(tags = "璁惧淇濆吇")
@RestController
@RequestMapping("/device/maintenance")
+@AllArgsConstructor
public class DeviceMaintenanceController {
- @Autowired
private IDeviceMaintenanceService deviceMaintenanceService;
-
- @Autowired
private IDeviceLedgerService deviceLedgerService;
@ApiOperation("璁惧淇濆吇鍒楄〃")
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 704b928..d763337 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -4,27 +4,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
-import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
@Api(tags = "璁惧鎶ヤ慨绠＄悊")
@RequestMapping("/device/repair")
@RestController
+@AllArgsConstructor
public class DeviceRepairController {
- @Autowired
private IDeviceRepairService deviceRepairService;
-
- @Autowired
- private IDeviceLedgerService deviceLedgerService;
@ApiOperation("璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
index fd8398c..0616e50 100644
--- a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
+++ b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
@@ -9,6 +9,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,10 +22,10 @@
@Api(tags = "璁惧淇濆吇瀹氭椂浠诲姟绠＄悊")
@RestController
@RequestMapping("/deviceMaintenanceTask")
+@AllArgsConstructor
public class MaintenanceTaskController extends BaseController {
- @Autowired
private MaintenanceTaskService maintenanceTaskService;
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
index 10c4f5f..3741de4 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -10,7 +10,7 @@
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,12 +19,10 @@
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class DeviceDefectRecordServiceImpl extends ServiceImpl<DeviceDefectRecordMapper, DeviceDefectRecord> implements DeviceDefectRecordService {
- @Autowired
- private DeviceDefectRecordMapper deviceDefectRecordMapper;
-
- @Autowired
- private DeviceRepairMapper deviceRepairMapper;
+ private final DeviceDefectRecordMapper deviceDefectRecordMapper;
+ private final DeviceRepairMapper deviceRepairMapper;
@Override
public IPage<DeviceDefectRecordDto> listPage(Page page, DeviceDefectRecordDto deviceDefectRecordDto) {
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index 46de0e3..b4c5d65 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -17,13 +16,12 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import lombok.AllArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -32,14 +30,12 @@
import java.util.List;
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
@Slf4j
public class DeviceLedgerServiceImpl extends ServiceImpl<DeviceLedgerMapper, DeviceLedger> implements IDeviceLedgerService {
- @Autowired
- private DeviceLedgerMapper deviceLedgerMapper;
- @Autowired
- private SysUserMapper sysUserMapper;
+ private final DeviceLedgerMapper deviceLedgerMapper;
+ private final SysUserMapper sysUserMapper;
@Override
public IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger) {
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 883caf1..b5bb664 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -16,28 +16,24 @@
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Service
+@RequiredArgsConstructor
public class DeviceMaintenanceServiceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements IDeviceMaintenanceService {
-
-
- @Autowired
- private DeviceMaintenanceMapper deviceMaintenanceMapper;
- @Autowired
- private SparePartsMapper sparePartsMapper;
- @Autowired
- private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
+ private final DeviceMaintenanceMapper deviceMaintenanceMapper;
+ private final SparePartsMapper sparePartsMapper;
+ private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 6ff0dd4..8a0aa53 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -20,34 +20,28 @@
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
-import lombok.AllArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
@Slf4j
public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, DeviceRepair> implements IDeviceRepairService {
- @Autowired
- private DeviceDefectRecordService deviceDefectRecordService;
- @Autowired
- private DeviceRepairMapper deviceRepairMapper;
- @Autowired
- private IDeviceLedgerService deviceLedgerService;
- @Autowired
- private SparePartsMapper sparePartsMapper;
- @Autowired
- private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
+ private final DeviceDefectRecordService deviceDefectRecordService;
+ private final DeviceRepairMapper deviceRepairMapper;
+ private final IDeviceLedgerService deviceLedgerService;
+ private final SparePartsMapper sparePartsMapper;
+ private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
@Override
public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
index fca829a..b9deb2d 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -2,8 +2,8 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.MaintenanceTask;
+import lombok.RequiredArgsConstructor;
import org.quartz.*;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
@@ -19,14 +19,13 @@
@Component
@DisallowConcurrentExecution // 绂佹骞跺彂鎵ц鍚屼竴涓狫ob
+@RequiredArgsConstructor
public class MaintenanceTaskJob implements Job, Serializable {
private static final long serialVersionUID = 1L; // 蹇呴』瀹氫箟搴忓垪鍖朓D
- @Autowired
- private DeviceMaintenanceServiceImpl deviceMaintenanceService;
+ private final DeviceMaintenanceServiceImpl deviceMaintenanceService;
- @Autowired
- private JdbcTemplate jdbcTemplate;
+ private final JdbcTemplate jdbcTemplate;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java
index 384862b..ec7a8e3 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskScheduler.java
@@ -1,9 +1,9 @@
package com.ruoyi.device.service.impl;
import com.ruoyi.device.pojo.MaintenanceTask;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.quartz.*;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalTime;
@@ -19,10 +19,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class MaintenanceTaskScheduler {
- @Autowired
- private Scheduler scheduler;
+ private final Scheduler scheduler;
/**
* 娣诲姞鏂颁换鍔″埌璋冨害鍣�
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
index 0c00da7..3aaac94 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -11,8 +11,8 @@
import com.ruoyi.inspectiontask.service.impl.TimingTaskServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@@ -24,19 +24,13 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class MaintenanceTaskServiceImpl extends ServiceImpl<MaintenanceTaskMapper, MaintenanceTask> implements MaintenanceTaskService {
- @Autowired
- private MaintenanceTaskMapper maintenanceTaskMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private TimingTaskServiceImpl timingTaskService;
-
- @Autowired
- private MaintenanceTaskScheduler maintenanceTaskScheduler;
+ private final MaintenanceTaskMapper maintenanceTaskMapper;
+ private final SysUserMapper sysUserMapper;
+ private final TimingTaskServiceImpl timingTaskService;
+ private final MaintenanceTaskScheduler maintenanceTaskScheduler;
@Override
public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
index 4910671..8f11b13 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -2,10 +2,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.ProductDto;
-import com.ruoyi.basic.dto.ProductTreeDto;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.equipmentenergyconsumption.dto.ElectricityConsumptionAreaTreeDto;
import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
import com.ruoyi.equipmentenergyconsumption.service.ElectricityConsumptionAreaService;
@@ -15,20 +11,19 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@Api(tags = "鐢ㄧ數鍖哄煙")
@RequestMapping("/electricityConsumptionArea")
+@AllArgsConstructor
public class ElectricityConsumptionAreaController extends BaseController {
- @Autowired
- private ElectricityConsumptionAreaService electricityConsumptionAreaService;
+ private final ElectricityConsumptionAreaService electricityConsumptionAreaService;
/**
* 鏌ヨ鏍戠粨鏋�
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index 92b16ce..af51f43 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
import com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod;
import com.ruoyi.equipmentenergyconsumption.service.EnergyPeriodService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -12,19 +11,20 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/energyPeriod")
@Api(tags = "鐢ㄧ數鏃舵")
+@AllArgsConstructor
public class EnergyPeriodController extends BaseController {
- @Autowired
- private EnergyPeriodService energyPeriodService;
+ private final EnergyPeriodService energyPeriodService;
+
@GetMapping("/listPage")
@ApiOperation("鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -61,7 +61,7 @@
@ApiOperation("鐢ㄧ數鏃舵-鍒犻櫎")
@Log(title = "鐢ㄧ數鏃舵-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = energyPeriodService.removeBatchByIds(ids);
return remove ? AjaxResult.success() : AjaxResult.error("鍒犻櫎澶辫触");
}
@@ -74,11 +74,11 @@
@PostMapping("/export")
@ApiOperation("瀵煎嚭鐢ㄧ數鏃舵")
public void export(HttpServletResponse response) {
- Page page = new Page(-1,-1);
+ Page page = new Page(-1, -1);
EnergyPeriod energyPeriod = new EnergyPeriod();
IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
ExcelUtil<EnergyPeriod> util = new ExcelUtil<EnergyPeriod>(EnergyPeriod.class);
- util.exportExcel(response, listPage.getRecords() , "鐢ㄧ數鏃舵鏁版嵁");
+ util.exportExcel(response, listPage.getRecords(), "鐢ㄧ數鏃舵鏁版嵁");
}
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index 432ef65..0bddae6 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -15,6 +15,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -32,10 +33,9 @@
@RestController
@Api(tags = "璁惧鑳借��")
@RequestMapping("/equipmentEnergyConsumption")
+@AllArgsConstructor
public class EquipmentEnergyConsumptionController extends BaseController {
-
- @Autowired
private EquipmentEnergyConsumptionService equipmentEnergyConsumptionService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java
index abccda9..c53ed64 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java
@@ -4,16 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.dto.ProductTreeDto;
-import com.ruoyi.basic.pojo.Product;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.equipmentenergyconsumption.dto.ElectricityConsumptionAreaTreeDto;
import com.ruoyi.equipmentenergyconsumption.mapper.ElectricityConsumptionAreaMapper;
import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
import com.ruoyi.equipmentenergyconsumption.service.ElectricityConsumptionAreaService;
-
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -22,10 +19,10 @@
@Service
@Slf4j
+@RequiredArgsConstructor
public class ElectricityConsumptionAreaServiceImpl extends ServiceImpl<ElectricityConsumptionAreaMapper, ElectricityConsumptionArea> implements ElectricityConsumptionAreaService {
- @Autowired
- private ElectricityConsumptionAreaMapper electricityConsumptionAreaMapper;
+ private final ElectricityConsumptionAreaMapper electricityConsumptionAreaMapper;
@Override
public IPage<ElectricityConsumptionArea> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
index 4eabf91..22d1a70 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
@@ -6,15 +6,15 @@
import com.ruoyi.equipmentenergyconsumption.mapper.EnergyPeriodMapper;
import com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod;
import com.ruoyi.equipmentenergyconsumption.service.EnergyPeriodService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
@Slf4j
+@RequiredArgsConstructor
public class EnergyPeriodServiceImpl extends ServiceImpl<EnergyPeriodMapper, EnergyPeriod> implements EnergyPeriodService {
- @Autowired
- private EnergyPeriodMapper energyPeriodMapper;
+ private final EnergyPeriodMapper energyPeriodMapper;
@Override
public IPage<EnergyPeriod> listPage(Page page, EnergyPeriod energyPeriod) {
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
index 90b3d8f..486ad48 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
@@ -12,8 +11,8 @@
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -29,14 +28,12 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class EquipmentEnergyConsumptionServiceImpl extends ServiceImpl<EquipmentEnergyConsumptionMapper, EquipmentEnergyConsumption> implements EquipmentEnergyConsumptionService {
- @Autowired
- private EquipmentEnergyConsumptionMapper equipmentEnergyConsumptionMapper;
-
- @Autowired
- private DeviceLedgerMapper deviceLedgerMapper;
+ private final EquipmentEnergyConsumptionMapper equipmentEnergyConsumptionMapper;
+ private final DeviceLedgerMapper deviceLedgerMapper;
@Override
public IPage<EquipmentEnergyConsumption> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
diff --git a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
index 278bcc4..4a9966c 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
@@ -1,8 +1,10 @@
package com.ruoyi.framework.aspectj;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.RateLimiter;
+import com.ruoyi.framework.aspectj.lang.enums.LimitType;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -13,11 +15,10 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.script.RedisScript;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.RateLimiter;
-import com.ruoyi.framework.aspectj.lang.enums.LimitType;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
/**
* 闄愭祦澶勭悊
diff --git a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index 396e2a9..b388ebd 100644
--- a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -1,7 +1,8 @@
package com.ruoyi.framework.config;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.CacheControl;
@@ -11,8 +12,8 @@
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+
+import java.util.concurrent.TimeUnit;
/**
* 閫氱敤閰嶇疆
@@ -20,10 +21,10 @@
* @author ruoyi
*/
@Configuration
+@RequiredArgsConstructor
public class ResourcesConfig implements WebMvcConfigurer
{
- @Autowired
- private RepeatSubmitInterceptor repeatSubmitInterceptor;
+ private final RepeatSubmitInterceptor repeatSubmitInterceptor;
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry)
diff --git a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 03c52ac..d4ac717 100644
--- a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -1,6 +1,10 @@
package com.ruoyi.framework.config;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.framework.config.properties.PermitAllUrlProperties;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
+import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
+import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
@@ -16,10 +20,6 @@
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.security.web.authentication.logout.LogoutFilter;
import org.springframework.web.filter.CorsFilter;
-import com.ruoyi.framework.config.properties.PermitAllUrlProperties;
-import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
-import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
/**
* spring security閰嶇疆
@@ -28,43 +28,38 @@
*/
@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
@Configuration
+@RequiredArgsConstructor
public class SecurityConfig
{
/**
* 鑷畾涔夌敤鎴疯璇侀�昏緫
*/
- @Autowired
- private UserDetailsService userDetailsService;
+ private final UserDetailsService userDetailsService;
/**
* 璁よ瘉澶辫触澶勭悊绫�
*/
- @Autowired
- private AuthenticationEntryPointImpl unauthorizedHandler;
+ private final AuthenticationEntryPointImpl unauthorizedHandler;
/**
* 閫�鍑哄鐞嗙被
*/
- @Autowired
- private LogoutSuccessHandlerImpl logoutSuccessHandler;
+ private final LogoutSuccessHandlerImpl logoutSuccessHandler;
/**
* token璁よ瘉杩囨护鍣�
*/
- @Autowired
- private JwtAuthenticationTokenFilter authenticationTokenFilter;
+ private final JwtAuthenticationTokenFilter authenticationTokenFilter;
/**
* 璺ㄥ煙杩囨护鍣�
*/
- @Autowired
- private CorsFilter corsFilter;
+ private final CorsFilter corsFilter;
/**
* 鍏佽鍖垮悕璁块棶鐨勫湴鍧�
*/
- @Autowired
- private PermitAllUrlProperties permitAllUrl;
+ private final PermitAllUrlProperties permitAllUrl;
/**
* 韬唤楠岃瘉瀹炵幇
diff --git a/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
index 4d69000..d00144a 100644
--- a/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ b/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -4,6 +4,7 @@
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
@@ -24,9 +25,9 @@
* @author ruoyi
*/
@Configuration
+@RequiredArgsConstructor
public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
{
- @Autowired
private TokenService tokenService;
/**
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
index 0b95af8..8c3d68b 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
@@ -1,25 +1,10 @@
package com.ruoyi.framework.security.service;
-import jakarta.annotation.Resource;
-
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.exception.user.BlackListException;
-import com.ruoyi.common.exception.user.CaptchaException;
-import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.exception.user.UserNotExistsException;
-import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
+import com.ruoyi.common.exception.user.*;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -30,10 +15,18 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysConfigService;
import com.ruoyi.project.system.service.ISysUserService;
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -43,22 +36,19 @@
* @author ruoyi
*/
@Component
+@RequiredArgsConstructor
public class SysLoginService
{
- @Autowired
- private TokenService tokenService;
+ private final TokenService tokenService;
@Resource
private AuthenticationManager authenticationManager;
- @Autowired
- private RedisCache redisCache;
+ private final RedisCache redisCache;
+ private final ISysUserService userService;
+ private final ISysConfigService configService;
+ private final SysUserMapper sysUserMapper;
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysConfigService configService;
/**
* 鐧诲綍楠岃瘉
@@ -219,8 +209,6 @@
return loginUser.getUserId();
}
- @Autowired
- private SysUserMapper sysUserMapper;
/**
* 鐧诲綍楠岃瘉
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java b/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java
index 97c3518..608bfef 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java
@@ -1,10 +1,5 @@
package com.ruoyi.framework.security.service;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException;
@@ -12,6 +7,12 @@
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.project.system.domain.SysUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
/**
* 鐧诲綍瀵嗙爜鏂规硶
@@ -19,10 +20,10 @@
* @author ruoyi
*/
@Component
+@RequiredArgsConstructor
public class SysPasswordService
{
- @Autowired
- private RedisCache redisCache;
+ private final RedisCache redisCache;
@Value(value = "${user.password.maxRetryCount}")
private int maxRetryCount;
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
index ca3fb91..34cb1a4 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
@@ -1,17 +1,18 @@
package com.ruoyi.framework.security.service;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysMenuService;
import com.ruoyi.project.system.service.ISysRoleService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* 鐢ㄦ埛鏉冮檺澶勭悊
@@ -19,13 +20,11 @@
* @author ruoyi
*/
@Component
+@RequiredArgsConstructor
public class SysPermissionService
{
- @Autowired
- private ISysRoleService roleService;
-
- @Autowired
- private ISysMenuService menuService;
+ private final ISysRoleService roleService;
+ private final ISysMenuService menuService;
/**
* 鑾峰彇瑙掕壊鏁版嵁鏉冮檺
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java b/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java
index 17274eb..e139835 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java
@@ -1,7 +1,5 @@
package com.ruoyi.framework.security.service;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
@@ -17,6 +15,8 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysConfigService;
import com.ruoyi.project.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
/**
* 娉ㄥ唽鏍￠獙鏂规硶
@@ -24,16 +24,12 @@
* @author ruoyi
*/
@Component
+@RequiredArgsConstructor
public class SysRegisterService
{
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysConfigService configService;
-
- @Autowired
- private RedisCache redisCache;
+ private final ISysUserService userService;
+ private final ISysConfigService configService;
+ private final RedisCache redisCache;
/**
* 娉ㄥ唽
diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index c64347c..35802db 100644
--- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -18,9 +18,9 @@
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.security.Keys;
import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -38,6 +38,7 @@
* @author ruoyi
*/
@Component
+@RequiredArgsConstructor
public class TokenService
{
private static final Logger log = LoggerFactory.getLogger(TokenService.class);
@@ -60,8 +61,7 @@
private static final Long MILLIS_MINUTE_TWENTY = 20 * 60 * 1000L;
- @Autowired
- private RedisCache redisCache;
+ private final RedisCache redisCache;
/**
* 鑾峰彇鐢ㄦ埛韬唤淇℃伅
@@ -149,8 +149,7 @@
}
}
- @Autowired
- private SysUserDeptMapper sysUserDeptMapper;
+ private final SysUserDeptMapper sysUserDeptMapper;
/**
* 鍒锋柊浠ょ墝鏈夋晥鏈�
diff --git a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java b/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
index c1b46e0..79fb62c 100644
--- a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
+++ b/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
@@ -1,21 +1,21 @@
package com.ruoyi.framework.security.service;
-import com.ruoyi.project.system.mapper.SysDeptMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.stereotype.Service;
import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.stereotype.Service;
import java.util.Map;
@@ -25,21 +25,15 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class UserDetailsServiceImpl implements UserDetailsService
{
private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private SysPasswordService passwordService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Autowired
- private SysDeptMapper deptMapper;
+ private final ISysUserService userService;
+ private final SysPasswordService passwordService;
+ private final SysPermissionService permissionService;
+ private final SysDeptMapper deptMapper;
@Override
public UserDetails loadUserByUsername(String username)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index fcdfc16..e372f5a 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -1,6 +1,7 @@
package com.ruoyi.home.controller;
import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.dto.MapDto;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -8,10 +9,9 @@
import com.ruoyi.home.annotation.DefaultType;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import com.ruoyi.dto.MapDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -28,10 +28,10 @@
@RestController
@Api(tags = "棣栭〉缁熻")
@RequestMapping("/home")
+@AllArgsConstructor
public class HomeController extends BaseController {
- @Autowired
- private HomeService homeService;
+ private final HomeService homeService;
/********************************************************鍩虹绫�*****************************************************/
@GetMapping("/todos")
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 628dfd5..395a414 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -47,8 +47,8 @@
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.stock.mapper.StockInventoryMapper;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -68,73 +68,52 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class HomeServiceImpl implements HomeService {
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private StockInventoryMapper stockInventoryMapper;
+ private final StockInventoryMapper stockInventoryMapper;
- @Autowired
- private QualityInspectMapper qualityStatisticsMapper;
+ private final QualityInspectMapper qualityStatisticsMapper;
- @Autowired
- private ApproveProcessMapper approveProcessMapper;
+ private final ApproveProcessMapper approveProcessMapper;
- @Autowired
- private ReceiptPaymentMapper receiptPaymentMapper;
+ private final ReceiptPaymentMapper receiptPaymentMapper;
- @Autowired
- private PaymentRegistrationMapper paymentRegistrationMapper;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
- @Autowired
- private SysDeptMapper sysDeptMapper;
+ private SysDeptMapper sysDeptMapper;
- @Autowired
- private NoticeMapper noticeMapper;
-
- @Autowired
- private ProductionOrderMapper productionOrderMapper;
-
- @Autowired
- private ProductMapper productMapper;
-
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private CustomerMapper customerMapper;
-
- @Autowired
- private SupplierManageMapper supplierManageMapper;
-
- @Autowired
- private HomeMapper homeMapper;
-
- @Autowired
- private ProductionProductOutputMapper productionProductOutputMapper;
-
- @Autowired
- private QualityInspectMapper qualityInspectMapper;
-
- @Autowired
- private QualityUnqualifiedMapper qualityUnqualifiedMapper;
-
- @Autowired
- private ProductionOperationTaskMapper productionOperationTaskMapper;
+ private final NoticeMapper noticeMapper;
- @Autowired
- private AccountExpenseMapper accountExpenseMapper;
+ private final ProductionOrderMapper productionOrderMapper;
- @Autowired
- private AccountIncomeMapper accountIncomeMapper;
+ private final ProductMapper productMapper;
+
+ private final StaffOnJobMapper staffOnJobMapper;
+
+ private final CustomerMapper customerMapper;
+
+ private final SupplierManageMapper supplierManageMapper;
+
+ private final HomeMapper homeMapper;
+
+ private final ProductionProductOutputMapper productionProductOutputMapper;
+
+ private final QualityInspectMapper qualityInspectMapper;
+
+ private final QualityUnqualifiedMapper qualityUnqualifiedMapper;
+
+ private final ProductionOperationTaskMapper productionOperationTaskMapper;
+
+ private final AccountExpenseMapper accountExpenseMapper;
+
+ private final AccountIncomeMapper accountIncomeMapper;
@Override
public HomeBusinessDto business() {
@@ -511,7 +490,7 @@
.reduce(BigDecimal.ZERO, BigDecimal::add);
}
- @Autowired
+
private DeviceRepairMapper deviceRepairMapper;
@Override
@@ -1486,7 +1465,7 @@
return dto;
}
- @Autowired
+
private ProductionProductInputMapper productionProductInputMapper;
@Override
@@ -1745,7 +1724,7 @@
.collect(Collectors.toList());
}
- @Autowired
+
private ProductionAccountMapper salesLedgerProductionAccountingMapper;
@Override
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
index 8d60cd5..34d6205 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -10,11 +10,11 @@
import com.ruoyi.inspectiontask.service.InspectionTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
@@ -24,9 +24,9 @@
@RestController
@Api(tags = "宸℃浠诲姟璁板綍")
@RequestMapping("/inspectionTask")
+@AllArgsConstructor
public class InspectionTaskController extends BaseController {
- @Autowired
private InspectionTaskService inspectionTaskService;
/**
@@ -35,7 +35,7 @@
@GetMapping("/list")
@ApiOperation("宸℃浠诲姟琛ㄨ〃鏌ヨ")
public R<IPage<InspectionTaskDto>> list(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
- IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page,inspectionTaskDto);
+ IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page, inspectionTaskDto);
return R.ok(list);
}
@@ -46,9 +46,9 @@
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
public void export(HttpServletResponse response) {
- Page page = new Page<>(-1,-1);
+ Page page = new Page<>(-1, -1);
InspectionTaskDto timingTask = new InspectionTaskDto();
- IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page,timingTask);
+ IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page, timingTask);
ExcelUtil<InspectionTaskDto> util = new ExcelUtil<>(InspectionTaskDto.class);
util.exportExcel(response, list.getRecords(), "瀵煎嚭瀹氭椂浠诲姟璁板綍");
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
index 4ebc473..0d71102 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
@@ -9,7 +9,7 @@
import com.ruoyi.inspectiontask.service.QrCodeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
@@ -19,9 +19,9 @@
@RestController
@Api(tags = "浜岀淮鐮佺鐞�")
@RequestMapping("/qrCode")
+@AllArgsConstructor
public class QrCodeController extends BaseController {
- @Autowired
private QrCodeService qrCodeService;
/**
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
index d2cee17..659f37e 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
@@ -9,6 +9,7 @@
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,9 +20,9 @@
@RestController
@Api(tags = "浜岀淮鐮佹壂鎻忚褰曠鐞�")
@RequestMapping("/qrCodeScanRecord")
+@AllArgsConstructor
public class QrCodeScanRecordController extends BaseController {
- @Autowired
private QrCodeScanRecordService qrCodeScanRecordService;
/**
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
index 78884ad..c2b49a7 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
@@ -12,11 +12,10 @@
import com.ruoyi.inspectiontask.service.TimingTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.quartz.SchedulerException;
+import org.springframework.web.bind.annotation.*;
/**
* @author :yys
@@ -25,10 +24,9 @@
@RestController
@Api(tags = "宸℃绠＄悊")
@RequestMapping("/timingTask")
+@AllArgsConstructor
public class TimingTaskController extends BaseController {
-
- @Autowired
private TimingTaskService timingTaskService;
/**
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
index 08ee9ab..d8c4ba7 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -24,8 +24,8 @@
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,32 +42,25 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper, InspectionTask> implements InspectionTaskService {
- @Autowired
- private InspectionTaskMapper inspectionTaskMapper;
+ private final InspectionTaskMapper inspectionTaskMapper;
- @Autowired
- private StorageAttachmentService storageAttachmentService;
+ private final StorageAttachmentService storageAttachmentService;
- @Autowired
- private StorageBlobMapper storageBlobMapper;
+ private final StorageBlobMapper storageBlobMapper;
- @Autowired
- private StorageAttachmentMapper storageAttachmentMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
- @Autowired
- private MinioUtils minioUtils;
+ private final MinioUtils minioUtils;
- @Autowired
- private SysUserMapper sysUserMapper;
+ private final SysUserMapper sysUserMapper;
- @Autowired
- private CommonFileMapper commonFileMapper;
+ private final CommonFileMapper commonFileMapper;
- @Autowired
- private CommonFileServiceImpl commonFileService;
+ private final CommonFileServiceImpl commonFileService;
@Override
public IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java
index d43513a..85831e9 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java
@@ -10,7 +10,6 @@
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.pojo.StorageBlob;
import com.ruoyi.basic.service.StorageAttachmentService;
-import com.ruoyi.common.utils.MinioUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.inspectiontask.dto.QrCodeScanRecordDto;
import com.ruoyi.inspectiontask.mapper.QrCodeMapper;
@@ -20,8 +19,8 @@
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -37,28 +36,21 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class QrCodeScanRecordServiceImpl extends ServiceImpl<QrCodeScanRecordMapper, QrCodeScanRecord> implements QrCodeScanRecordService {
- @Autowired
- private QrCodeScanRecordMapper qrCodeScanRecordMapper;
+ private final QrCodeScanRecordMapper qrCodeScanRecordMapper;
- @Autowired
- private QrCodeMapper qrCodeMapper;
+ private final QrCodeMapper qrCodeMapper;
- @Autowired
- private StorageAttachmentService storageAttachmentService;
+ private final StorageAttachmentService storageAttachmentService;
- @Autowired
- private StorageBlobMapper storageBlobMapper;
+ private final StorageBlobMapper storageBlobMapper;
- @Autowired
- private StorageAttachmentMapper storageAttachmentMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
- @Autowired
- private MinioUtils minioUtils;
- @Autowired
- private SysUserMapper sysUserMapper;
+ private final SysUserMapper sysUserMapper;
@Override
public IPage<QrCodeScanRecordDto> selectQrCodeScanRecordList(Page<QrCodeScanRecord> page, QrCodeScanRecordDto qrCodeScanRecordDto) {
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeServiceImpl.java
index e88a5d1..2d1bc30 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeServiceImpl.java
@@ -9,8 +9,8 @@
import com.ruoyi.inspectiontask.mapper.QrCodeMapper;
import com.ruoyi.inspectiontask.pojo.QrCode;
import com.ruoyi.inspectiontask.service.QrCodeService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -22,10 +22,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class QrCodeServiceImpl extends ServiceImpl<QrCodeMapper, QrCode> implements QrCodeService {
- @Autowired
- private QrCodeMapper qrCodeMapper;
+ private final QrCodeMapper qrCodeMapper;
@Override
public IPage<QrCode> selectQrCodeList(Page page, QrCodeDto qrCodeDto) {
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/QuartzConfig.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/QuartzConfig.java
index 40d9965..1644033 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/QuartzConfig.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/QuartzConfig.java
@@ -1,8 +1,8 @@
package com.ruoyi.inspectiontask.service.impl;
+import lombok.RequiredArgsConstructor;
import org.quartz.Scheduler;
import org.quartz.spi.TriggerFiredBundle;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -15,13 +15,12 @@
@Configuration
+@RequiredArgsConstructor
public class QuartzConfig {
- @Autowired
- private ApplicationContext applicationContext;
+ private final ApplicationContext applicationContext;
// 鍋囪宸查厤缃悕涓篸ataSource鐨勬暟鎹簮Bean
- @Autowired
- private DataSource dataSource;
+ private final DataSource dataSource;
@Bean
public SchedulerFactoryBean schedulerFactoryBean() {
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
index b8ffdf5..389eda9 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -1,12 +1,10 @@
package com.ruoyi.inspectiontask.service.impl;
import com.ruoyi.inspectiontask.mapper.InspectionTaskMapper;
-import com.ruoyi.inspectiontask.mapper.TimingTaskMapper;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.inspectiontask.pojo.TimingTask;
-import com.ruoyi.inspectiontask.service.TimingTaskService;
+import lombok.RequiredArgsConstructor;
import org.quartz.*;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
@@ -22,20 +20,12 @@
@Component
@DisallowConcurrentExecution // 绂佹骞跺彂鎵ц鍚屼竴涓狫ob
+@RequiredArgsConstructor
public class TimingTaskJob implements Job, Serializable {
private static final long serialVersionUID = 1L; // 蹇呴』瀹氫箟搴忓垪鍖朓D
- @Autowired
- private TimingTaskMapper timingTaskMapper;
-
- @Autowired
- private TimingTaskService timingTaskService;
-
- @Autowired
- private InspectionTaskMapper inspectionTaskMapper;
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
+ private final InspectionTaskMapper inspectionTaskMapper;
+ private final JdbcTemplate jdbcTemplate;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
index 125f311..a6179f6 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
@@ -1,8 +1,8 @@
package com.ruoyi.inspectiontask.service.impl;
import com.ruoyi.inspectiontask.pojo.TimingTask;
+import lombok.RequiredArgsConstructor;
import org.quartz.*;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalTime;
@@ -13,10 +13,10 @@
import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
public class TimingTaskScheduler {
- @Autowired
- private Scheduler scheduler;
+ private final Scheduler scheduler;
/**
* 娣诲姞鏂颁换鍔″埌璋冨害鍣�
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
index 6607d68..8772f48 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
@@ -7,15 +7,14 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.inspectiontask.dto.TimingTaskDto;
-import com.ruoyi.inspectiontask.mapper.InspectionTaskMapper;
import com.ruoyi.inspectiontask.mapper.TimingTaskMapper;
import com.ruoyi.inspectiontask.pojo.TimingTask;
import com.ruoyi.inspectiontask.service.TimingTaskService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,19 +29,12 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class TimingTaskServiceImpl extends ServiceImpl<TimingTaskMapper, TimingTask> implements TimingTaskService {
- @Autowired
- private TimingTaskMapper timingTaskMapper;
-
- @Autowired
- private InspectionTaskMapper inspectionTaskMapper;
-
- @Autowired
- private TimingTaskScheduler timingTaskScheduler;
-
- @Autowired
- private SysUserMapper sysUserMapper;
+ private final TimingTaskMapper timingTaskMapper;
+ private final TimingTaskScheduler timingTaskScheduler;
+ private final SysUserMapper sysUserMapper;
@Override
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index a3ac7a8..343501e 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -20,6 +20,7 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -41,15 +42,11 @@
@RestController
@Api(tags = "鍔充繚鍙戞斁")
@RequestMapping("/lavorIssue")
+@AllArgsConstructor
public class LavorIssueController extends BaseController {
- @Autowired
private LavorIssueService laborIssueService;
-
- @Autowired
private LavorIssueMapper lavorIssueMapper;
-
- @Autowired
private SysDeptMapper sysDeptMapper;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java b/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
index 231cf90..3f4ffed 100644
--- a/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
+++ b/src/main/java/com/ruoyi/lavorissue/service/impl/LavorIssueServiceImpl.java
@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.excel.ConfigurableMergeStrategy;
import com.ruoyi.common.utils.excel.CustomCellStyleHandler;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
@@ -20,14 +19,14 @@
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysDictDataMapper;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -42,10 +41,13 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class LavorIssueServiceImpl extends ServiceImpl<LavorIssueMapper, LaborIssue> implements LavorIssueService {
- @Autowired
- private LavorIssueMapper lavorIssueMapper;
+ private final LavorIssueMapper lavorIssueMapper;
+ private final SysDictDataMapper sysDictDataMapper;
+ private final SysDeptMapper sysDeptMapper;
+
@Override
public IPage<LaborIssue> listPage(Page page, LaborIssue laborIssue) {
@@ -56,7 +58,7 @@
}
@Override
- public List<Map<String, Object>> statisticsList(LaborIssue laborIssue){
+ public List<Map<String, Object>> statisticsList(LaborIssue laborIssue) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(laborIssue.getSeason(), laborIssue.getIssueDate());
laborIssue.setStartDate(startAndEndDateDto.getStartDate());
@@ -93,14 +95,14 @@
return records;
}
- public StartAndEndDateDto getStartAndEndDateDto(Integer season,Date payDate){
+ public StartAndEndDateDto getStartAndEndDateDto(Integer season, Date payDate) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
StartAndEndDateDto startAndEndDateDto = new StartAndEndDateDto();
Calendar calendar = Calendar.getInstance();
int currentYear = calendar.get(Calendar.YEAR);
startAndEndDateDto.setYear(currentYear);
- if(season != null){
- switch (season){
+ if (season != null) {
+ switch (season) {
case 1:
startAndEndDateDto.setStartDate(currentYear + "-01-01");
startAndEndDateDto.setEndDate(currentYear + "-03-31");
@@ -127,7 +129,7 @@
break;
}
}
- if(payDate != null){
+ if (payDate != null) {
Date lastDayOfMonth = getLastDayOfMonth(payDate);
Date firstDayOfMonth = getFirstDayOfMonth(payDate);
startAndEndDateDto.setStartDate(sdf.format(firstDayOfMonth));
@@ -139,17 +141,17 @@
}
@Override
- public StatisticsLaborIssue statistics(StatisticsLaborIssue req) throws Exception{
+ public StatisticsLaborIssue statistics(StatisticsLaborIssue req) throws Exception {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
StatisticsLaborIssue statisticsLaborIssue = new StatisticsLaborIssue();
StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(req.getSeason(), req.getIssueDate());
LambdaQueryWrapper<LaborIssue> laborIssueLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(req.getSeason() != null || req.getIssueDate() != null){
+ if (req.getSeason() != null || req.getIssueDate() != null) {
laborIssueLambdaQueryWrapper.ge(LaborIssue::getIssueDate, startAndEndDateDto.getStartDate())
.le(LaborIssue::getIssueDate, startAndEndDateDto.getEndDate());
}
List<LaborIssue> laborIssues = lavorIssueMapper.selectList(laborIssueLambdaQueryWrapper);
- if(!CollectionUtils.isEmpty(laborIssues)){
+ if (!CollectionUtils.isEmpty(laborIssues)) {
Long sum = laborIssues.stream()
.filter(laborIssue -> laborIssue.getAdoptedDate() != null)
.mapToLong(LaborIssue::getNum)
@@ -177,13 +179,10 @@
return statisticsLaborIssue;
}
- @Autowired
- private SysDictDataMapper sysDictDataMapper;
-
@Override
public void exportCopy(HttpServletResponse response, LaborIssue laborIssue) throws UnsupportedEncodingException {
List<SysDictData> sys_lavor_issue = sysDictDataMapper.selectDictDataByType("sys_lavor_issue");
- if(CollectionUtils.isEmpty(sys_lavor_issue)){
+ if (CollectionUtils.isEmpty(sys_lavor_issue)) {
throw new RuntimeException("瀛楀吀鏁版嵁涓虹┖");
}
StartAndEndDateDto startAndEndDateDto = getStartAndEndDateDto(laborIssue.getSeason(), laborIssue.getIssueDate());
@@ -204,10 +203,10 @@
//鏂板缓ExcelWriter
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
.registerWriteHandler(new CustomCellStyleHandler())
- .registerWriteHandler(new ConfigurableMergeStrategy(exportExternalPackingListGetMerge(4,sys_lavor_issue.size(),laborIssueMap.size())))
+ .registerWriteHandler(new ConfigurableMergeStrategy(exportExternalPackingListGetMerge(4, sys_lavor_issue.size(), laborIssueMap.size())))
.build();
- List<List<List<String>>> data = completeExternalPackingList(laborIssueMap, sys_lavor_issue,laborIssue);
+ List<List<List<String>>> data = completeExternalPackingList(laborIssueMap, sys_lavor_issue, laborIssue);
for (int i = 0; i < data.size(); i++) {
List<List<String>> list = data.get(i);
@@ -225,12 +224,8 @@
}
}
- @Autowired
- private SysDeptMapper sysDeptMapper;
-
-
-// 澶勭悊澶栭儴瑁呯鍗曟暟鎹�
- private List<List<List<String>>> completeExternalPackingList(Map<String, List<LaborIssue>> listMap,List<SysDictData> sys_lavor_issue,LaborIssue obj) {
+ // 澶勭悊澶栭儴瑁呯鍗曟暟鎹�
+ private List<List<List<String>>> completeExternalPackingList(Map<String, List<LaborIssue>> listMap, List<SysDictData> sys_lavor_issue, LaborIssue obj) {
List<List<List<String>>> data = new ArrayList<>();
int num = sys_lavor_issue.size();
@@ -240,8 +235,8 @@
list.add("");
list.add("浼佷笟绠＄悊绉�");
list.add("");
- list.add("浼佷笟绠＄悊绉�" + obj.getYear() + "骞�" + obj.getStartMonth() + "鏈�-" + obj.getYear() + "骞�" + obj.getEndMonth() +"鏈堝姵淇濆彂鏀捐鍒掕〃");
- for (int i = 1; i <= num; i++){
+ list.add("浼佷笟绠＄悊绉�" + obj.getYear() + "骞�" + obj.getStartMonth() + "鏈�-" + obj.getYear() + "骞�" + obj.getEndMonth() + "鏈堝姵淇濆彂鏀捐鍒掕〃");
+ for (int i = 1; i <= num; i++) {
list.add("");
}
item.add(list);
@@ -251,7 +246,7 @@
list1.add("");
list1.add("缁撴潫骞�/鏈�");
list1.add("");
- for (int i = 0; i <= num; i++){
+ for (int i = 0; i <= num; i++) {
list1.add("");
}
item.add(list1);
@@ -261,7 +256,7 @@
list2.add(obj.getStartMonth().toString());
list2.add(obj.getYear().toString());
list2.add(obj.getEndMonth().toString());
- for (int i = 0; i <= num; i++){
+ for (int i = 0; i <= num; i++) {
list.add("");
}
item.add(list2);
@@ -293,13 +288,13 @@
.mapToLong(LaborIssue::getNum)
.sum()
+ "");
- if(i.get() == 0){
+ if (i.get() == 0) {
sumList.add(value.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue()))
.mapToLong(LaborIssue::getNum)
.sum()
+ "");
- }else {
- sumList.set(j,(Long.parseLong(sumList.get(j)) + value.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue()))
+ } else {
+ sumList.set(j, (Long.parseLong(sumList.get(j)) + value.stream().filter(laborIssue -> laborIssue.getDictId().equals(sysDictData.getDictValue()))
.mapToLong(LaborIssue::getNum)
.sum())
+ "");
@@ -314,7 +309,7 @@
list5.add("");
list5.add("");
list5.add("");
- for (int h = 0; h < sumList.size(); h++){
+ for (int h = 0; h < sumList.size(); h++) {
list5.add(sumList.get(h));
}
item.add(list5);
@@ -327,7 +322,7 @@
*
* @return
*/
- private List<CellRangeAddress> exportExternalPackingListGetMerge(Integer rowNum,Integer num,Integer listSize) {
+ private List<CellRangeAddress> exportExternalPackingListGetMerge(Integer rowNum, Integer num, Integer listSize) {
List<CellRangeAddress> mergeRegions = new ArrayList<>();
mergeRegions.add(new CellRangeAddress(0, 0, 0, 1)); // 鍚堝苟A1:Q2
mergeRegions.add(new CellRangeAddress(0, 0, 2, 3)); // 鍚堝苟A4:Q4
@@ -352,6 +347,7 @@
/**
* 鑾峰彇褰撴湀绗竴澶�
+ *
* @param date
* @return
*/
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
index a735189..f5c4428 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
@@ -16,12 +16,12 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@@ -32,16 +32,12 @@
@RestController
@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处")
@RequestMapping("/measuringInstrumentLedger")
+@AllArgsConstructor
public class MeasuringInstrumentLedgerController extends BaseController {
- @Autowired
- private MeasuringInstrumentLedgerService measuringInstrumentLedgerService;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
+ private final MeasuringInstrumentLedgerService measuringInstrumentLedgerService;
+ private final SysUserMapper sysUserMapper;
+ private final MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 3d21414..511832e 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -11,6 +11,7 @@
import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -26,9 +27,9 @@
@RestController
@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
@RequestMapping("/measuringInstrumentLedgerRecord")
+@AllArgsConstructor
public class MeasuringInstrumentLedgerRecordController extends BaseController {
- @Autowired
private MeasuringInstrumentLedgerRecordService measuringInstrumentLedgerRecordService;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
index 599c116..269b136 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
@@ -11,6 +11,7 @@
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,8 +20,8 @@
@RestController
@RequestMapping("/spareParts")
@Api(tags = "澶囦欢鍒嗙被鎺ュ彛")
+@AllArgsConstructor
public class SparePartsController {
- @Autowired
private SparePartsService sparePartsService;
@GetMapping("/getTree")
@ApiOperation("澶囦欢鍒嗙被-鏍戠粨鏋�")
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
index b0dac53..0ccf60e 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
@@ -7,7 +7,7 @@
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -23,8 +23,8 @@
@RestController
@RequestMapping("/sparePartsRequisitionRecord")
@Api(tags = "澶囦欢棰嗙敤璁板綍鎺ュ彛")
+@AllArgsConstructor
public class SparePartsRequisitionRecordController {
- @Autowired
private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java
index d094cdb..b178d75 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java
@@ -16,13 +16,13 @@
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -41,19 +41,13 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class MeasuringInstrumentLedgerRecordServiceImpl extends ServiceImpl<MeasuringInstrumentLedgerRecordMapper, MeasuringInstrumentLedgerRecord> implements MeasuringInstrumentLedgerRecordService {
- @Autowired
- private MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
-
- @Autowired
- private MeasuringInstrumentLedgerMapper measuringInstrumentLedgerMapper;
-
- @Autowired
- private CommonFileMapper commonFileMapper;
-
- @Autowired
- private TempFileMapper tempFileMapper;
+ private final MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
+ private final MeasuringInstrumentLedgerMapper measuringInstrumentLedgerMapper;
+ private final CommonFileMapper commonFileMapper;
+ private final TempFileMapper tempFileMapper;
@Value("${file.upload-dir}")
private String uploadDir;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java
index ffe91ca..72ddbaa 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java
@@ -20,13 +20,13 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -47,22 +47,14 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class MeasuringInstrumentLedgerServiceImpl extends ServiceImpl<MeasuringInstrumentLedgerMapper, MeasuringInstrumentLedger> implements MeasuringInstrumentLedgerService {
- @Autowired
- private MeasuringInstrumentLedgerMapper measuringInstrumentLedgerMapper;
-
- @Autowired
- private MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
-
- @Autowired
- private TempFileMapper tempFileMapper;
-
- @Autowired
- private CommonFileMapper commonFileMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
+ private final MeasuringInstrumentLedgerMapper measuringInstrumentLedgerMapper;
+ private final MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
+ private final TempFileMapper tempFileMapper;
+ private final CommonFileMapper commonFileMapper;
+ private final SysUserMapper sysUserMapper;
@Value("${file.upload-dir}")
private String uploadDir;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsRequisitionRecordServiceImpl.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsRequisitionRecordServiceImpl.java
index 46133c5..19746f5 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsRequisitionRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsRequisitionRecordServiceImpl.java
@@ -8,21 +8,21 @@
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsRequisitionRecordMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-02 03:59:56
*/
@Service
+@RequiredArgsConstructor
public class SparePartsRequisitionRecordServiceImpl extends ServiceImpl<SparePartsRequisitionRecordMapper, SparePartsRequisitionRecord> implements SparePartsRequisitionRecordService {
- @Autowired
- private SparePartsRequisitionRecordMapper sparePartsRequisitionRecordMapper;
+ private final SparePartsRequisitionRecordMapper sparePartsRequisitionRecordMapper;
@Override
public IPage<SparePartsRequisitionRecordDto> listPage(Page page, SparePartsRequisitionRecordDto sparePartsRequisitionRecordDto) {
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
index 5f329e8..a851cce 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
@@ -12,7 +12,7 @@
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -22,12 +22,10 @@
import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
public class SparePartsServiceImpl extends ServiceImpl<SparePartsMapper, SpareParts> implements SparePartsService {
- @Autowired
- private SparePartsMapper sparePartsMapper;
-
- @Autowired
- private DeviceLedgerMapper deviceLedgerMapper;
+ private final SparePartsMapper sparePartsMapper;
+ private final DeviceLedgerMapper deviceLedgerMapper;
@Override
public IPage<SparePartsDto> listPage(Page page, SpareParts spareParts) {
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
index 2e9c3f5..67cbcaf 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
@@ -9,8 +9,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -18,10 +18,10 @@
@Api(tags = "oA椤圭洰绠＄悊")
@RestController
+@AllArgsConstructor
@RequestMapping("/oA/project")
public class OaProjectController {
- @Autowired
- private OaProjectService oaProjectService;
+ private final OaProjectService oaProjectService;
@ApiOperation("鑾峰彇椤圭洰鍒楄〃")
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java
index d857f52..0d83dd5 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java
@@ -5,15 +5,15 @@
import com.ruoyi.oA.service.OaProjectPhaseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@Api(tags = "oA椤圭洰闃舵绠＄悊")
@RestController
@RequestMapping("/oA/projectPhase")
+@AllArgsConstructor
public class OaProjectPhaseController {
- @Autowired
- private OaProjectPhaseService oaProjectPhaseService;
+ private final OaProjectPhaseService oaProjectPhaseService;
@ApiOperation("鏂板椤圭洰闃舵")
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java
index c0f7fc1..9d8caee 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java
@@ -5,15 +5,15 @@
import com.ruoyi.oA.service.OaProjectPhaseTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@Api(tags = "oA椤圭洰闃舵浠诲姟绠＄悊")
@RestController
@RequestMapping("/oA/projectPhaseTask")
+@AllArgsConstructor
public class OaProjectPhaseTaskController {
- @Autowired
- private OaProjectPhaseTaskService oaProjectPhaseTaskService;
+ private final OaProjectPhaseTaskService oaProjectPhaseTaskService;
@ApiOperation("鏂板椤圭洰闃舵浠诲姟")
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java b/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java
index b462f36..640ec42 100644
--- a/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java
+++ b/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java
@@ -1,19 +1,15 @@
package com.ruoyi.oA.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.oA.dto.OaProjectPhaseDto;
+import com.ruoyi.oA.mapper.OaProjectPhaseMapper;
import com.ruoyi.oA.pojo.OaProjectPhase;
import com.ruoyi.oA.pojo.OaProjectPhaseTask;
import com.ruoyi.oA.service.OaProjectPhaseService;
-import com.ruoyi.oA.mapper.OaProjectPhaseMapper;
import com.ruoyi.oA.service.OaProjectPhaseTaskService;
-import lombok.val;
-import org.hibernate.validator.constraints.br.TituloEleitoral;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,13 +22,12 @@
* @createDate 2025-09-24 09:18:46
*/
@Service
+@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class OaProjectPhaseServiceImpl extends ServiceImpl<OaProjectPhaseMapper, OaProjectPhase>
implements OaProjectPhaseService{
- @Autowired
- private OaProjectPhaseMapper oaProjectPhaseMapper;
- @Autowired
- private OaProjectPhaseTaskService oaProjectPhaseTaskService;
+ private final OaProjectPhaseMapper oaProjectPhaseMapper;
+ private final OaProjectPhaseTaskService oaProjectPhaseTaskService;
@Override
public List<OaProjectPhaseDto> listByProjectId(Integer oaProjectId) {
diff --git a/src/main/java/com/ruoyi/oA/service/impl/OaProjectServiceImpl.java b/src/main/java/com/ruoyi/oA/service/impl/OaProjectServiceImpl.java
index a8ca3b1..afe125a 100644
--- a/src/main/java/com/ruoyi/oA/service/impl/OaProjectServiceImpl.java
+++ b/src/main/java/com/ruoyi/oA/service/impl/OaProjectServiceImpl.java
@@ -12,7 +12,7 @@
import com.ruoyi.oA.service.OaProjectPhaseService;
import com.ruoyi.oA.service.OaProjectService;
import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,12 +25,11 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class OaProjectServiceImpl extends ServiceImpl<OaProjectMapper, OaProject>
implements OaProjectService{
- @Autowired
- private OaProjectMapper oaProjectMapper;
- @Autowired
- private OaProjectPhaseService oaProjectPhaseService;
+ private final OaProjectMapper oaProjectMapper;
+ private final OaProjectPhaseService oaProjectPhaseService;
@Override
public IPage<OaProjectDto> listPage(Page page, OaProjectDto oaProjectDto) {
diff --git a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
index 950da62..61912898 100644
--- a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
+++ b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
@@ -12,6 +12,7 @@
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -30,9 +31,9 @@
@RestController
@Api(tags = "鍔炲叕鐗╄祫")
@RequestMapping("/officeSupplies")
+@AllArgsConstructor
public class OfficeSuppliesController extends BaseController {
- @Autowired
private OfficeSuppliesService officeSuppliesService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
index 2ba961f..abdc1c7 100644
--- a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
+++ b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
@@ -7,8 +7,8 @@
import com.ruoyi.officesupplies.mapper.OfficeSuppliesMapper;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -17,10 +17,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class OfficeSuppliesServiceImpl extends ServiceImpl<OfficeSuppliesMapper, OfficeSupplies> implements OfficeSuppliesService {
- @Autowired
- private OfficeSuppliesMapper officeSuppliesMapper;
+ private final OfficeSuppliesMapper officeSuppliesMapper;
@Override
public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
diff --git a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
index 6d870af..093ddab 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -8,9 +8,9 @@
import com.ruoyi.other.service.TempFileService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -29,17 +29,14 @@
@Service
@Slf4j
+@RequiredArgsConstructor
public class TempFileServiceImpl extends ServiceImpl<TempFileMapper, TempFile> implements TempFileService {
- @Autowired
- private TempFileMapper tempFileMapper;
-
- @Autowired
- private CommonFileMapper commonFileMapper;
+ private final TempFileMapper tempFileMapper;
+ private final CommonFileMapper commonFileMapper;
@Value("${file.upload-dir}")
private String uploadDir;
-
@Value("${file.temp-dir}")
private String tempDir;
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
index cbe5e99..ea214c2 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
@@ -6,39 +6,43 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.GasTankWarning;
import com.ruoyi.procurementrecord.service.GasTankWarningService;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/gasTankWarning")
+@AllArgsConstructor
public class GasTankWarningController {
- @Autowired
private GasTankWarningService gasTankWarningService;
@GetMapping("/listPage")
public AjaxResult listPage(Page page, GasTankWarning gasTankWarning) {
return AjaxResult.success(gasTankWarningService.listPage(page, gasTankWarning));
}
+
@PostMapping("/add")
public AjaxResult add(@RequestBody GasTankWarning gasTankWarning) {
return AjaxResult.success(gasTankWarningService.save(gasTankWarning));
}
+
@PostMapping("update")
public AjaxResult update(@RequestBody GasTankWarning gasTankWarning) {
return AjaxResult.success(gasTankWarningService.updateById(gasTankWarning));
}
+
@DeleteMapping("delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(gasTankWarningService.removeByIds(ids));
}
+
//瀵煎嚭
@PostMapping("/export")
- public void export(HttpServletResponse response,@RequestParam(name = "ids", required = false) List<Long> ids){
- gasTankWarningService.export(response,ids);
+ public void export(HttpServletResponse response, @RequestParam(name = "ids", required = false) List<Long> ids) {
+ gasTankWarningService.export(response, ids);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
index b8ffa23..f0c8310 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
@@ -9,7 +9,7 @@
import com.ruoyi.procurementrecord.service.InboundManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,9 +23,9 @@
@RestController
@Api(tags = "鍒拌揣绠＄悊")
@RequestMapping("/inboundManagement")
+@AllArgsConstructor
public class InboundManagementController extends BaseController {
- @Autowired
private InboundManagementService inboundManagementService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
index 757c22c..f63d358 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
@@ -12,6 +12,7 @@
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -26,10 +27,9 @@
@RestController
@Api(tags = "閲囪喘寮傚父璁板綍")
@RequestMapping("/procurementExceptionRecord")
+@AllArgsConstructor
public class ProcurementExceptionRecordController extends BaseController {
-
- @Autowired
private ProcurementExceptionRecordMapper procurementExceptionRecordMapper;
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
index f3fd88e..f8d7b01 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
@@ -8,10 +8,10 @@
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -21,9 +21,9 @@
@RestController
@Api(tags = "閲囪喘璁″垝")
@RequestMapping("/procurementPlan")
+@AllArgsConstructor
public class ProcurementPlanController extends BaseController {
- @Autowired
private ProcurementPlanService procurementPlanService;
@RequestMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
index 56354c7..4cfa06d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
@@ -8,11 +8,11 @@
import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -22,9 +22,9 @@
@RestController
@Api(tags = "閲囪喘浠锋牸绠＄悊")
@RequestMapping("/procurementPriceManagement")
+@AllArgsConstructor
public class ProcurementPriceManagementController extends BaseController {
- @Autowired
private ProcurementPriceManagementService procurementPriceManagementService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 64134d3..a22c5ed 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -14,12 +14,14 @@
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import jakarta.servlet.http.HttpServletResponse;
+
import java.util.List;
/**
@@ -29,15 +31,15 @@
@RestController
@Api(tags = "閲囪喘鍏ュ簱")
@RequestMapping("/stockin")
+@AllArgsConstructor
public class ProcurementRecordController extends BaseController {
-
- @Autowired
private ProcurementRecordService procurementRecordService;
-
+ private CustomStorageMapper customStorageMapper;
/**
* 閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺
+ *
* @param salesProductId
* @return
*/
@@ -120,11 +122,13 @@
IPage<ProcurementPageDto> result = procurementRecordService.listPage(page, procurementDto);
return AjaxResult.success(result);
}
+
@GetMapping("/listReport")
@ApiOperation(value = "鏌ヨ搴撳瓨鍥捐〃鏁版嵁")
public AjaxResult listReport() {
return AjaxResult.success(procurementRecordService.getReportList());
}
+
@GetMapping("/listPageByProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍏ュ簱鏌ヨ")
@@ -178,54 +182,58 @@
/**
* 搴撳瓨绠＄悊閲囪喘瀵煎嚭
+ *
* @param response
*/
@PostMapping("/exportCopy")
public void exportCopy(HttpServletResponse response) {
- procurementRecordService.exportCopy(response,1);
+ procurementRecordService.exportCopy(response, 1);
}
/**
* 搴撳瓨绠＄悊鐢熶骇瀵煎嚭
+ *
* @param response
*/
@PostMapping("/exportCopyOne")
public void exportCopyOne(HttpServletResponse response) {
- procurementRecordService.exportCopy(response,2);
+ procurementRecordService.exportCopy(response, 2);
}
/**
* 搴撳瓨绠＄悊鑷畾涔夊鍑�
+ *
* @param response
*/
@PostMapping("/exportCopyTwo")
public void exportCopyTwo(HttpServletResponse response) {
- procurementRecordService.exportCopyTwo(response,3);
+ procurementRecordService.exportCopyTwo(response, 3);
}
/**
* 鍏ュ簱锛屽嚭搴撶鐞嗛噰璐鍑�
+ *
* @param response
*/
@PostMapping("/export")
public void export(HttpServletResponse response) {
- procurementRecordService.export(response,1);
+ procurementRecordService.export(response, 1);
}
/**
* 鍏ュ簱锛屽嚭搴撶鐞嗙敓浜у鍑�
+ *
* @param response
*/
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
- procurementRecordService.export(response,2);
+ procurementRecordService.export(response, 2);
}
- @Autowired
- private CustomStorageMapper customStorageMapper;
/**
* 鍏ュ簱锛屽嚭搴撶鐞嗚嚜瀹氫箟瀵煎嚭
+ *
* @param response
*/
@PostMapping("/exportTwo")
@@ -238,7 +246,7 @@
@GetMapping("/listPageProductionStock")
@Log(title = "搴撳瓨绠＄悊-鎴愬搧搴撳瓨", businessType = BusinessType.OTHER)
public AjaxResult listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
- IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page,procurementDto);
+ IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page, procurementDto);
return AjaxResult.success(result);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
index 45126c7..1f4a5f4 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
@@ -7,17 +7,16 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -27,10 +26,11 @@
@RestController
@Api(tags = "閲囪喘鍑哄簱")
@RequestMapping("/stockmanagement")
+@AllArgsConstructor
public class ProcurementRecordOutController extends BaseController {
- @Autowired
private ProcurementRecordOutService procurementRecordOutService;
+ private ProcurementRecordOutMapper procurementRecordOutMapper;
@PostMapping("/stockout")
@Log(title = "閲囪喘鍑哄簱-鍑哄簱绠＄悊-鍑哄簱", businessType = BusinessType.INSERT)
@@ -74,6 +74,7 @@
/**
* 閲囪喘鍑哄簱瀵煎嚭
+ *
* @param response
*/
@PostMapping("/export")
@@ -82,10 +83,9 @@
}
- @Autowired
- public ProcurementRecordOutMapper procurementRecordOutMapper;
/**
* 鐢熶骇鍑哄簱瀵煎嚭
+ *
* @param response
*/
@PostMapping("/exportOne")
@@ -97,6 +97,7 @@
/**
* 鑷畾涔夊嚭搴撳鍑�
+ *
* @param response
*/
@PostMapping("/exportTwo")
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
index ebafe40..1871cca 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
@@ -17,6 +17,7 @@
import com.ruoyi.sales.dto.SalesLedgerDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,12 +30,11 @@
*/
@RestController
@Api(tags = "閿�鍞��璐�")
+@AllArgsConstructor
@RequestMapping("/returnManagement")
public class ReturnManagementController extends BaseController {
- @Autowired
private ReturnManagementService returnManagementService;
- @Autowired
private ReturnSaleProductService returnSaleProductService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
index be0cc29..74e88ec 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
@@ -4,34 +4,33 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.mapper.GasTankWarningMapper;
import com.ruoyi.procurementrecord.pojo.GasTankWarning;
import com.ruoyi.procurementrecord.service.GasTankWarningService;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@Service
+@RequiredArgsConstructor
public class GasTankWarningServiceImpl extends ServiceImpl<GasTankWarningMapper, GasTankWarning> implements GasTankWarningService {
- @Autowired
- private GasTankWarningMapper gasTankWarningMapper;
+ private final GasTankWarningMapper gasTankWarningMapper;
+
@Override
public IPage listPage(Page page, GasTankWarning gasTankWarning) {
- return gasTankWarningMapper.listPage(page,gasTankWarning);
+ return gasTankWarningMapper.listPage(page, gasTankWarning);
}
@Override
public void export(HttpServletResponse response, List<Long> ids) {
List<GasTankWarning> list = new ArrayList<>();
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
list = gasTankWarningMapper.selectList(null);
- }else {
+ } else {
list = gasTankWarningMapper.selectBatchIds(ids);
}
ExcelUtil<GasTankWarning> util = new ExcelUtil<>(GasTankWarning.class);
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java
index 5e8fa72..bce3eb5 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java
@@ -6,8 +6,8 @@
import com.ruoyi.procurementrecord.mapper.InboundManagementMapper;
import com.ruoyi.procurementrecord.pojo.InboundManagement;
import com.ruoyi.procurementrecord.service.InboundManagementService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -16,10 +16,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class InboundManagementServiceImpl extends ServiceImpl<InboundManagementMapper, InboundManagement> implements InboundManagementService {
- @Autowired
- private InboundManagementMapper inboundManagementMapper;
+ private final InboundManagementMapper inboundManagementMapper;
@Override
public IPage<InboundManagement> listPage(Page page, InboundManagement inboundManagement) {
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java
index 6fe8ef1..6a7f07d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java
@@ -6,13 +6,12 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.mapper.ProcurementPlanMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementPlan;
-import com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement;
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -21,10 +20,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class ProcurementPlanServiceImpl extends ServiceImpl<ProcurementPlanMapper, ProcurementPlan> implements ProcurementPlanService {
- @Autowired
- private ProcurementPlanMapper procurementPlanMapper;
+ private final ProcurementPlanMapper procurementPlanMapper;
@Override
public IPage<ProcurementPlan> listPage(Page page, ProcurementPlan procurementPlan) {
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPriceManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPriceManagementServiceImpl.java
index ba64add..1acc9bf 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPriceManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPriceManagementServiceImpl.java
@@ -3,17 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.excel.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.mapper.ProcurementPriceManagementMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement;
import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -22,11 +20,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class ProcurementPriceManagementServiceImpl extends ServiceImpl<ProcurementPriceManagementMapper, ProcurementPriceManagement> implements ProcurementPriceManagementService {
-
- @Autowired
- private ProcurementPriceManagementMapper procurementPriceManagementMapper;
+ private final ProcurementPriceManagementMapper procurementPriceManagementMapper;
@Override
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index edb70f9..e9b2615 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -1,13 +1,11 @@
package com.ruoyi.procurementrecord.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.SalesRefundAmountOrder;
import com.ruoyi.account.service.SalesRefundAmountOrderService;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
@@ -27,9 +25,9 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -44,25 +42,16 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class ReturnManagementServiceImpl extends ServiceImpl<ReturnManagementMapper, ReturnManagement> implements ReturnManagementService {
- @Autowired
- private ReturnManagementMapper returnManagementMapper;
-
- @Autowired
- private ReturnSaleProductService returnSaleProductService;
- @Autowired
- private ShippingInfoService shippingInfoService;
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
- @Autowired
- private SalesRefundAmountOrderService salesRefundAmountOrderService;
-
- @Autowired
- private StockUtils stockUtils;
-
- @Autowired
- private AccountExpenseMapper accountExpenseMapper;
+ private final ReturnManagementMapper returnManagementMapper;
+ private final ReturnSaleProductService returnSaleProductService;
+ private final ShippingInfoService shippingInfoService;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesRefundAmountOrderService salesRefundAmountOrderService;
+ private final StockUtils stockUtils;
+ private final AccountExpenseMapper accountExpenseMapper;
@Override
public IPage<ReturnManagementDto> listPage(Page page, ReturnManagementDto returnManagement) {
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
index a4281d0..4809674 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
@@ -1,14 +1,13 @@
package com.ruoyi.procurementrecord.service.impl;
-import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
-import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
-import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
-import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
+import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
+import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.Collections;
import java.util.List;
/**
@@ -20,10 +19,11 @@
* @since 2026-03-05 03:57:42
*/
@Service
+@RequiredArgsConstructor
public class ReturnSaleProductServiceImpl extends ServiceImpl<ReturnSaleProductMapper, ReturnSaleProduct> implements ReturnSaleProductService {
- @Autowired
- private ReturnSaleProductMapper returnSaleProductMapper;
+ private final ReturnSaleProductMapper returnSaleProductMapper;
+
@Override
public List<ReturnSaleProductDto> listReturnSaleProductDto(Long returnManagementId) {
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
index 278fd1d..6ec91cb 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
@@ -5,6 +5,7 @@
import com.ruoyi.production.bean.dto.ProductionProductInputDto;
import com.ruoyi.production.service.ProductionProductInputService;
import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,9 +14,9 @@
@RequestMapping("productionProductInput")
@RestController
@Api(value = "鐢熶骇鎶曞叆")
+@AllArgsConstructor
public class ProductionProductInputController {
- @Autowired
private ProductionProductInputService productionProductInputService;
@GetMapping("listPage")
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 935dec0..09e265a 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -16,9 +17,9 @@
@RequestMapping("productionProductMain")
@RestController
@Api(value = "鐢熶骇鎶ュ伐")
+@AllArgsConstructor
public class ProductionProductMainController {
- @Autowired
private ProductionProductMainService productionProductMainService;
/**
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java
index 8944282..3fbb16d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java
@@ -5,7 +5,7 @@
import com.ruoyi.production.bean.dto.ProductionProductOutputDto;
import com.ruoyi.production.service.ProductionProductOutputService;
import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -13,9 +13,9 @@
@RequestMapping("productionProductOutput")
@RestController
@Api(value = "鐢熶骇浜у嚭")
+@AllArgsConstructor
public class ProductionProductOutputController {
- @Autowired
private ProductionProductOutputService productionProductOutputService;
@GetMapping("listPage")
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductInputServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductInputServiceImpl.java
index d46c317..38e0baf 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductInputServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductInputServiceImpl.java
@@ -7,15 +7,13 @@
import com.ruoyi.production.mapper.ProductionProductInputMapper;
import com.ruoyi.production.pojo.ProductionProductInput;
import com.ruoyi.production.service.ProductionProductInputService;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class ProductionProductInputServiceImpl extends ServiceImpl<ProductionProductInputMapper, ProductionProductInput> implements ProductionProductInputService {
- @Autowired
- private ProductionProductInputMapper productionProductInputMapper;
+ private final ProductionProductInputMapper productionProductInputMapper;
@Override
public IPage<ProductionProductInputDto> listPageProductionProductInputDto(Page page, ProductionProductInputDto productionProductInputDto) {
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductOutputServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductOutputServiceImpl.java
index 49518c0..fb2aa26 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductOutputServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductOutputServiceImpl.java
@@ -7,15 +7,13 @@
import com.ruoyi.production.mapper.ProductionProductOutputMapper;
import com.ruoyi.production.pojo.ProductionProductOutput;
import com.ruoyi.production.service.ProductionProductOutputService;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class ProductionProductOutputServiceImpl extends ServiceImpl<ProductionProductOutputMapper, ProductionProductOutput> implements ProductionProductOutputService {
- @Autowired
- private ProductionProductOutputMapper productionProductOutputMapper;
+ private final ProductionProductOutputMapper productionProductOutputMapper;
@Override
public IPage<ProductionProductOutputDto> listPageProductionProductOutputDto(Page page, ProductionProductOutputDto productionProductOutputDto) {
diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/ruoyi/project/common/CaptchaController.java
index e4b2b4d..ef2f5fb 100644
--- a/src/main/java/com/ruoyi/project/common/CaptchaController.java
+++ b/src/main/java/com/ruoyi/project/common/CaptchaController.java
@@ -1,16 +1,5 @@
package com.ruoyi.project.common;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import jakarta.annotation.Resource;
-import javax.imageio.ImageIO;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
@@ -19,6 +8,18 @@
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysConfigService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
/**
* 楠岃瘉鐮佹搷浣滃鐞�
@@ -26,6 +27,7 @@
* @author ruoyi
*/
@RestController
+@AllArgsConstructor
public class CaptchaController
{
@Resource(name = "captchaProducer")
@@ -34,14 +36,12 @@
@Resource(name = "captchaProducerMath")
private Producer captchaProducerMath;
- @Autowired
private RedisCache redisCache;
// 楠岃瘉鐮佺被鍨�
@Value("${ruoyi.captchaType}")
private String captchaType;
- @Autowired
private ISysConfigService configService;
/**
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java b/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
index 748f1b8..63fe76b 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
@@ -1,26 +1,16 @@
package com.ruoyi.project.monitor.controller;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.monitor.domain.SysCache;
+import lombok.AllArgsConstructor;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
/**
* 缂撳瓨鐩戞帶
@@ -29,9 +19,9 @@
*/
@RestController
@RequestMapping("/monitor/cache")
+@AllArgsConstructor
public class CacheController
{
- @Autowired
private RedisTemplate<String, String> redisTemplate;
private final static List<SysCache> caches = new ArrayList<SysCache>();
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
index 9458724..ee2c058 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
@@ -2,6 +2,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,9 +35,9 @@
*/
@RestController
@RequestMapping("/monitor/job")
+@AllArgsConstructor
public class SysJobController extends BaseController
{
- @Autowired
private ISysJobService jobService;
/**
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
index d14a7f7..0c29d22 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
@@ -2,6 +2,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,9 +27,9 @@
*/
@RestController
@RequestMapping("/monitor/jobLog")
+@AllArgsConstructor
public class SysJobLogController extends BaseController
{
- @Autowired
private ISysJobLogService jobLogService;
/**
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
index a8c6d07..7f5085d 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
@@ -1,15 +1,5 @@
package com.ruoyi.project.monitor.controller;
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -19,26 +9,28 @@
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysLogininfor;
import com.ruoyi.project.monitor.service.ISysLogininforService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 绯荤粺璁块棶璁板綍
- *
+ *
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/logininfor")
-public class SysLogininforController extends BaseController
-{
- @Autowired
+@AllArgsConstructor
+public class SysLogininforController extends BaseController {
private ISysLogininforService logininforService;
-
- @Autowired
private SysPasswordService passwordService;
@PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
@GetMapping("/list")
- public TableDataInfo list(SysLogininfor logininfor)
- {
+ public TableDataInfo list(SysLogininfor logininfor) {
startPage();
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
return getDataTable(list);
@@ -47,8 +39,7 @@
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysLogininfor logininfor)
- {
+ public void export(HttpServletResponse response, SysLogininfor logininfor) {
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
util.exportExcel(response, list, "鐧诲綍鏃ュ織");
@@ -57,16 +48,14 @@
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
- public AjaxResult remove(@PathVariable Long[] infoIds)
- {
+ public AjaxResult remove(@PathVariable Long[] infoIds) {
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public AjaxResult clean()
- {
+ public AjaxResult clean() {
logininforService.cleanLogininfor();
return success();
}
@@ -74,8 +63,7 @@
@PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
@Log(title = "璐︽埛瑙ｉ攣", businessType = BusinessType.OTHER)
@GetMapping("/unlock/{userName}")
- public AjaxResult unlock(@PathVariable("userName") String userName)
- {
+ public AjaxResult unlock(@PathVariable("userName") String userName) {
passwordService.clearLoginRecordCache(userName);
return success();
}
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
index 68b28bb..81bab02 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
@@ -2,6 +2,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,9 +27,9 @@
*/
@RestController
@RequestMapping("/monitor/operlog")
+@AllArgsConstructor
public class SysOperlogController extends BaseController
{
- @Autowired
private ISysOperLogService operLogService;
@PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
index 763c141..aa8c824 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
@@ -4,6 +4,8 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -30,12 +32,10 @@
*/
@RestController
@RequestMapping("/monitor/online")
+@AllArgsConstructor
public class SysUserOnlineController extends BaseController
{
- @Autowired
private ISysUserOnlineService userOnlineService;
-
- @Autowired
private RedisCache redisCache;
@PreAuthorize("@ss.hasPermi('monitor:online:list')")
diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java
index 14c88d5..5457fce 100644
--- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.project.monitor.service.impl;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.project.monitor.domain.SysJobLog;
import com.ruoyi.project.monitor.mapper.SysJobLogMapper;
import com.ruoyi.project.monitor.service.ISysJobLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞�
@@ -13,10 +14,10 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysJobLogServiceImpl implements ISysJobLogService
{
- @Autowired
- private SysJobLogMapper jobLogMapper;
+ private final SysJobLogMapper jobLogMapper;
/**
* 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟
diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
index 5c9e38a..6780e8b 100644
--- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
@@ -8,11 +8,11 @@
import com.ruoyi.project.monitor.mapper.SysJobMapper;
import com.ruoyi.project.monitor.service.ISysJobService;
import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
import org.quartz.JobDataMap;
import org.quartz.JobKey;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,13 +24,12 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysJobServiceImpl implements ISysJobService
{
- @Autowired
- private Scheduler scheduler;
+ private final Scheduler scheduler;
- @Autowired
- private SysJobMapper jobMapper;
+ private final SysJobMapper jobMapper;
/**
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧畾鏃跺櫒 涓昏鏄槻姝㈡墜鍔ㄤ慨鏀规暟鎹簱瀵艰嚧鏈悓姝ュ埌瀹氭椂浠诲姟澶勭悊锛堟敞锛氫笉鑳芥墜鍔ㄤ慨鏀规暟鎹簱ID鍜屼换鍔＄粍鍚嶏紝鍚﹀垯浼氬鑷磋剰鏁版嵁锛�
diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
index 4a50410..50b841c 100644
--- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.project.monitor.service.impl;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.project.monitor.domain.SysLogininfor;
import com.ruoyi.project.monitor.mapper.SysLogininforMapper;
import com.ruoyi.project.monitor.service.ISysLogininforService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞�
@@ -13,11 +14,11 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysLogininforServiceImpl implements ISysLogininforService
{
- @Autowired
- private SysLogininforMapper logininforMapper;
+ private final SysLogininforMapper logininforMapper;
/**
* 鏂板绯荤粺鐧诲綍鏃ュ織
diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
index 954bc08..487bf4f 100644
--- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.project.monitor.service.impl;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.project.monitor.domain.SysOperLog;
import com.ruoyi.project.monitor.mapper.SysOperLogMapper;
import com.ruoyi.project.monitor.service.ISysOperLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞�
@@ -13,10 +14,10 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysOperLogServiceImpl implements ISysOperLogService
{
- @Autowired
- private SysOperLogMapper operLogMapper;
+ private final SysOperLogMapper operLogMapper;
/**
* 鏂板鎿嶄綔鏃ュ織
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java b/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
index 08107bd..a10687b 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
@@ -1,18 +1,5 @@
package com.ruoyi.project.system.controller;
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -21,6 +8,13 @@
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysConfig;
import com.ruoyi.project.system.service.ISysConfigService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
@@ -29,9 +23,9 @@
*/
@RestController
@RequestMapping("/system/config")
+@AllArgsConstructor
public class SysConfigController extends BaseController
{
- @Autowired
private ISysConfigService configService;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
index 0a48efe..f61e42f 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.system.controller;
import java.util.List;
+
+import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,9 +31,9 @@
*/
@RestController
@RequestMapping("/system/dept")
+@AllArgsConstructor
public class SysDeptController extends BaseController
{
- @Autowired
private ISysDeptService deptService;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java b/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
index f8dffbe..58cb4c1 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -32,12 +33,10 @@
*/
@RestController
@RequestMapping("/system/dict/data")
+@AllArgsConstructor
public class SysDictDataController extends BaseController
{
- @Autowired
private ISysDictDataService dictDataService;
-
- @Autowired
private ISysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')")
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java b/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
index 8d395cd..f1a026f 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
@@ -2,6 +2,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -29,9 +30,9 @@
*/
@RestController
@RequestMapping("/system/dict/type")
+@AllArgsConstructor
public class SysDictTypeController extends BaseController
{
- @Autowired
private ISysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')")
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java b/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java
index 0837663..9a98588 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.system.controller;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,10 +13,10 @@
* @author ruoyi
*/
@RestController
+@AllArgsConstructor
public class SysIndexController
{
/** 绯荤粺鍩虹閰嶇疆 */
- @Autowired
private RuoYiConfig ruoyiConfig;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index d998f45..ad9a8b3 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -15,6 +15,7 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysMenuService;
import com.ruoyi.project.system.service.ISysUserDeptService;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -34,24 +35,14 @@
* @author ruoyi
*/
@RestController
+@AllArgsConstructor
public class SysLoginController
{
- @Autowired
private SysLoginService loginService;
-
- @Autowired
private ISysMenuService menuService;
-
- @Autowired
private SysPermissionService permissionService;
-
- @Autowired
private TokenService tokenService;
-
- @Autowired
private ISysUserDeptService userDeptService;
-
- @Autowired
private SysDeptMapper sysDeptMapper;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
index 4f3af2e..865e8a4 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
@@ -1,17 +1,5 @@
package com.ruoyi.project.system.controller;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -20,6 +8,12 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.service.ISysMenuService;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 鑿滃崟淇℃伅
@@ -28,9 +22,9 @@
*/
@RestController
@RequestMapping("/system/menu")
+@AllArgsConstructor
public class SysMenuController extends BaseController
{
- @Autowired
private ISysMenuService menuService;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
index 5f856f1..b6691a4 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -25,17 +26,15 @@
*/
@RestController
@RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
-{
- @Autowired
+@AllArgsConstructor
+public class SysNoticeController extends BaseController {
private ISysNoticeService noticeService;
/**
* 鑾峰彇閫氱煡鍏憡鍒楄〃
*/
@GetMapping("/list")
- public R<IPage<SysNotice>> list(SysNotice notice, Page page)
- {
+ public R<IPage<SysNotice>> list(SysNotice notice, Page page) {
IPage<SysNotice> list = noticeService.selectNoticeList(notice, page);
return R.ok(list);
}
@@ -44,8 +43,7 @@
* 鑾峰彇鏈鏁伴噺
*/
@GetMapping("/getCount")
- public R getCount(Long consigneeId)
- {
+ public R getCount(Long consigneeId) {
return R.ok(noticeService.getCount(consigneeId));
}
@@ -53,8 +51,7 @@
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@GetMapping(value = "/{noticeId}")
- public AjaxResult getInfo(@PathVariable Long noticeId)
- {
+ public AjaxResult getInfo(@PathVariable Long noticeId) {
return success(noticeService.selectNoticeById(noticeId));
}
@@ -62,8 +59,7 @@
* 鏂板閫氱煡鍏憡
*/
@PostMapping
- public AjaxResult add(@Validated @RequestBody SysNotice notice)
- {
+ public AjaxResult add(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.insertNotice(notice));
}
@@ -71,8 +67,7 @@
* 淇敼閫氱煡鍏憡
*/
@PutMapping
- public AjaxResult edit(@Validated @RequestBody SysNotice notice)
- {
+ public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
return toAjax(noticeService.updateNotice(notice));
}
@@ -80,8 +75,7 @@
* 鍒犻櫎閫氱煡鍏憡
*/
@DeleteMapping("/{noticeIds}")
- public AjaxResult remove(@PathVariable Long[] noticeIds)
- {
+ public AjaxResult remove(@PathVariable Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
@@ -89,8 +83,7 @@
* 涓�閿凡璇�
*/
@PostMapping("/readAll")
- public AjaxResult readAll()
- {
+ public AjaxResult readAll() {
return toAjax(noticeService.readAll());
}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index 6854a03..a4776c4 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -2,6 +2,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -29,9 +30,9 @@
*/
@RestController
@RequestMapping("/system/post")
+@AllArgsConstructor
public class SysPostController extends BaseController
{
- @Autowired
private ISysPostService postService;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
index 7a6908a..62f6db5 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
@@ -1,15 +1,5 @@
package com.ruoyi.project.system.controller;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
@@ -23,6 +13,11 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysUserService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
/**
* 涓汉淇℃伅 涓氬姟澶勭悊
@@ -31,12 +26,10 @@
*/
@RestController
@RequestMapping("/system/user/profile")
+@AllArgsConstructor
public class SysProfileController extends BaseController
{
- @Autowired
private ISysUserService userService;
-
- @Autowired
private TokenService tokenService;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java b/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
index a3e23ae..ca7baf5 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
@@ -1,35 +1,30 @@
package com.ruoyi.project.system.controller;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.RegisterBody;
import com.ruoyi.framework.security.service.SysRegisterService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysConfigService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
/**
* 娉ㄥ唽楠岃瘉
- *
+ *
* @author ruoyi
*/
@RestController
-public class SysRegisterController extends BaseController
-{
- @Autowired
+@AllArgsConstructor
+public class SysRegisterController extends BaseController {
private SysRegisterService registerService;
-
- @Autowired
private ISysConfigService configService;
@PostMapping("/register")
- public AjaxResult register(@RequestBody RegisterBody user)
- {
- if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
- {
+ public AjaxResult register(@RequestBody RegisterBody user) {
+ if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
return error("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
}
String msg = registerService.register(user);
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
index f9bc6f7..3b05811 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
@@ -2,6 +2,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -38,21 +39,13 @@
*/
@RestController
@RequestMapping("/system/role")
+@AllArgsConstructor
public class SysRoleController extends BaseController
{
- @Autowired
private ISysRoleService roleService;
-
- @Autowired
private TokenService tokenService;
-
- @Autowired
private SysPermissionService permissionService;
-
- @Autowired
private ISysUserService userService;
-
- @Autowired
private ISysDeptService deptService;
@PreAuthorize("@ss.hasPermi('system:role:list')")
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
index c05fa73..fc6d212 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,9 +26,9 @@
@Api(tags = "鐢ㄦ埛璁惧缁戝畾")
@RestController
@RequestMapping("/system/client")
+@AllArgsConstructor
public class SysUserClientController extends BaseController {
- @Autowired
private SysUserClientService sysUserClientService;
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index c0230f6..332d6b5 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -7,6 +7,7 @@
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.*;
+import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,21 +40,13 @@
*/
@RestController
@RequestMapping("/system/user")
+@AllArgsConstructor
public class SysUserController extends BaseController
{
- @Autowired
private ISysUserService userService;
-
- @Autowired
private ISysRoleService roleService;
-
- @Autowired
private ISysDeptService deptService;
-
- @Autowired
private ISysPostService postService;
-
- @Autowired
private ISysUserDeptService userDeptService;
/**
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
index 7c8425a..cf198ce 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
@@ -1,10 +1,5 @@
package com.ruoyi.project.system.service.impl;
-import java.util.Collection;
-import java.util.List;
-import jakarta.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.text.Convert;
@@ -14,6 +9,12 @@
import com.ruoyi.project.system.domain.SysConfig;
import com.ruoyi.project.system.mapper.SysConfigMapper;
import com.ruoyi.project.system.service.ISysConfigService;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
/**
* 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜�
@@ -21,13 +22,11 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysConfigServiceImpl implements ISysConfigService
{
- @Autowired
- private SysConfigMapper configMapper;
-
- @Autowired
- private RedisCache redisCache;
+ private final SysConfigMapper configMapper;
+ private final RedisCache redisCache;
/**
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
index eae688f..65f4705 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
@@ -1,11 +1,5 @@
package com.ruoyi.project.system.service.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.ServiceException;
@@ -20,6 +14,13 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysRoleMapper;
import com.ruoyi.project.system.service.ISysDeptService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇
@@ -27,13 +28,11 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysDeptServiceImpl implements ISysDeptService
{
- @Autowired
- private SysDeptMapper deptMapper;
-
- @Autowired
- private SysRoleMapper roleMapper;
+ private final SysDeptMapper deptMapper;
+ private final SysRoleMapper roleMapper;
/**
* 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
index 8a33773..d82dd46 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
@@ -1,12 +1,13 @@
package com.ruoyi.project.system.service.impl;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.mapper.SysDictDataMapper;
import com.ruoyi.project.system.service.ISysDictDataService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 瀛楀吀 涓氬姟灞傚鐞�
@@ -14,10 +15,10 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysDictDataServiceImpl implements ISysDictDataService
{
- @Autowired
- private SysDictDataMapper dictDataMapper;
+ private final SysDictDataMapper dictDataMapper;
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
index 53dc6a7..883e225 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,13 +1,5 @@
package com.ruoyi.project.system.service.impl;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import jakarta.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DictUtils;
@@ -17,6 +9,15 @@
import com.ruoyi.project.system.mapper.SysDictDataMapper;
import com.ruoyi.project.system.mapper.SysDictTypeMapper;
import com.ruoyi.project.system.service.ISysDictTypeService;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 瀛楀吀 涓氬姟灞傚鐞�
@@ -24,13 +25,11 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysDictTypeServiceImpl implements ISysDictTypeService
{
- @Autowired
- private SysDictTypeMapper dictTypeMapper;
-
- @Autowired
- private SysDictDataMapper dictDataMapper;
+ private final SysDictTypeMapper dictTypeMapper;
+ private final SysDictDataMapper dictDataMapper;
/**
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧瓧鍏稿埌缂撳瓨
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
index db14845..f729ddc 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
@@ -1,15 +1,5 @@
package com.ruoyi.project.system.service.impl;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.SecurityUtils;
@@ -24,6 +14,11 @@
import com.ruoyi.project.system.mapper.SysRoleMapper;
import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
import com.ruoyi.project.system.service.ISysMenuService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 鑿滃崟 涓氬姟灞傚鐞�
@@ -31,18 +26,14 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysMenuServiceImpl implements ISysMenuService
{
public static final String PREMISSION_STRING = "perms[\"{0}\"]";
- @Autowired
- private SysMenuMapper menuMapper;
-
- @Autowired
- private SysRoleMapper roleMapper;
-
- @Autowired
- private SysRoleMenuMapper roleMenuMapper;
+ private final SysMenuMapper menuMapper;
+ private final SysRoleMapper roleMapper;
+ private final SysRoleMenuMapper roleMenuMapper;
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
index 28ec77c..1b6a0f4 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
@@ -1,34 +1,26 @@
package com.ruoyi.project.system.service.impl;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysNoticeMapper;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.system.domain.SysNotice;
-import com.ruoyi.project.system.mapper.SysNoticeMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 鍏憡 鏈嶅姟灞傚疄鐜�
@@ -36,26 +28,16 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
- @Autowired
- private SysNoticeMapper noticeMapper;
-
- @Autowired
- private SysUserMapper userMapper;
-
- @Autowired
- private SysDeptMapper deptMapper;
-
- @Autowired
- private SysUserDeptMapper userDeptMapper;
-
- @Autowired
+ private final SysNoticeMapper noticeMapper;
+ private final SysUserMapper userMapper;
+ private final SysDeptMapper deptMapper;
+ private final SysUserDeptMapper userDeptMapper;
@Lazy
- private ISysNoticeService sysNoticeService;
-
- @Autowired
- private UnipushService unipushService;
+ private final ISysNoticeService sysNoticeService;
+ private final UnipushService unipushService;
/**
* 鏌ヨ鍏憡淇℃伅
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
index 5501e27..2282c3f 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
@@ -1,8 +1,5 @@
package com.ruoyi.project.system.service.impl;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
@@ -10,6 +7,10 @@
import com.ruoyi.project.system.mapper.SysPostMapper;
import com.ruoyi.project.system.mapper.SysUserPostMapper;
import com.ruoyi.project.system.service.ISysPostService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 宀椾綅淇℃伅 鏈嶅姟灞傚鐞�
@@ -17,13 +18,11 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysPostServiceImpl implements ISysPostService
{
- @Autowired
- private SysPostMapper postMapper;
-
- @Autowired
- private SysUserPostMapper userPostMapper;
+ private final SysPostMapper postMapper;
+ private final SysUserPostMapper userPostMapper;
/**
* 鏌ヨ宀椾綅淇℃伅闆嗗悎
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
index 1fe2055..76fe605 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
@@ -1,29 +1,22 @@
package com.ruoyi.project.system.service.impl;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.domain.SysRoleDept;
-import com.ruoyi.project.system.domain.SysRoleMenu;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.SysUserRole;
+import com.ruoyi.project.system.domain.*;
import com.ruoyi.project.system.mapper.SysRoleDeptMapper;
import com.ruoyi.project.system.mapper.SysRoleMapper;
import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
import com.ruoyi.project.system.mapper.SysUserRoleMapper;
import com.ruoyi.project.system.service.ISysRoleService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
/**
* 瑙掕壊 涓氬姟灞傚鐞�
@@ -31,19 +24,13 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysRoleServiceImpl implements ISysRoleService
{
- @Autowired
- private SysRoleMapper roleMapper;
-
- @Autowired
- private SysRoleMenuMapper roleMenuMapper;
-
- @Autowired
- private SysUserRoleMapper userRoleMapper;
-
- @Autowired
- private SysRoleDeptMapper roleDeptMapper;
+ private final SysRoleMapper roleMapper;
+ private final SysRoleMenuMapper roleMenuMapper;
+ private final SysUserRoleMapper userRoleMapper;
+ private final SysRoleDeptMapper roleDeptMapper;
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
index 97be11b..71ea511 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
@@ -3,16 +3,16 @@
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.service.ISysUserDeptService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
+@RequiredArgsConstructor
public class SysUserDeptServiceImpl implements ISysUserDeptService {
- @Autowired
- private SysUserDeptMapper sysUserDeptMapper;
+ private final SysUserDeptMapper sysUserDeptMapper;
@Override
public List<SysUserDeptVo> userLoginFacotryList(SysUserDeptVo userDeptVo) {
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 91d07eb..39f7234 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -1,22 +1,6 @@
package com.ruoyi.project.system.service.impl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import jakarta.validation.Validator;
-
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.project.system.domain.*;
-import com.ruoyi.project.system.mapper.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
@@ -24,9 +8,21 @@
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.system.domain.*;
+import com.ruoyi.project.system.mapper.*;
import com.ruoyi.project.system.service.ISysConfigService;
-import com.ruoyi.project.system.service.ISysDeptService;
import com.ruoyi.project.system.service.ISysUserService;
+import jakarta.validation.Validator;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
@@ -34,36 +30,19 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysUserServiceImpl implements ISysUserService
{
- @Autowired
- private SysUserDeptMapper sysUserDeptMapper;
-
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
- @Autowired
- private SysUserMapper userMapper;
-
- @Autowired
- private SysRoleMapper roleMapper;
-
- @Autowired
- private SysPostMapper postMapper;
-
- @Autowired
- private SysUserRoleMapper userRoleMapper;
-
- @Autowired
- private SysUserPostMapper userPostMapper;
-
- @Autowired
- private ISysConfigService configService;
-
- @Autowired
- private ISysDeptService deptService;
-
- @Autowired
- protected Validator validator;
+ private final SysUserDeptMapper sysUserDeptMapper;
+ private final SysUserMapper userMapper;
+ private final SysRoleMapper roleMapper;
+ private final SysPostMapper postMapper;
+ private final SysUserRoleMapper userRoleMapper;
+ private final SysUserPostMapper userPostMapper;
+ private final ISysConfigService configService;
+ protected final Validator validator;
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java b/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
index c89625b..af06bbc 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
@@ -20,9 +20,9 @@
import com.ruoyi.project.system.mapper.SysMenuMapper;
import com.ruoyi.project.system.service.SysUserClientService;
import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@@ -39,16 +39,12 @@
*/
@Slf4j
@Component
+@RequiredArgsConstructor
public class UnipushService {
- @Autowired
- private SysMenuMapper sysMenuMapper;
-
- @Autowired
- private GetuiConfig getuiConfig;
-
- @Autowired
- private SysUserClientService userClientService;
+ private final SysMenuMapper sysMenuMapper;
+ private final GetuiConfig getuiConfig;
+ private final SysUserClientService userClientService;
private PushApi pushApi;
diff --git a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
index 410755a..ec16cea 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -1,23 +1,5 @@
package com.ruoyi.project.tool.gen.controller;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
@@ -35,6 +17,18 @@
import com.ruoyi.project.tool.gen.domain.GenTableColumn;
import com.ruoyi.project.tool.gen.service.IGenTableColumnService;
import com.ruoyi.project.tool.gen.service.IGenTableService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.commons.io.IOUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊
@@ -43,12 +37,10 @@
*/
@RestController
@RequestMapping("/tool/gen")
+@AllArgsConstructor
public class GenController extends BaseController
{
- @Autowired
private IGenTableService genTableService;
-
- @Autowired
private IGenTableColumnService genTableColumnService;
/**
diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java b/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
index 61ae55e..c982942 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
@@ -1,11 +1,12 @@
package com.ruoyi.project.tool.gen.service;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.project.tool.gen.domain.GenTableColumn;
import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 涓氬姟瀛楁 鏈嶅姟灞傚疄鐜�
@@ -13,10 +14,10 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class GenTableColumnServiceImpl implements IGenTableColumnService
{
- @Autowired
- private GenTableColumnMapper genTableColumnMapper;
+ private final GenTableColumnMapper genTableColumnMapper;
/**
* 鏌ヨ涓氬姟瀛楁鍒楄〃
diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
index df90784..0c8a1a1 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
@@ -1,26 +1,5 @@
package com.ruoyi.project.tool.gen.service;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.constant.Constants;
@@ -35,6 +14,28 @@
import com.ruoyi.project.tool.gen.util.GenUtils;
import com.ruoyi.project.tool.gen.util.VelocityInitializer;
import com.ruoyi.project.tool.gen.util.VelocityUtils;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
/**
* 涓氬姟 鏈嶅姟灞傚疄鐜�
@@ -42,15 +43,13 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class GenTableServiceImpl implements IGenTableService
{
private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
- @Autowired
- private GenTableMapper genTableMapper;
-
- @Autowired
- private GenTableColumnMapper genTableColumnMapper;
+ private final GenTableMapper genTableMapper;
+ private final GenTableColumnMapper genTableColumnMapper;
/**
* 鏌ヨ涓氬姟淇℃伅
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
index 5c8b7c6..8abcd29 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
@@ -16,7 +16,6 @@
import com.ruoyi.projectManagement.vo.*;
import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,8 +41,7 @@
private final PlanNodeMapper planNodeMapper;
@Lazy
- @Autowired
- private PlanService planService;
+ private final PlanService planService;
@Override
@Transactional(rollbackFor = Exception.class)
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/ContractInfoHandleService.java b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/ContractInfoHandleService.java
index 36afacb..afe4de3 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/ContractInfoHandleService.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/ContractInfoHandleService.java
@@ -5,13 +5,11 @@
import com.ruoyi.projectManagement.dto.ContractInfoDto;
import com.ruoyi.projectManagement.mapper.ContractInfoMapper;
import com.ruoyi.projectManagement.pojo.ContractInfo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
import jakarta.annotation.Nullable;
import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
/**
* @author buhuazhen
@@ -20,10 +18,10 @@
*/
@Component
@Transactional(rollbackFor = Exception.class,readOnly = true)
+@RequiredArgsConstructor
public class ContractInfoHandleService{
- @Autowired
- private ContractInfoMapper contractInfoMapper;
+ private final ContractInfoMapper contractInfoMapper;
@Transactional(rollbackFor = Exception.class)
public void save(@Nullable Long id, @NotNull ContractInfoDto contractInfoDto) {
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoStageHandleService.java b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoStageHandleService.java
index 031c656..31e5497 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoStageHandleService.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoStageHandleService.java
@@ -15,13 +15,12 @@
import com.ruoyi.projectManagement.pojo.InfoStage;
import com.ruoyi.projectManagement.vo.InfoStageVo;
import com.ruoyi.projectManagement.vo.SaveInfoStageVo;
+import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.validation.constraints.NotNull;
import java.util.*;
import java.util.stream.Collectors;
@@ -37,9 +36,8 @@
private final InfoStageMapper infoStageMapper;
private final InfoHandleService infoHandleService;
private final CustomerFollowUpFileService customerFollowUpFileService;
- @Autowired
@Lazy
- private InfoStageHandleService infoStageHandleService;
+ private final InfoStageHandleService infoStageHandleService;
@Transactional
public void save(@NotNull SaveInfoStageVo saveInfoStageVo) {
diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
index 5d206f0..aa2dd6c 100644
--- a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
@@ -29,7 +29,6 @@
@AllArgsConstructor
public class AccountingReportController {
- @Autowired
private IInvoicePurchaseService invoicePurchaseService;
@GetMapping("/list")
diff --git a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
index 3276bea..289110c 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -13,6 +13,7 @@
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.service.IPaymentRegistrationService;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,8 +30,8 @@
*/
@RestController
@RequestMapping("/purchase/paymentRegistration")
+@AllArgsConstructor
public class PaymentRegistrationController extends BaseController {
- @Autowired
private IPaymentRegistrationService paymentRegistrationService;
/**
diff --git a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
index 01179af..221d58c 100644
--- a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
@@ -8,18 +8,14 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
-import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.impl.ProcurementBusinessSummaryServiceImpl;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* @author :yys
@@ -28,10 +24,10 @@
@Api(tags = "閲囪喘涓氬姟姹囨��")
@RestController
@RequestMapping("/procurementBusinessSummary")
+@AllArgsConstructor
public class ProcurementBusinessSummaryController extends BaseController {
- @Autowired
private ProcurementBusinessSummaryServiceImpl procurementBusinessSummaryService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
index 4335fcb..161c255 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
@@ -10,15 +10,13 @@
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
-import com.ruoyi.purchase.service.PurchaseLedgerTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
/**
@@ -32,12 +30,10 @@
@RestController
@RequestMapping("/purchaseLedgerTemplate")
@Api(tags = "閲囪喘鍙拌处妯℃澘")
+@AllArgsConstructor
public class PurchaseLedgerTemplateController {
- @Autowired
private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
-
- @Autowired
private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index d23cc11..8d0a942 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -5,17 +5,16 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
@@ -24,11 +23,9 @@
@RestController
@RequestMapping("/purchaseReturnOrders")
@Api(tags = "閲囪喘閫�璐у崟")
+@AllArgsConstructor
public class PurchaseReturnOrdersController {
- @Autowired
private PurchaseReturnOrdersService purchaseReturnOrdersService;
-
- @Autowired
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
@@ -42,7 +39,7 @@
@PostMapping("/add")
public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
if (purchaseReturnOrderDto.getIsDefaultNo()) {
- purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL","no"));
+ purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL", "no"));
}
return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index ff23dbc..c3b8ef6 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -53,7 +53,6 @@
private IProductRecordService productRecordService;
- @Autowired
private IPaymentRegistrationService paymentRegistrationService;
/**
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index 55aea8f..0a4ac0b 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.basic.mapper.SupplierManageMapper;
@@ -17,18 +16,18 @@
import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
-import com.ruoyi.purchase.mapper.*;
+import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
+import com.ruoyi.purchase.mapper.ProductRecordMapper;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPaymentRegistrationService;
-import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.ReceiptPayment;
-import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@@ -47,23 +46,16 @@
* @date 2025-05-15
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class PaymentRegistrationServiceImpl extends ServiceImpl<PaymentRegistrationMapper, PaymentRegistration> implements IPaymentRegistrationService {
- private PaymentRegistrationMapper paymentRegistrationMapper;
- private PurchaseLedgerMapper purchaseLedgerMapper;
-
- private SalesLedgerMapper salesLedgerMapper;
-
- private SupplierManageMapper supplierManageMapper;
-
- private SalesLedgerProductMapper salesLedgerProductMapper;
-
- private TicketRegistrationMapper ticketRegistrationMapper;
-
- private ProductRecordMapper productRecordMapper;
-
- private AccountExpenseService accountExpenseService;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
+ private final SupplierManageMapper supplierManageMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final TicketRegistrationMapper ticketRegistrationMapper;
+ private final ProductRecordMapper productRecordMapper;
+ private final AccountExpenseService accountExpenseService;
/**
* 鏌ヨ浠樻鐧昏
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProcurementBusinessSummaryServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProcurementBusinessSummaryServiceImpl.java
index ea0a3f8..b8ec1d4 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProcurementBusinessSummaryServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProcurementBusinessSummaryServiceImpl.java
@@ -2,12 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -16,10 +14,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class ProcurementBusinessSummaryServiceImpl {
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
public IPage<ProcurementBusinessSummaryDto> listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
return salesLedgerProductMapper.procurementBusinessSummaryListPage(page, procurementBusinessSummaryDto);
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
index fda5910..961e759 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
@@ -10,20 +10,16 @@
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
-import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
import com.ruoyi.purchase.pojo.ProductRecord;
-import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IProductRecordService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,20 +33,12 @@
* @date 2025-05-23
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class ProductRecordServiceImpl extends ServiceImpl<ProductRecordMapper, ProductRecord> implements IProductRecordService {
- @Autowired
- private ProductRecordMapper productRecordMapper;
-
- @Autowired
- private CommonFileMapper commonFileMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
-
-
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final ProductRecordMapper productRecordMapper;
+ private final CommonFileMapper commonFileMapper;
/**
* 鏌ヨ閲囪喘鍙拌处浜у搧寮�绁ㄨ褰�
*
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index b23148a..7c1e58e 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -1,29 +1,22 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.account.service.AccountExpenseService;
-import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -38,14 +31,27 @@
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.dto.PurchaseLedgerImportDto;
import com.ruoyi.purchase.dto.PurchaseLedgerProductImportDto;
-import com.ruoyi.purchase.mapper.*;
-import com.ruoyi.purchase.pojo.*;
+import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
+import com.ruoyi.purchase.mapper.ProductRecordMapper;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
+import com.ruoyi.purchase.pojo.PaymentRegistration;
+import com.ruoyi.purchase.pojo.ProductRecord;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
-import com.ruoyi.quality.mapper.*;
-import com.ruoyi.quality.pojo.*;
-import com.ruoyi.sales.dto.SalesLedgerImportDto;
-import com.ruoyi.sales.dto.SalesLedgerProductImportDto;
-import com.ruoyi.sales.mapper.*;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.mapper.QualityInspectParamMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedger;
@@ -55,7 +61,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -86,70 +91,32 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class PurchaseLedgerServiceImpl extends ServiceImpl<PurchaseLedgerMapper, PurchaseLedger> implements IPurchaseLedgerService {
- @Autowired
- private AccountExpenseService accountExpenseService;
- @Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final SysUserMapper userMapper;
+ private final TempFileMapper tempFileMapper;
+ private final CommonFileMapper commonFileMapper;
+ private final SupplierManageMapper supplierManageMapper;
+ private final ProductMapper productMapper;
+ private final ProductModelMapper productModelMapper;
+ private final SysUserMapper sysUserMapper;
+ private final TicketRegistrationMapper ticketRegistrationMapper;
+ private final ProductRecordMapper productRecordMapper;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private final StringRedisTemplate redisTemplate;
+ private final QualityInspectMapper qualityInspectMapper;
+ private final CommonFileServiceImpl commonFileService;
+ private final QualityTestStandardParamMapper qualityTestStandardParamMapper;
+ private final QualityTestStandardMapper qualityTestStandardMapper;
+ private final QualityInspectParamMapper qualityInspectParamMapper;
+ private final ApproveProcessServiceImpl approveProcessService;
+ private final ProcurementRecordMapper procurementRecordStorageMapper;
- @Autowired
- private SysUserMapper userMapper;
-
- @Autowired
- private TempFileMapper tempFileMapper;
-
- @Autowired
- private CommonFileMapper commonFileMapper;
-
- @Autowired
- private SupplierManageMapper supplierManageMapper;
-
- @Autowired
- private ProductMapper productMapper;
-
- @Autowired
- private ProductModelMapper productModelMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private TicketRegistrationMapper ticketRegistrationMapper;
-
- @Autowired
- private ProductRecordMapper productRecordMapper;
-
- @Autowired
- private PaymentRegistrationMapper paymentRegistrationMapper;
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
- @Autowired
- private StringRedisTemplate redisTemplate;
- @Autowired
- private QualityInspectMapper qualityInspectMapper;
- @Autowired
- private CommonFileServiceImpl commonFileService;
- @Autowired
- private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
- @Autowired
- private QualityTestStandardParamMapper qualityTestStandardParamMapper;
- @Autowired
- private QualityTestStandardMapper qualityTestStandardMapper;
- @Autowired
- private QualityInspectParamMapper qualityInspectParamMapper;
- @Autowired
- private ApproveProcessServiceImpl approveProcessService;
- @Autowired
- private ProcurementRecordMapper procurementRecordStorageMapper;
- @Autowired
- private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
- @Autowired
- private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@Value("${file.upload-dir}")
private String uploadDir;
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java
index d64bd4d..446c995 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java
@@ -1,11 +1,11 @@
package com.ruoyi.purchase.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
-import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
import com.ruoyi.purchase.service.PurchaseLedgerTemplateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -17,13 +17,7 @@
* @since 2026-01-26 11:21:44
*/
@Service
+@RequiredArgsConstructor
public class PurchaseLedgerTemplateServiceImpl extends ServiceImpl<PurchaseLedgerTemplateMapper, PurchaseLedgerTemplate> implements PurchaseLedgerTemplateService {
-
- @Autowired
- private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
-
- @Autowired
- private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
-
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
index 17809df..e75e986 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -12,7 +12,6 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.dto.PurchaseReturnOrderProductsDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
@@ -24,11 +23,10 @@
import com.ruoyi.purchase.vo.PurchaseReturnOrderVo;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -43,17 +41,13 @@
* @since 2026-03-06 11:44:38
*/
@Service
+@RequiredArgsConstructor
public class PurchaseReturnOrdersServiceImpl extends ServiceImpl<PurchaseReturnOrdersMapper, PurchaseReturnOrders> implements PurchaseReturnOrdersService {
- @Autowired
- private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
- @Autowired
- private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
- @Autowired
- private ISalesLedgerService salesLedgerService;
-
- @Resource
- private AccountIncomeService accountIncomeService;
+ private final PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+ private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
+ private final ISalesLedgerService salesLedgerService;
+ private final AccountIncomeService accountIncomeService;
@Override
public IPage<PurchaseReturnOrderVo> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index ec8716f..b0b2a59 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -35,7 +35,6 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -75,11 +74,9 @@
private final ProductRecordMapper productRecordMapper;
- @Autowired
- private ISalesLedgerProductService salesLedgerProductService;
+ private final ISalesLedgerProductService salesLedgerProductService;
- @Autowired
- private PaymentRegistrationMapper paymentRegistrationMapper;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
@Value("${file.upload-dir}")
private String uploadDir;
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 98dbcd4..fcaceb6 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,11 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -14,12 +10,11 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -27,24 +22,17 @@
*/
@RestController
@RequestMapping("/quality/qualityInspect")
+@AllArgsConstructor
public class QualityInspectController {
- @Resource
private IQualityInspectService qualityInspectService;
-
- @Resource
private IQualityInspectParamService qualityInspectParamService;
-
- @Resource
private IQualityInspectFileService qualityInspectFileService;
- @Autowired
- private ProcurementRecordService procurementRecordService;
- @Autowired
- private StockUtils stockUtils;
/**
* 鏂板
+ *
* @param qualityInspectDto
* @return
*/
@@ -55,33 +43,35 @@
/**
* 鍒犻櫎
+ *
* @param ids
* @return
*/
@DeleteMapping("/del")
public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
for (QualityInspect qualityInspect : qualityInspects) {
- if(qualityInspect.getInspectState()==1){
- throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
+ if (qualityInspect.getInspectState() == 1) {
+ throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
}
}
//鍒犻櫎妫�楠屽弬鏁�
qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
- .in(QualityInspectParam::getInspectId,ids));
+ .in(QualityInspectParam::getInspectId, ids));
//鍒犻櫎妫�楠岄檮浠�
qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
- .in(QualityInspectFile::getInspectId,ids));
+ .in(QualityInspectFile::getInspectId, ids));
//鍒犻櫎妫�楠屽崟
return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
}
/**
* 璇︽儏
+ *
* @param id
* @return
*/
@@ -92,6 +82,7 @@
/**
* 淇敼
+ *
* @param qualityInspectDto
* @return
*/
@@ -101,7 +92,8 @@
}
/**
- *鍒嗛〉鏌ヨ
+ * 鍒嗛〉鏌ヨ
+ *
* @param page
* @param qualityInspect
* @return
@@ -113,16 +105,18 @@
/**
* 瀵煎嚭
+ *
* @param response
* @param qualityInspect
*/
@PostMapping("/export")
- public void qualityInspectExport(HttpServletResponse response,QualityInspect qualityInspect) {
+ public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
qualityInspectService.qualityInspectExport(response, qualityInspect);
}
/**
* 鎻愪氦
+ *
* @param qualityInspect
* @return
*/
@@ -133,11 +127,12 @@
/**
* 涓嬭浇
+ *
* @param response
* @param qualityInspect
*/
@PostMapping("/down")
- public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
+ public void down(HttpServletResponse response, @RequestBody QualityInspect qualityInspect) {
qualityInspectService.down(response, qualityInspect);
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
index e60216d..228a6e2 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,9 +20,9 @@
@Api(tags = "璐ㄩ噺绠＄悊")
@RestController
@RequestMapping("/qualityReport")
+@AllArgsConstructor
public class QualityReportController {
- @Autowired
private QualityReportService qualityReportService;
/**
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
index 801eaaf..539f3f7 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
@@ -1,12 +1,9 @@
package com.ruoyi.quality.controller;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
-import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardBindingService;
-import com.ruoyi.quality.service.QualityTestStandardParamService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,13 +19,14 @@
*/
@RestController
@RequestMapping("/qualityTestStandardBinding")
+@AllArgsConstructor
public class QualityTestStandardBindingController {
- @Autowired
private QualityTestStandardBindingService qualityTestStandardBindingService;
/**
* 鏂板妫�娴嬫爣鍑嗕富琛ㄤ笌浜у搧鍏宠仈琛�
+ *
* @param qualityTestStandardBindings
* @return
*/
@@ -39,19 +37,21 @@
/**
* 鍒犻櫎妫�娴嬫爣鍑嗕富琛ㄤ笌浜у搧鍏宠仈琛�
+ *
* @param ids
* @return
*/
@DeleteMapping("/del")
public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
return AjaxResult.success(qualityTestStandardBindingService.removeBatchByIds(ids));
}
/**
- *妫�娴嬫寚鏍囩淮鎶ゆ煡璇�
+ * 妫�娴嬫寚鏍囩淮鎶ゆ煡璇�
+ *
* @return
*/
@GetMapping("/list")
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
index 55508ec..e5c883c 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
@@ -6,6 +6,7 @@
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardParamService;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +23,9 @@
*/
@RestController
@RequestMapping("/qualityTestStandardParam")
+@AllArgsConstructor
public class QualityTestStandardParamController {
- @Autowired
private QualityTestStandardParamService qualityTestStandardParamService;
/**
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
index cd2aee6..d59b610 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
@@ -4,8 +4,8 @@
import com.ruoyi.quality.dto.*;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.service.QualityReportService;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -17,10 +17,10 @@
@Service
+@RequiredArgsConstructor
public class QualityReportServiceImpl implements QualityReportService {
- @Autowired
- private QualityInspectMapper qualityInspectMapper;
+ private final QualityInspectMapper qualityInspectMapper;
@Override
public List<QualityInspectStatDto> getInspectStatistics() {
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java
index 86c6e7f..a581977 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardBindingServiceImpl.java
@@ -1,12 +1,12 @@
package com.ruoyi.quality.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.quality.dto.QualityTestStandardBindingDto;
-import com.ruoyi.quality.pojo.QualityTestStandardBinding;
-import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
-import com.ruoyi.quality.service.QualityTestStandardBindingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.quality.dto.QualityTestStandardBindingDto;
+import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
+import com.ruoyi.quality.pojo.QualityTestStandardBinding;
+import com.ruoyi.quality.service.QualityTestStandardBindingService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -20,10 +20,10 @@
* @since 2026-01-13 03:39:40
*/
@Service
+@RequiredArgsConstructor
public class QualityTestStandardBindingServiceImpl extends ServiceImpl<QualityTestStandardBindingMapper, QualityTestStandardBinding> implements QualityTestStandardBindingService {
- @Autowired
- private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
+ private final QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
@Override
public List<QualityTestStandardBindingDto> listBinding(Long testStandardId) {
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
index 371ab5d..ed777a7 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -1,23 +1,18 @@
package com.ruoyi.quality.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.mapper.ProductModelMapper;
-import com.ruoyi.basic.pojo.ProductModel;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityTestStandard;
-import com.ruoyi.quality.mapper.QualityTestStandardMapper;
-import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.quality.service.QualityTestStandardParamService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -33,22 +28,13 @@
* @since 2026-01-13 03:40:24
*/
@Service
+@RequiredArgsConstructor
public class QualityTestStandardServiceImpl extends ServiceImpl<QualityTestStandardMapper, QualityTestStandard> implements IQualityTestStandardService {
- @Autowired
- private QualityTestStandardMapper qualityTestStandardMapper;
-
- @Autowired
- private QualityTestStandardParamMapper qualityTestStandardParamMapper;
-
- @Autowired
- private QualityTestStandardParamService qualityTestStandardParamService;
-
- @Autowired
- private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
-
- @Autowired
- private QualityInspectMapper qualityInspectMapper;
+ private final QualityTestStandardMapper qualityTestStandardMapper;
+ private final QualityTestStandardParamMapper qualityTestStandardParamMapper;
+ private final QualityTestStandardParamService qualityTestStandardParamService;
+ private final QualityInspectMapper qualityInspectMapper;
@Override
public IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java b/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java
index 3db1660..77af2fe 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java
@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeAccident;
-import com.ruoyi.safe.pojo.SafeContingencyPlan;
import com.ruoyi.safe.service.SafeAccidentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -22,10 +21,10 @@
*/
@RestController
@RequestMapping("/safeAccident")
+@AllArgsConstructor
@Api(tags = "瀹夊叏鐢熶骇--浜嬫晠涓婃姤璁板綍")
public class SafeAccidentController {
- @Autowired
private SafeAccidentService safeAccidentService;
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java b/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
index cc59428..84fac8e 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
@@ -6,6 +6,7 @@
import com.ruoyi.safe.service.SafeCertificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +23,9 @@
@RestController
@RequestMapping("/safeCertification")
@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+@AllArgsConstructor
public class SafeCertificationController {
- @Autowired
private SafeCertificationService safeCertificationService;
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java b/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
index 33d32bd..8f90e8d 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.safe.pojo.SafeCertification;
import com.ruoyi.safe.pojo.SafeContingencyPlan;
-import com.ruoyi.safe.service.SafeCertificationService;
import com.ruoyi.safe.service.SafeContingencyPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -24,10 +22,10 @@
@RestController
@RequestMapping("/safeContingencyPlan")
@Api(tags = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
+@AllArgsConstructor
public class SafeContingencyPlanController {
- @Autowired
- private SafeContingencyPlanService safeContingencyPlanService;
+ private final SafeContingencyPlanService safeContingencyPlanService;
@GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
index 60aa9ee..598d864 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.safe.pojo.SafeCertification;
import com.ruoyi.safe.pojo.SafeHazard;
-import com.ruoyi.safe.service.SafeCertificationService;
import com.ruoyi.safe.service.SafeHazardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -24,9 +22,9 @@
@RestController
@RequestMapping("/safeHazard")
@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+@AllArgsConstructor
public class SafeHazardController {
- @Autowired
private SafeHazardService safeHazardService;
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
index 9e4e139..d1398d0 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.dto.SafeHazardRecordDto;
-import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.pojo.SafeHazardRecord;
import com.ruoyi.safe.service.SafeHazardRecordService;
-import com.ruoyi.safe.service.SafeHazardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -25,9 +23,9 @@
@RestController
@RequestMapping("/safeHazardRecord")
@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+@AllArgsConstructor
public class SafeHazardRecordController {
- @Autowired
private SafeHazardRecordService safeHazardRecordService;
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java b/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
index f8186ae..ca07275 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.dto.SafeHiddenDto;
-import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.pojo.SafeHidden;
-import com.ruoyi.safe.service.SafeHazardService;
import com.ruoyi.safe.service.SafeHiddenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -24,10 +22,10 @@
*/
@RestController
@RequestMapping("/safeHidden")
+@AllArgsConstructor
@Api(tags = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
public class SafeHiddenController {
- @Autowired
private SafeHiddenService safeHiddenService;
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
index a4e9613..48857aa 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
@@ -3,18 +3,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.dto.SafeTrainingDto;
-import com.ruoyi.safe.pojo.SafeAccident;
import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
-import com.ruoyi.safe.service.SafeAccidentService;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
import com.ruoyi.safe.service.SafeTrainingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -28,12 +26,10 @@
@RestController
@RequestMapping("/safeTraining")
@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+@RequiredArgsConstructor
public class SafeTrainingController {
- @Autowired
private SafeTrainingService safeTrainingService;
-
- @Autowired
private SafeTrainingDetailsService safeTrainingDetailsService;
@GetMapping("/page")
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
index 6b91383..b000680 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
@@ -2,16 +2,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.safe.dto.SafeTrainingDto;
-import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -24,11 +21,11 @@
@RestController
@RequestMapping("/safeTrainingDetails")
@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
+@AllArgsConstructor
public class SafeTrainingDetailsController {
- @Autowired
- private SafeTrainingDetailsService safeTrainingDetailsService;
+ private final SafeTrainingDetailsService safeTrainingDetailsService;
@GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
index 2a565f6..7c90c8e 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
@@ -5,8 +5,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import jakarta.validation.constraints.NotBlank;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -21,8 +20,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-28 11:10:54
*/
-@Getter
-@Setter
+@Data
@TableName("safe_hidden")
@ApiModel(value = "SafeHidden瀵硅薄", description = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
public class SafeHidden implements Serializable {
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeAccidentServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeAccidentServiceImpl.java
index 131ba24..94b38e9 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeAccidentServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeAccidentServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.safe.pojo.SafeAccident;
-import com.ruoyi.safe.mapper.SafeAccidentMapper;
-import com.ruoyi.safe.service.SafeAccidentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.safe.mapper.SafeAccidentMapper;
+import com.ruoyi.safe.pojo.SafeAccident;
+import com.ruoyi.safe.service.SafeAccidentService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -18,10 +18,10 @@
* @since 2026-01-28 02:40:31
*/
@Service
+@RequiredArgsConstructor
public class SafeAccidentServiceImpl extends ServiceImpl<SafeAccidentMapper, SafeAccident> implements SafeAccidentService {
- @Autowired
- private SafeAccidentMapper safeAccidentMapper;
+ private final SafeAccidentMapper safeAccidentMapper;
@Override
public IPage<SafeAccident> pageSafeAccident(Page page, SafeAccident safeAccident) {
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeCertificationServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeCertificationServiceImpl.java
index 51162bc..575ed96 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeCertificationServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeCertificationServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.safe.pojo.SafeCertification;
-import com.ruoyi.safe.mapper.SafeCertificationMapper;
-import com.ruoyi.safe.service.SafeCertificationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.safe.mapper.SafeCertificationMapper;
+import com.ruoyi.safe.pojo.SafeCertification;
+import com.ruoyi.safe.service.SafeCertificationService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -18,10 +18,10 @@
* @since 2026-01-28 09:26:33
*/
@Service
+@RequiredArgsConstructor
public class SafeCertificationServiceImpl extends ServiceImpl<SafeCertificationMapper, SafeCertification> implements SafeCertificationService {
- @Autowired
- private SafeCertificationMapper safeCertificationMapper;
+ private final SafeCertificationMapper safeCertificationMapper;
@Override
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeContingencyPlanServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeContingencyPlanServiceImpl.java
index b3ebd98..7072c69 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeContingencyPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeContingencyPlanServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.safe.pojo.SafeContingencyPlan;
-import com.ruoyi.safe.mapper.SafeContingencyPlanMapper;
-import com.ruoyi.safe.service.SafeContingencyPlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.safe.mapper.SafeContingencyPlanMapper;
+import com.ruoyi.safe.pojo.SafeContingencyPlan;
+import com.ruoyi.safe.service.SafeContingencyPlanService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -18,10 +18,10 @@
* @since 2026-01-28 02:07:29
*/
@Service
+@RequiredArgsConstructor
public class SafeContingencyPlanServiceImpl extends ServiceImpl<SafeContingencyPlanMapper, SafeContingencyPlan> implements SafeContingencyPlanService {
- @Autowired
- private SafeContingencyPlanMapper safeContingencyPlanMapper;
+ private final SafeContingencyPlanMapper safeContingencyPlanMapper;
@Override
public IPage<SafeContingencyPlan> pageSafeContingencyPlan(Page page, SafeContingencyPlan safeContingencyPlan) {
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java
index 2d6fa1d..fc46ab6 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java
@@ -3,15 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.safe.dto.SafeHazardRecordDto;
import com.ruoyi.safe.mapper.SafeHazardMapper;
+import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.pojo.SafeHazardRecord;
-import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
import com.ruoyi.safe.service.SafeHazardRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,12 +29,11 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class SafeHazardRecordServiceImpl extends ServiceImpl<SafeHazardRecordMapper, SafeHazardRecord> implements SafeHazardRecordService {
- @Autowired
- private SafeHazardRecordMapper safeHazardRecordMapper;
- @Autowired
- private SafeHazardMapper safeHazardMapper;
+ private final SafeHazardRecordMapper safeHazardRecordMapper;
+ private final SafeHazardMapper safeHazardMapper;
@Override
public IPage<SafeHazardRecordDto> pageSafeHazardRecord(Page page, SafeHazardRecordDto safeHazardRecordDto) {
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
index 18939e6..a2cbc96 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java
@@ -3,13 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.safe.mapper.SafeHazardMapper;
import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
import com.ruoyi.safe.pojo.SafeHazard;
-import com.ruoyi.safe.mapper.SafeHazardMapper;
import com.ruoyi.safe.pojo.SafeHazardRecord;
import com.ruoyi.safe.service.SafeHazardService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -23,13 +23,12 @@
* @since 2026-01-28 10:09:24
*/
@Service
+@RequiredArgsConstructor
public class SafeHazardServiceImpl extends ServiceImpl<SafeHazardMapper, SafeHazard> implements SafeHazardService {
- @Autowired
- private SafeHazardMapper safeHazardMapper;
+ private final SafeHazardMapper safeHazardMapper;
- @Autowired
- private SafeHazardRecordMapper safeHazardRecordMapper;
+ private final SafeHazardRecordMapper safeHazardRecordMapper;
@Override
public IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard) {
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
index 460c1d3..7aead53 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
@@ -3,17 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.project.system.domain.SysNotice;
-import com.ruoyi.project.system.mapper.SysNoticeMapper;
import com.ruoyi.project.system.service.ISysDictDataService;
import com.ruoyi.project.system.service.ISysNoticeService;
-import com.ruoyi.project.system.service.impl.SysNoticeServiceImpl;
import com.ruoyi.safe.dto.SafeHiddenDto;
-import com.ruoyi.safe.pojo.SafeHidden;
import com.ruoyi.safe.mapper.SafeHiddenMapper;
+import com.ruoyi.safe.pojo.SafeHidden;
import com.ruoyi.safe.service.SafeHiddenService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -32,15 +30,13 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class SafeHiddenServiceImpl extends ServiceImpl<SafeHiddenMapper, SafeHidden> implements SafeHiddenService {
- @Autowired
- private SafeHiddenMapper safeHiddenMapper;
- @Autowired
- private ISysNoticeService sysNoticeService;
+ private final SafeHiddenMapper safeHiddenMapper;
+ private final ISysNoticeService sysNoticeService;
- @Autowired
- private ISysDictDataService sysDictDataService;
+ private final ISysDictDataService sysDictDataService;
@Override
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingDetailsServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingDetailsServiceImpl.java
index bc22538..db2af40 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingDetailsServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingDetailsServiceImpl.java
@@ -2,21 +2,19 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.safe.dto.SafeTrainingDetailsDto;
-import com.ruoyi.safe.dto.SafeTrainingDto;
-import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.mapper.SafeTrainingDetailsMapper;
+import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
@@ -32,13 +30,12 @@
* @since 2026-01-29 10:54:15
*/
@Service
+@RequiredArgsConstructor
public class SafeTrainingDetailsServiceImpl extends ServiceImpl<SafeTrainingDetailsMapper, SafeTrainingDetails> implements SafeTrainingDetailsService {
- @Autowired
- private SafeTrainingDetailsMapper safeTrainingDetailsMapper;
+ private final SafeTrainingDetailsMapper safeTrainingDetailsMapper;
- @Autowired
- private SysUserMapper sysUserMapper;
+ private final SysUserMapper sysUserMapper;
@Override
public IPage<SafeTrainingDetails> pageDetails(Page page, SafeTrainingDetails safeTrainingDetails) {
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
index 2f528f2..ee9c814 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
@@ -12,16 +13,15 @@
import com.ruoyi.safe.dto.SafeTrainingDto;
import com.ruoyi.safe.mapper.SafeTrainingDetailsMapper;
import com.ruoyi.safe.mapper.SafeTrainingFileMapper;
-import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.mapper.SafeTrainingMapper;
+import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.pojo.SafeTrainingFile;
import com.ruoyi.safe.service.SafeTrainingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
@@ -40,16 +40,14 @@
* @since 2026-01-29 10:54:06
*/
@Service
+@RequiredArgsConstructor
public class SafeTrainingServiceImpl extends ServiceImpl<SafeTrainingMapper, SafeTraining> implements SafeTrainingService {
- @Autowired
- private SafeTrainingMapper safeTrainingMapper;
+ private final SafeTrainingMapper safeTrainingMapper;
- @Autowired
- private SafeTrainingFileMapper safeTrainingFileMapper;
+ private final SafeTrainingFileMapper safeTrainingFileMapper;
- @Autowired
- private SafeTrainingDetailsMapper safeTrainingDetailsMapper;
+ private final SafeTrainingDetailsMapper safeTrainingDetailsMapper;
@Override
public IPage<SafeTrainingDto> pageSafeTraining(Page page, SafeTrainingDto safeTrainingDto) {
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index ecaffc9..0559ff8 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -7,30 +7,22 @@
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.service.InvoiceLedgerService;
import io.jsonwebtoken.lang.Collections;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
import java.util.List;
@RestController
@RequestMapping("/invoiceLedger")
+@AllArgsConstructor
public class InvoiceLedgerController {
- @Autowired
private InvoiceLedgerService invoiceLedgerService;
-
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
-
- @Autowired
private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
index 250e080..8ea6c11 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
@@ -8,18 +8,18 @@
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.service.InvoiceRegistrationService;
import io.jsonwebtoken.lang.Collections;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/invoiceRegistration")
+@AllArgsConstructor
public class InvoiceRegistrationController {
- @Autowired
private InvoiceRegistrationService invoiceRegistrationService;
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 3c610a1..56b7ddb 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -6,7 +6,7 @@
import com.ruoyi.sales.service.impl.MetricStatisticsServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -18,9 +18,9 @@
@Api(tags = "鎸囨爣缁熻")
@RestController
@RequestMapping("/metricStatistics")
+@AllArgsConstructor
public class MetricStatisticsController extends BaseController {
- @Autowired
private MetricStatisticsServiceImpl metricStatisticsService;
@ApiOperation("澶撮儴鎬昏")
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index dabd7ac..4e6eeb0 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -11,7 +11,7 @@
import com.ruoyi.sales.service.PaymentShippingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -24,12 +24,10 @@
@RestController
@RequestMapping("/paymentShipping")
@Api(tags = "鏀粯涓庡彂璐х鐞�")
+@AllArgsConstructor
public class PaymentShippingController extends BaseController {
- @Autowired
private PaymentShippingService paymentShippingService;
-
- @Autowired
private PaymentShippingMapper paymentShippingMapper;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 5246c50..a5ebc32 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -9,20 +9,17 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentRecordDto;
-import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
-import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ReceiptPaymentService;
import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,9 +28,9 @@
@RestController
@RequestMapping("/receiptPayment")
+@AllArgsConstructor
public class ReceiptPaymentController extends BaseController {
- @Autowired
private ReceiptPaymentService receiptPaymentService;
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 869e290..96b7ef4 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -22,14 +22,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -53,13 +52,8 @@
public class SalesLedgerController extends BaseController {
private ISalesLedgerService salesLedgerService;
-
private ICommonFileService commonFileService;
-
- @Autowired
private InvoiceLedgerMapper invoiceLedgerMapper;
-
- @Autowired
private ReceiptPaymentMapper receiptPaymentMapper;
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index b93b63f..dac35b7 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,36 +1,24 @@
package com.ruoyi.sales.controller;
-import jakarta.servlet.http.HttpServletResponse;
-
import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
-import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import com.ruoyi.procurementrecord.utils.StockUtils;
-import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
-import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
-import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
-import com.ruoyi.sales.dto.SalesLedgerProductDto;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.sales.service.ISalesLedgerProductService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
@@ -44,17 +32,13 @@
* @date 2025-05-08
*/
@RestController
+@RequiredArgsConstructor
@RequestMapping("/sales/product")
public class SalesLedgerProductController extends BaseController
{
- @Autowired
private ISalesLedgerProductService salesLedgerProductService;
- @Autowired
private ProcurementRecordService procurementRecordService;
- @Autowired
private StockUtils stockUtils;
-
- @Autowired
private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index e6a1d46..f9251f8 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -1,21 +1,20 @@
package com.ruoyi.sales.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.service.SalesQuotationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.web.bind.annotation.*;
-
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/sales/quotation")
+@AllArgsConstructor
public class SalesQuotationController {
- @Autowired
- private SalesQuotationService salesQuotationService;
+ private final SalesQuotationService salesQuotationService;
@GetMapping("/list")
public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
diff --git a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
index 7d40587..9b407d8 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.pojo.SalespersonManagement;
import com.ruoyi.sales.service.SalespersonManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -22,10 +21,9 @@
@RestController
@RequestMapping("/salespersonManagement")
@Api(tags = "涓氬姟鍛樼鐞�")
+@AllArgsConstructor
public class SalespersonManagementController extends BaseController {
-
- @Autowired
private SalespersonManagementService salespersonManagementService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
index 7ffe281..56c0e9f 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
@@ -15,27 +15,23 @@
import com.ruoyi.sales.service.ShipmentApprovalService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/shipmentApproval")
@Api(tags = "鍙戣揣瀹℃壒绠＄悊")
+@AllArgsConstructor
public class ShipmentApprovalController extends BaseController {
- @Autowired
- private ShipmentApprovalService shipmentApprovalService;
- @Autowired
- private ShipmentApprovalMapper shipmentApprovalMapper;
-
- @Autowired
- private ISalesLedgerProductService salesLedgerProductService;
- @Autowired
- private StockUtils stockUtils;
+ private final ShipmentApprovalService shipmentApprovalService;
+ private final ShipmentApprovalMapper shipmentApprovalMapper;
+ private final ISalesLedgerProductService salesLedgerProductService;
+ private final StockUtils stockUtils;
@GetMapping("/listPage")
@ApiOperation("鍙戣揣瀹℃壒鍒楄〃")
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 21be152..ff0416b 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -1,12 +1,9 @@
package com.ruoyi.sales.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.vo.ApproveProcessVO;
-import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -15,27 +12,17 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.other.service.impl.TempFileServiceImpl;
-import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.ShippingInfoDto;
-import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
-import com.ruoyi.sales.pojo.SalesLedger;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.sales.pojo.ShipmentApproval;
import com.ruoyi.sales.pojo.ShippingInfo;
-import com.ruoyi.sales.service.ISalesLedgerProductService;
-import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.sales.service.ShippingInfoService;
-import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
@@ -47,18 +34,12 @@
@RestController
@RequestMapping("/shippingInfo")
@Api(tags = "鍙戣揣淇℃伅绠＄悊")
+@AllArgsConstructor
public class ShippingInfoController extends BaseController {
- @Autowired
private ShippingInfoService shippingInfoService;
-
- @Autowired
- private CommonFileServiceImpl commonFileService;
-
- @Autowired
private ApproveProcessServiceImpl approveProcessService;
- @Autowired
- private StockUtils stockUtils;
+ private ShippingInfoMapper shippingInfoMapper;
@GetMapping("/listPage")
@@ -120,9 +101,6 @@
return shippingInfoService.delete(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
-
- @Autowired
- private ShippingInfoMapper shippingInfoMapper;
/**
* 瀵煎嚭鍙戣揣淇℃伅绠＄悊
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
index b06e5b3..d18a51a 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -14,48 +14,37 @@
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.InvoiceLedgerService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
-import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
public class InvoiceLedgerServiceImpl extends ServiceImpl<InvoiceLedgerMapper, InvoiceLedger> implements InvoiceLedgerService {
@Value("${ruoyi.profile}")
private String uploadFile;
- @Autowired
- private InvoiceLedgerMapper invoiceLedgerMapper;
-
- @Autowired
- private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
-
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
-
- @Autowired
- private ReceiptPaymentMapper receiptPaymentMapper;
-
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private CommonFileMapper commonFileMapper;
+ private final InvoiceLedgerMapper invoiceLedgerMapper;
+ private final InvoiceLedgerFileMapper invoiceLedgerFileMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private final ReceiptPaymentMapper receiptPaymentMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
/**
* 寮�绁ㄥ彴璐︽柊澧�
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
index da21baf..fefe144 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -21,32 +21,29 @@
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.InvoiceRegistrationService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
public class InvoiceRegistrationServiceImpl extends ServiceImpl<InvoiceRegistrationMapper, InvoiceRegistration> implements InvoiceRegistrationService {
- @Autowired
- private InvoiceRegistrationMapper invoiceRegistrationMapper;
+ private final InvoiceRegistrationMapper invoiceRegistrationMapper;
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private InvoiceLedgerMapper invoiceLedgerMapper;
+ private final InvoiceLedgerMapper invoiceLedgerMapper;
/**
* 寮�绁ㄧ櫥璁拌褰曟柊澧�
diff --git a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
index 010dec0..1ff7fa1 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
@@ -11,8 +11,8 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -25,16 +25,12 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class MetricStatisticsServiceImpl {
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
-
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
-
- @Autowired
- private ShippingInfoMapper shippingInfoMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final ShippingInfoMapper shippingInfoMapper;
public AjaxResult total() {
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/PaymentShippingServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/PaymentShippingServiceImpl.java
index 067022a..f4504aa 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/PaymentShippingServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/PaymentShippingServiceImpl.java
@@ -6,8 +6,8 @@
import com.ruoyi.sales.mapper.PaymentShippingMapper;
import com.ruoyi.sales.pojo.PaymentShipping;
import com.ruoyi.sales.service.PaymentShippingService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -16,10 +16,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class PaymentShippingServiceImpl extends ServiceImpl<PaymentShippingMapper, PaymentShipping> implements PaymentShippingService {
- @Autowired
- private PaymentShippingMapper paymentShippingMapper;
+ private final PaymentShippingMapper paymentShippingMapper;
@Override
public IPage<PaymentShipping> listPage(Page page, PaymentShipping paymentShipping) {
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index 1762e02..5145f4f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -8,48 +8,36 @@
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentExeclDto;
-import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ReceiptPaymentService;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
import java.util.*;
-import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService {
- @Autowired
- private ReceiptPaymentMapper receiptPaymentMapper;
-
- @Autowired
- private SalesLedgerMapper salesLedgerMapper;
-
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private InvoiceLedgerMapper invoiceLedgerMapper;
-
- @Autowired
- private AccountIncomeService accountIncomeService;
+ private final ReceiptPaymentMapper receiptPaymentMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final AccountIncomeService accountIncomeService;
/**
* 鍥炴鐧昏鏂板
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 965f07a..56cfbb0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -6,12 +6,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.mapper.*;
-import com.ruoyi.production.pojo.*;
+import com.ruoyi.production.pojo.ProductionAccount;
+import com.ruoyi.production.pojo.ProductionOperationTask;
+import com.ruoyi.production.pojo.ProductionOrder;
+import com.ruoyi.production.pojo.ProductionProductMain;
import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
@@ -33,8 +36,7 @@
import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.pojo.TechnologyRouting;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -45,7 +47,10 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -56,36 +61,28 @@
* @date 2025-05-08
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class SalesLedgerProductServiceImpl extends ServiceImpl<SalesLedgerProductMapper, SalesLedgerProduct> implements ISalesLedgerProductService {
- private SalesLedgerProductMapper salesLedgerProductMapper;
- private ProductionAccountMapper productionAccountMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final ProductionAccountMapper productionAccountMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
+ private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionOperationTaskMapper productionOperationTaskMapper;
+ private final ProductionOrderService productionOrderService;
+ private final TechnologyRoutingMapper technologyRoutingMapper;
+ private final TechnologyBomStructureMapper technologyBomStructureMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private final ProductionProductMainMapper productionProductMainMapper;
+ private final ProductionProductOutputMapper productionProductOutputMapper;
+ private final ProductionProductInputMapper productionProductInputMapper;
+ private final QualityInspectMapper qualityInspectMapper;
+ private final ShippingInfoMapper shippingInfoMapper;
+ private final ShippingInfoServiceImpl shippingInfoService;
+ private final StockUtils stockUtils;
+ private final StockInventoryMapper stockInventoryMapper;
- private SalesLedgerMapper salesLedgerMapper;
-
- private PurchaseLedgerMapper purchaseLedgerMapper;
-
- private ProductionOrderMapper productionOrderMapper;
- private ProductionOperationTaskMapper productionOperationTaskMapper;
- private ProductionOrderService productionOrderService;
- private TechnologyRoutingMapper technologyRoutingMapper;
- private TechnologyBomStructureMapper technologyBomStructureMapper;
-
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
- private ProductionProductMainMapper productionProductMainMapper;
- private ProductionProductOutputMapper productionProductOutputMapper;
- private ProductionProductInputMapper productionProductInputMapper;
- private QualityInspectMapper qualityInspectMapper;
- private ShippingInfoMapper shippingInfoMapper;
- private ShippingInfoServiceImpl shippingInfoService;
-
- private StockUtils stockUtils;
-
-
-
- @Autowired
- private StockInventoryMapper stockInventoryMapper;
@Override
public SalesLedgerProduct selectSalesLedgerProductById(Long id) {
return salesLedgerProductMapper.selectById(id);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 0ee10b7..a14b8a0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -27,7 +27,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
-import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.mapper.ProductionProductInputMapper;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.mapper.ProductionProductOutputMapper;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
@@ -45,7 +47,6 @@
import org.apache.commons.io.FilenameUtils;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.script.DefaultRedisScript;
@@ -103,23 +104,14 @@
private final ProductionProductInputMapper productionProductInputMapper;
private final QualityInspectMapper qualityInspectMapper;
private final RedisTemplate<String, String> redisTemplate;
- @Autowired
- private SysDeptMapper sysDeptMapper;
+ private final SysDeptMapper sysDeptMapper;
@Value("${file.upload-dir}")
private String uploadDir;
- @Autowired
- private ProductModelMapper productModelMapper;
-
- @Autowired
- private ProductMapper productMapper;
- @Autowired
- private ProductionProductMainService productionProductMainService;
- @Autowired
- private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
- @Autowired
- private SysUserMapper sysUserMapper;
- @Autowired
- private CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ private final ProductMapper productMapper;
+ private final ProductionProductMainService productionProductMainService;
+ private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
+ private final SysUserMapper sysUserMapper;
+ private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
@Override
public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
index 8872e88..147682f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -4,17 +4,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.mapper.SalesQuotationMapper;
@@ -23,8 +21,7 @@
import com.ruoyi.sales.pojo.SalesQuotationProduct;
import com.ruoyi.sales.service.SalesQuotationProductService;
import com.ruoyi.sales.service.SalesQuotationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,16 +32,13 @@
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class SalesQuotationServiceImpl extends ServiceImpl<SalesQuotationMapper, SalesQuotation> implements SalesQuotationService {
- @Autowired
- private SalesQuotationMapper salesQuotationMapper;
- @Autowired
- private SalesQuotationProductMapper salesQuotationProductMapper;
- @Autowired
- private SalesQuotationProductService salesQuotationProductService;
+ private final SalesQuotationProductMapper salesQuotationProductMapper;
+ private final SalesQuotationMapper salesQuotationMapper;
+ private final SalesQuotationProductService salesQuotationProductService;
- @Autowired
- private ApproveProcessServiceImpl approveProcessService;
+ private final ApproveProcessServiceImpl approveProcessService;
@Override
public IPage<SalesQuotationDto> listPage(Page page, SalesQuotationDto salesQuotationDto) {
IPage<SalesQuotationDto> salesQuotationDtoIPage = salesQuotationMapper.listPage(page, salesQuotationDto);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalespersonManagementServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalespersonManagementServiceImpl.java
index 0afd2bb..1966ebf 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalespersonManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalespersonManagementServiceImpl.java
@@ -7,8 +7,8 @@
import com.ruoyi.sales.mapper.SalespersonManagementMapper;
import com.ruoyi.sales.pojo.SalespersonManagement;
import com.ruoyi.sales.service.SalespersonManagementService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -19,10 +19,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class SalespersonManagementServiceImpl extends ServiceImpl<SalespersonManagementMapper, SalespersonManagement> implements SalespersonManagementService {
- @Autowired
- private SalespersonManagementMapper salespersonManagementMapper;
+ private final SalespersonManagementMapper salespersonManagementMapper;
@Override
public IPage<SalespersonManagement> listPage(Page page, SalespersonManagement salespersonManagement) {
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShipmentApprovalServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShipmentApprovalServiceImpl.java
index 0df4c34..9c358e7 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShipmentApprovalServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShipmentApprovalServiceImpl.java
@@ -4,13 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
-import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.ShipmentApproval;
-import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShipmentApprovalService;
-import com.ruoyi.sales.service.ShippingInfoService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -19,10 +16,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class ShipmentApprovalServiceImpl extends ServiceImpl<ShipmentApprovalMapper, ShipmentApproval> implements ShipmentApprovalService {
- @Autowired
- private ShipmentApprovalMapper shipmentApprovalMapper;
+ private final ShipmentApprovalMapper shipmentApprovalMapper;
@Override
public IPage<ShipmentApproval> listPage(Page page, ShipmentApproval req) {
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index c9651a7..f524ffe 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -17,9 +17,9 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -32,22 +32,15 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class ShippingInfoServiceImpl extends ServiceImpl<ShippingInfoMapper, ShippingInfo> implements ShippingInfoService {
- @Autowired
- private ShippingInfoMapper shippingInfoMapper;
-
- @Autowired
- private TempFileServiceImpl tempFileService;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
- @Autowired
- private StockUtils stockUtils;
- @Autowired
- private CommonFileServiceImpl commonFileService;
-
- @Autowired
- private ApproveProcessServiceImpl approveProcessService;
+ private final ShippingInfoMapper shippingInfoMapper;
+ private final TempFileServiceImpl tempFileService;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final StockUtils stockUtils;
+ private final CommonFileServiceImpl commonFileService;
+ private final ApproveProcessServiceImpl approveProcessService;
@Override
public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
diff --git a/src/main/java/com/ruoyi/staff/controller/BankController.java b/src/main/java/com/ruoyi/staff/controller/BankController.java
index 5d3a9fc..ab65ab6 100644
--- a/src/main/java/com/ruoyi/staff/controller/BankController.java
+++ b/src/main/java/com/ruoyi/staff/controller/BankController.java
@@ -7,7 +7,7 @@
import com.ruoyi.staff.service.BankService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -24,9 +24,9 @@
@Api(tags = "閾惰绠＄悊琛�")
@RestController
@RequestMapping("/bank")
+@AllArgsConstructor
public class BankController {
- @Autowired
private BankService bankService;
@GetMapping("/list")
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 66f1710..6498ef9 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -4,13 +4,14 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/staff/holidayApplication")
+@AllArgsConstructor
public class HolidayApplicationController {
- @Autowired
+
private HolidayApplicationService holidayApplicationService;
/**
* 璇峰亣鐢宠鍒嗛〉鏌ヨ
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
index 5faebe4..f9d82dd 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -9,6 +9,7 @@
import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -26,9 +27,9 @@
@RestController
@RequestMapping("/personalAttendanceLocationConfig")
@Api(tags = "浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+@RequiredArgsConstructor
public class PersonalAttendanceLocationConfigController {
- @Autowired
private PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
@ApiOperation("鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆")
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
index 53e918e..676c672 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
@@ -14,6 +14,7 @@
import com.ruoyi.staff.utils.StyleYearUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -35,9 +36,9 @@
@RestController
@RequestMapping("/personalShift")
@Api(tags = "浜哄憳鎺掔彮")
+@AllArgsConstructor
public class PersonalShiftController {
- @Autowired
private PersonalShiftService personalShiftService;
@ApiOperation("浜哄憳鎺掔彮")
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
index 39f1ef0..5c53747 100644
--- a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
@@ -1,7 +1,6 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -10,7 +9,7 @@
import com.ruoyi.staff.service.SchemeApplicableStaffService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,10 +26,9 @@
@Api(tags = "绀句繚鏂规閫傜敤浜哄憳琛�")
@RestController
@RequestMapping("/schemeApplicableStaff")
+@AllArgsConstructor
public class SchemeApplicableStaffController extends BaseController {
-
- @Autowired
private SchemeApplicableStaffService schemeApplicableStaffService;
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index ad43b6c..96dc322 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -9,8 +9,7 @@
import com.ruoyi.staff.service.StaffSalaryMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.aspectj.weaver.loadtime.Aj;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,9 +26,9 @@
@Api(tags = "鍛樺伐宸ヨ祫涓昏〃")
@RestController
@RequestMapping("/staffSalaryMain")
+@AllArgsConstructor
public class StaffSalaryMainController {
- @Autowired
private StaffSalaryMainService staffSalaryMainService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/staff/service/impl/AnalyticsServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/AnalyticsServiceImpl.java
index ff74b0f..2705b4d 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/AnalyticsServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/AnalyticsServiceImpl.java
@@ -9,8 +9,7 @@
import com.ruoyi.staff.service.AnalyticsService;
import com.ruoyi.staff.vo.MonthlyTurnoverRateVo;
import com.ruoyi.staff.vo.TotalTurnoverRateVo;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
@@ -20,14 +19,12 @@
import java.util.List;
import java.util.Map;
-@AllArgsConstructor
@Service
+@RequiredArgsConstructor
public class AnalyticsServiceImpl extends ServiceImpl<StaffLeaveMapper, StaffLeave> implements AnalyticsService {
- @Autowired
- private StaffLeaveMapper staffLeaveMapper;
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
+ private final StaffLeaveMapper staffLeaveMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
@Override
public List<StaffLeaveDto> staffLeaveReasonAnalytics() {
diff --git a/src/main/java/com/ruoyi/staff/service/impl/HolidayApplicationServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/HolidayApplicationServiceImpl.java
index 8decb71..e02fceb 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/HolidayApplicationServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/HolidayApplicationServiceImpl.java
@@ -7,13 +7,13 @@
import com.ruoyi.staff.mapper.HolidayApplicationMapper;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
+@RequiredArgsConstructor
public class HolidayApplicationServiceImpl extends ServiceImpl<HolidayApplicationMapper, HolidayApplication> implements HolidayApplicationService {
- @Autowired
- private HolidayApplicationMapper holidayApplicationMapper;
+ private final HolidayApplicationMapper holidayApplicationMapper;
@Override
public IPage listPage(Page page, HolidayApplication holidayApplication) {
diff --git a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
index d054603..48c6745 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
@@ -5,39 +5,35 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
-import com.ruoyi.project.system.service.ISysDictDataService;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
-import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.mapper.PersonalAttendanceLocationConfigMapper;
+import com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper;
import com.ruoyi.staff.mapper.PersonalShiftMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
-import com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper;
import com.ruoyi.staff.pojo.PersonalShift;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.staff.task.PersonalAttendanceRecordsTask;
import com.ruoyi.staff.utils.LocationUtils;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@@ -50,24 +46,14 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class PersonalAttendanceRecordsServiceImpl extends ServiceImpl<PersonalAttendanceRecordsMapper, PersonalAttendanceRecords> implements PersonalAttendanceRecordsService {
- @Autowired
- private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
-
- @Autowired
- private ISysDictDataService dictDataService;
-
- @Autowired
- private SysDeptMapper sysDeptMapper;
-
- @Autowired
- private PersonalShiftMapper personalShiftMapper;
+ private final PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
+ private final PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
+ private final SysDeptMapper sysDeptMapper;
+ private final PersonalShiftMapper personalShiftMapper;
@Override
public int add(PersonalAttendanceRecordsDto personalAttendanceRecordsDto) {
diff --git a/src/main/java/com/ruoyi/staff/service/impl/PersonalShiftServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/PersonalShiftServiceImpl.java
index dc0f443..81a3545 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/PersonalShiftServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/PersonalShiftServiceImpl.java
@@ -2,26 +2,22 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.project.system.domain.SysDictData;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.staff.dto.PerformanceShiftAddDto;
import com.ruoyi.staff.dto.PerformanceShiftMapDto;
import com.ruoyi.staff.mapper.PersonalAttendanceLocationConfigMapper;
+import com.ruoyi.staff.mapper.PersonalShiftMapper;
import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
import com.ruoyi.staff.pojo.PersonalShift;
-import com.ruoyi.staff.mapper.PersonalShiftMapper;
-import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;
import com.ruoyi.staff.service.PersonalShiftService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.staff.utils.JackSonUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import cn.hutool.core.date.DateUtil;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -29,7 +25,6 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.YearMonth;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
@@ -46,10 +41,10 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class PersonalShiftServiceImpl extends ServiceImpl<PersonalShiftMapper, PersonalShift> implements PersonalShiftService {
- @Autowired
- private PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
+ private final PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
@Override
public int performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto) {
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
index 0dac4b9..bd61ca3 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -11,7 +11,6 @@
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
-import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.controller.TaxCalculator;
import com.ruoyi.staff.mapper.SchemeApplicableStaffMapper;
@@ -21,7 +20,7 @@
import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -41,28 +40,15 @@
* @since 2026-03-05 11:50:17
*/
@Service
+@RequiredArgsConstructor
public class SchemeApplicableStaffServiceImpl extends ServiceImpl<SchemeApplicableStaffMapper, SchemeApplicableStaff> implements SchemeApplicableStaffService {
- @Autowired
- private SchemeApplicableStaffMapper schemeApplicableStaffMapper;
-
- @Autowired
- private SchemeInsuranceDetailMapper schemeInsuranceDetailMapper;
-
- @Autowired
- private SysUserDeptMapper sysUserDeptMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private SysDeptMapper sysDeptMapper;
-
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private SalesLedgerProductionAccountingService salesLedgerProductionAccountingService;
+ private final SchemeApplicableStaffMapper schemeApplicableStaffMapper;
+ private final SchemeInsuranceDetailMapper schemeInsuranceDetailMapper;
+ private final SysUserMapper sysUserMapper;
+ private final SysDeptMapper sysDeptMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
+ private final SalesLedgerProductionAccountingService salesLedgerProductionAccountingService;
@Override
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
index bd7ab66..548323d 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -13,36 +13,28 @@
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
+import com.ruoyi.staff.pojo.StaffLeave;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.StaffLeaveService;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import com.ruoyi.staff.pojo.StaffLeave;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.stream.Collectors;
import static com.ruoyi.common.enums.StaffLeaveReason.StaffLeaveReasonOther;
-@AllArgsConstructor
+@RequiredArgsConstructor
@Service
public class StaffLeaveServiceImpl extends ServiceImpl<StaffLeaveMapper, StaffLeave> implements StaffLeaveService {
- @Autowired
- private StaffLeaveMapper staffLeaveMapper;
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
+ private final StaffLeaveMapper staffLeaveMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
+ private final SysUserMapper sysUserMapper;
+ private final PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
-
- //鏂板绂昏亴鍒楄〃鍒嗛〉鏌ヨ
@Override
public IPage<StaffLeaveDto> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
return staffLeaveMapper.staffLeaveListPage(page,staffLeaveDto);
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 506d107..7c11041 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.dto.WordDateDto;
@@ -26,18 +25,18 @@
import com.ruoyi.staff.service.IStaffOnJobService;
import freemarker.template.Configuration;
import freemarker.template.Template;
-import lombok.AllArgsConstructor;
-
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.ListUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.time.LocalDate;
@@ -45,53 +44,25 @@
import java.util.*;
import java.util.stream.Collectors;
-@AllArgsConstructor
+@RequiredArgsConstructor
@Service
public class StaffOnJobServiceImpl extends ServiceImpl<StaffOnJobMapper, StaffOnJob> implements IStaffOnJobService {
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private SysDeptMapper sysDeptMapper;
-
- @Autowired
- private SysRoleMapper sysRoleMapper;
-
- @Autowired
- private SysPostMapper sysPostMapper;
-
- @Autowired
- private StaffContractMapper staffContractMapper;
- @Autowired
- private StaffLeaveMapper staffLeaveMapper;
-
- @Autowired
- private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
-
- @Autowired
- private SysUserServiceImpl sysUserService;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private StaffEducationServiceImpl staffEducationService;
-
- @Autowired
- private StaffEducationMapper staffEducationMapper;
-
- @Autowired
- private StaffWorkExperienceMapper staffWorkExperienceMapper;
-
- @Autowired
- private StaffWorkExperienceServiceImpl staffWorkExperienceServiceImpl;
-
- @Autowired
- private StaffEmergencyContactMapper staffEmergencyContactMapper;
-
- @Autowired
- private StaffEmergencyContactServiceImpl staffEmergencyContactServiceImpl;
+ private final StaffOnJobMapper staffOnJobMapper;
+ private final SysDeptMapper sysDeptMapper;
+ private final SysRoleMapper sysRoleMapper;
+ private final SysPostMapper sysPostMapper;
+ private final StaffContractMapper staffContractMapper;
+ private final StaffLeaveMapper staffLeaveMapper;
+ private final PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
+ private final SysUserServiceImpl sysUserService;
+ private final SysUserMapper sysUserMapper;
+ private final StaffEducationServiceImpl staffEducationService;
+ private final StaffEducationMapper staffEducationMapper;
+ private final StaffWorkExperienceMapper staffWorkExperienceMapper;
+ private final StaffWorkExperienceServiceImpl staffWorkExperienceServiceImpl;
+ private final StaffEmergencyContactMapper staffEmergencyContactMapper;
+ private final StaffEmergencyContactServiceImpl staffEmergencyContactServiceImpl;
//鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index 26a34c1..a6d4500 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -2,31 +2,30 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
-import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
-import com.ruoyi.staff.pojo.*;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
+import com.ruoyi.staff.pojo.StaffLeave;
+import com.ruoyi.staff.pojo.StaffSalaryDetail;
+import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryDetailService;
import com.ruoyi.staff.service.StaffSalaryMainService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -37,34 +36,16 @@
* @since 2026-03-06 01:22:05
*/
@Service
+@RequiredArgsConstructor
public class StaffSalaryMainServiceImpl extends ServiceImpl<StaffSalaryMainMapper, StaffSalaryMain> implements StaffSalaryMainService {
- @Autowired
- private StaffSalaryMainMapper staffSalaryMainMapper;
-
- @Autowired
- private StaffSalaryDetailService staffSalaryDetailService;
-
- @Autowired
- private StaffSalaryDetailMapper staffSalaryDetailMapper;
-
- @Autowired
- private SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
-
- @Autowired
- private SysUserDeptMapper sysUserDeptMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private StaffLeaveMapper staffLeaveMapper;
-
- @Autowired
- private AccountExpenseMapper accountExpenseMapper;
+ private final StaffSalaryMainMapper staffSalaryMainMapper;
+ private final StaffSalaryDetailService staffSalaryDetailService;
+ private final StaffSalaryDetailMapper staffSalaryDetailMapper;
+ private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
+ private final SysUserDeptMapper sysUserDeptMapper;
+ private final StaffLeaveMapper staffLeaveMapper;
+ private final AccountExpenseMapper accountExpenseMapper;
@Override
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
diff --git a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
index a791300..404dae7 100644
--- a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
+++ b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
@@ -4,20 +4,18 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.staff.dto.PerformanceShiftAddDto;
import com.ruoyi.staff.mapper.PersonalAttendanceLocationConfigMapper;
-import com.ruoyi.staff.mapper.PersonalShiftMapper;
+import com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
-import com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper;
import com.ruoyi.staff.service.PersonalShiftService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -26,7 +24,6 @@
import java.time.temporal.WeekFields;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -37,22 +34,14 @@
*/
@Slf4j
@Component
+@RequiredArgsConstructor
public class PersonalAttendanceRecordsTask {
- @Autowired
- private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
-
- @Autowired
- private PersonalAttendanceRecordsService personalAttendanceRecordsService;
-
- @Autowired
- private PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
-
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private PersonalShiftService personalShiftService;
+ private final PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
+ private final PersonalAttendanceRecordsService personalAttendanceRecordsService;
+ private final PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
+ private final PersonalShiftService personalShiftService;
/**
* 姣忓ぉ鍑屾櫒鐢熸垚鏄ㄦ棩鐨勭己鍕よ褰�
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index dc1dede..55cc831 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -9,18 +9,19 @@
import com.ruoyi.stock.service.StockInRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@Api(tags = "鍏ュ簱")
@RequestMapping("/stockInRecord")
+@RequiredArgsConstructor
public class StockInRecordController {
- @Autowired
+
private StockInRecordService stockInRecordService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index e3e4f60..3c67ab1 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -13,11 +13,11 @@
import com.ruoyi.stock.service.StockInventoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@@ -32,9 +32,9 @@
@RestController
@RequestMapping("/stockInventory")
@Api(tags = "搴撳瓨琛�")
+@AllArgsConstructor
public class StockInventoryController {
- @Autowired
private StockInventoryService stockInventoryService;
@GetMapping("/pagestockInventory")
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index de4ce7b..71f1a81 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -9,6 +9,7 @@
import com.ruoyi.stock.service.StockOutRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -27,8 +28,8 @@
@Api(tags = "鍑哄簱")
@RestController
@RequestMapping("/stockOutRecord")
+@AllArgsConstructor
public class StockOutRecordController {
- @Autowired
private StockOutRecordService stockOutRecordService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
index 9f8e2d5..2bb09cd 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
@@ -9,10 +9,9 @@
import com.ruoyi.stock.dto.StockUninventoryDto;
import com.ruoyi.stock.service.StockUninventoryService;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -24,8 +23,8 @@
*/
@RestController
@RequestMapping("/stockUninventory")
+@AllArgsConstructor
public class StockUninventoryController {
- @Autowired
private StockUninventoryService stockUninventoryService;
@GetMapping("/pagestockUninventory")
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
index 625c82b..5df6ba7 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
@@ -1,18 +1,14 @@
package com.ruoyi.warehouse.controller;
-import com.ruoyi.basic.dto.ProductDto;
-import com.ruoyi.basic.dto.ProductTreeDto;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.warehouse.dto.DocumentClassificationDto;
-import com.ruoyi.warehouse.dto.DocumentClassificationTreeDto;
import com.ruoyi.warehouse.pojo.DocumentClassification;
import com.ruoyi.warehouse.service.DocumentClassificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -21,31 +17,35 @@
@RestController
@Api(tags = "鏂囨。鍒嗙被")
@RequestMapping("/warehouse/documentClassification")
+@AllArgsConstructor
public class DocumentClassificationController extends BaseController {
- @Autowired
private DocumentClassificationService documentClassificationService;
+
//鏍戠粨鏋�
@GetMapping("/getList")
- public AjaxResult getList() {
+ public AjaxResult getList() {
return AjaxResult.success(documentClassificationService.selectDocumentClassificationList());
}
+
@PostMapping("/add")
@ApiOperation("鏂囨。鍒嗙被-娣诲姞")
@Log(title = "鏂囨。鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody DocumentClassification documentClassification) {
return AjaxResult.success(documentClassificationService.save(documentClassification));
}
+
@PutMapping("/update")
@ApiOperation("鏂囨。鍒嗙被-鏇存柊")
@Log(title = "鏂囨。鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DocumentClassification documentClassification) {
return AjaxResult.success(documentClassificationService.updateById(documentClassification));
}
+
@DeleteMapping("/delete")
@ApiOperation("鏂囨。鍒嗙被鍒犻櫎")
@Log(title = "鏂囨。鍒嗙被鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(documentClassificationService.deleteByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index eb63831..f02118a 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -1,41 +1,32 @@
package com.ruoyi.warehouse.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-
-import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
-import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
-import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
import java.util.List;
@RestController
@Api(tags = "鏂囨。鍊熼槄绠＄悊")
@RequestMapping("/documentationBorrowManagement")
+@AllArgsConstructor
public class DocumentationBorrowManagementController extends BaseController {
- @Autowired
+
private DocumentationBorrowManagementService documentationBorrowManagementService;
- @Autowired
- private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
- @Autowired
private DocumentationReturnManagementMapper documentationReturnManagementMapper;
+
@GetMapping("/listPage")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index a525309..ce45642 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -6,18 +6,16 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
-import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.DocumentationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -25,9 +23,10 @@
@RestController
@RequestMapping("/documentation")
@Api(tags = "鏂囨。淇℃伅琛�")
+@AllArgsConstructor
public class DocumentationController extends BaseController {
- @Autowired
private DocumentationService documentationService;
+
@GetMapping("/listPage")
@ApiOperation("鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -35,6 +34,7 @@
IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
return AjaxResult.success(list);
}
+
@GetMapping("/list")
@ApiOperation("鏂囨。淇℃伅琛ㄦ煡璇�")
@Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
@@ -42,32 +42,36 @@
List<DocumentationDto> list = documentationService.listAll();
return AjaxResult.success(list);
}
+
@PostMapping("/add")
@ApiOperation("鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Documentation documentation) {
return AjaxResult.success(documentationService.save(documentation));
}
+
@PutMapping("/update")
@ApiOperation("鏂囨。淇℃伅琛�-鏇存柊")
@Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Documentation documentation) {
return AjaxResult.success(documentationService.updateById(documentation));
}
+
@DeleteMapping("/delete")
@ApiOperation("鏂囨。淇℃伅琛�-鍒犻櫎")
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(documentationService.deleteByIds(ids));
}
@PostMapping("/export")
@ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
@Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
- public void export(HttpServletResponse response,Documentation documentation ) {
- documentationService.export(response,documentation);
+ public void export(HttpServletResponse response, Documentation documentation) {
+ documentationService.export(response, documentation);
}
+
@ApiOperation("鏂囨。淇℃伅琛�-缁熻")
@GetMapping("/overview")
public AjaxResult getOverviewStatistics() {
@@ -78,11 +82,13 @@
result.put("monthlyAddedDocsCount", documentationService.getMonthlyAddedDocsCount());
return AjaxResult.success(result);
}
+
@ApiOperation("鏂囨。淇℃伅琛�-鍒嗙被缁熻")
@GetMapping("/category")
public AjaxResult getCategoryDistribution() {
return AjaxResult.success(documentationService.getCategoryDistribution());
}
+
@ApiOperation("鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
@GetMapping("/status")
public AjaxResult getStatusDistribution() {
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index 0876334..eb6822d 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -1,21 +1,15 @@
package com.ruoyi.warehouse.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.ruoyi.warehouse.pojo.Warehouse;
-import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
-import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +18,24 @@
@RestController
@Api(tags = "浠撳簱")
@RequestMapping("/warehouse")
+@AllArgsConstructor
public class WarehouseController extends BaseController {
- @Autowired
private WarehouseService warehouseService;
+
@GetMapping("/tree")
@ApiOperation("浠撳簱-鏌ヨ鏍�")
@Log(title = "浠撳簱-鏌ヨ鏍�", businessType = BusinessType.OTHER)
public AjaxResult listTree() {
return AjaxResult.success(warehouseService.findListTree());
}
+
@GetMapping("/list")
@ApiOperation("浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult list(Warehouse warehouse) {
return AjaxResult.success(warehouseService.findList(warehouse));
}
+
@PostMapping("/add")
@ApiOperation("浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
@@ -57,7 +54,7 @@
@ApiOperation("浠撳簱-鍒犻櫎")
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(warehouseService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index bed5510..fa40a50 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -1,9 +1,6 @@
package com.ruoyi.warehouse.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -13,7 +10,7 @@
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -21,8 +18,8 @@
@RestController
@Api(tags = "鍟嗗搧璐ф灦")
@RequestMapping("/warehouse/goodsShelves")
+@AllArgsConstructor
public class WarehouseGoodsShelvesController extends BaseController {
- @Autowired
private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
@GetMapping("/listById")
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
index 36073ac..b4fb8fe 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
@@ -4,22 +4,25 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto;
+import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@Api(tags = "鍟嗗搧璐ф灦琛屽垪")
@RequestMapping("/warehouse/goodsShelvesRowcol")
+@AllArgsConstructor
public class WarehouseGoodsShelvesRowcolController extends BaseController {
- @Autowired
private WarehouseGoodsShelvesRowcolService warehouseGoodsShelvesRowcolService;
+
@GetMapping("/list")
@ApiOperation("鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ", businessType = BusinessType.OTHER)
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
index 54c642e..986e277 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
@@ -3,23 +3,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.dto.ProductTreeDto;
-import com.ruoyi.basic.pojo.Product;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.warehouse.dto.DocumentClassificationDto;
import com.ruoyi.warehouse.dto.DocumentClassificationTreeDto;
import com.ruoyi.warehouse.dto.DocumentationDto;
+import com.ruoyi.warehouse.mapper.DocumentClassificationMapper;
import com.ruoyi.warehouse.mapper.DocumentationMapper;
import com.ruoyi.warehouse.pojo.DocumentClassification;
-import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.service.DocumentClassificationService;
-import com.ruoyi.warehouse.mapper.DocumentClassificationMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
/**
* @author 86151
@@ -27,12 +22,12 @@
* @createDate 2025-08-15 10:44:23
*/
@Service
-public class DocumentClassificationServiceImpl extends ServiceImpl<DocumentClassificationMapper, DocumentClassification>
- implements DocumentClassificationService{
- @Autowired
- private DocumentationMapper documentationMapper;
- @Autowired
- private DocumentClassificationMapper documentClassificationMapper;
+@RequiredArgsConstructor
+public class DocumentClassificationServiceImpl extends ServiceImpl<DocumentClassificationMapper, DocumentClassification> implements DocumentClassificationService{
+
+ private final DocumentationMapper documentationMapper;
+ private final DocumentClassificationMapper documentClassificationMapper;
+
@Override
public boolean deleteByIds(List<Long> ids) {
List<DocumentClassification> list = documentClassificationMapper.selectList(new LambdaQueryWrapper<DocumentClassification>().in(DocumentClassification::getId, ids));
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
index 62fd196..73e9ab2 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
@@ -8,39 +8,36 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto;
import com.ruoyi.warehouse.dto.ReturnExportDto;
+import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
-import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
import com.ruoyi.warehouse.service.DocumentationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.servlet.http.HttpServletResponse;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
-import java.util.stream.Collectors;
/**
-* @author 86151
-* @description 閽堝琛ㄣ�恉ocumentation_borrow_management(鏂囨。鍊熼槄-褰掕繕琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-08-14 15:55:45
-*/
+ * @author 86151
+ * @description 閽堝琛ㄣ�恉ocumentation_borrow_management(鏂囨。鍊熼槄-褰掕繕琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-08-14 15:55:45
+ */
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class DocumentationBorrowManagementServiceImpl extends ServiceImpl<DocumentationBorrowManagementMapper, DocumentationBorrowManagement>
- implements DocumentationBorrowManagementService{
- @Autowired
- private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
- @Autowired
- private DocumentationReturnManagementMapper documentationReturnManagementMapper;
- @Autowired
- private DocumentationService documentationService;
- @Override
+ implements DocumentationBorrowManagementService {
+
+ private final DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
+ private final DocumentationReturnManagementMapper documentationReturnManagementMapper;
+ private final DocumentationService documentationService;
+
public IPage<DocumentationBorrowManagement> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
IPage<DocumentationBorrowManagement> listPage = documentationBorrowManagementMapper.listPage(page, documentationBorrowManagement);
return listPage;
@@ -56,6 +53,7 @@
documentationService.updateById(documentation);
return true;
}
+
@Override
public boolean reventdbm(DocumentationReturnManagement documentationReturnManagement) {
// 鏇存柊鍊熼槄璁板綍鐘舵�佷负褰掕繕
@@ -137,7 +135,7 @@
List<DocumentationBorrowManagementDto> list = documentationBorrowManagementMapper.list(new LambdaQueryWrapper<DocumentationBorrowManagementDto>()
.eq(DocumentationBorrowManagementDto::getDocumentationId, id)
.eq(DocumentationBorrowManagementDto::getBorrowStatus, "鍊熼槄"));
- if (list.isEmpty()){
+ if (list.isEmpty()) {
throw new RuntimeException("鏂囨。鏈鍊熼槄");
}
return list;
@@ -150,15 +148,13 @@
Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
documentation.setDocStatus("姝ｅ父");
boolean b = documentationService.updateById(documentation);
- if (!b){
+ if (!b) {
throw new RuntimeException("鏇存柊鏂囨。鐘舵�佸け璐�");
}
}
documentationBorrowManagementMapper.deleteBatchIds(ids);
return true;
}
-
-
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
index 82d1c15..cf3b910 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
@@ -6,35 +6,34 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.warehouse.dto.DocumentationDto;
-import com.ruoyi.warehouse.pojo.Documentation;
-import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
-import com.ruoyi.warehouse.service.DocumentationService;
import com.ruoyi.warehouse.mapper.DocumentationMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.warehouse.pojo.Documentation;
+import com.ruoyi.warehouse.service.DocumentationService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
-* @author 86151
-* @description 閽堝琛ㄣ�恉ocumentation(鏂囨。淇℃伅琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-08-14 14:05:49
-*/
+ * @author 86151
+ * @description 閽堝琛ㄣ�恉ocumentation(鏂囨。淇℃伅琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-08-14 14:05:49
+ */
@Service
-public class DocumentationServiceImpl extends ServiceImpl<DocumentationMapper, Documentation>
- implements DocumentationService{
- @Autowired
- private DocumentationMapper documentationMapper;
+@RequiredArgsConstructor
+public class DocumentationServiceImpl extends ServiceImpl<DocumentationMapper, Documentation> implements DocumentationService {
+ private final DocumentationMapper documentationMapper;
+
@Override
public IPage<DocumentationDto> listPage(Page page, Documentation documentation) {
return documentationMapper.listPage(page, documentation);
}
@Override
- public void export(HttpServletResponse response,Documentation documentation) {
+ public void export(HttpServletResponse response, Documentation documentation) {
IPage<DocumentationDto> list = documentationMapper.listPage(null, documentation);
ExcelUtil<DocumentationDto> util = new ExcelUtil<>(DocumentationDto.class);
util.exportExcel(response, list.getRecords(), "鏂囨。淇℃伅琛�");
@@ -52,8 +51,10 @@
}
return true;
}
+
/**
* 鍒楄〃鎵�鏈夋枃妗�
+ *
* @return
*/
@Override
@@ -61,48 +62,60 @@
List<DocumentationDto> list = documentationMapper.list().stream().filter(documentationDto -> "姝ｅ父".equals(documentationDto.getDocStatus())).collect(Collectors.toList());
return list;
}
+
/**
* 鑾峰彇鏂囨。鎬绘暟
+ *
* @return
*/
@Override
public Integer getTotalDocsCount() {
return documentationMapper.countTotalDocs();
}
+
/**
* 鑾峰彇鏂囨。鍒嗙被鎬绘暟
+ *
* @return
*/
@Override
public Integer getCategoryNumCount() {
return documentationMapper.countCategoryNum();
}
+
/**
* 鑾峰彇宸插�熷嚭鏂囨。鎬绘暟
+ *
* @return
*/
@Override
public Integer getBorrowedDocsCount() {
return documentationMapper.countBorrowedDocs();
}
+
/**
* 鑾峰彇姣忔湀鏂板鏂囨。鎬绘暟
+ *
* @return
*/
@Override
public Integer getMonthlyAddedDocsCount() {
return documentationMapper.countMonthlyAddedDocs();
}
+
/**
* 鑾峰彇鏂囨。鍒嗙被鍒嗗竷
+ *
* @return
*/
@Override
public List<Map<String, Object>> getCategoryDistribution() {
return documentationMapper.countCategoryDistribution();
}
+
/**
* 鑾峰彇鏂囨。鐘舵�佸垎甯�
+ *
* @return
*/
@Override
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
index 7715520..29135c0 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
@@ -4,33 +4,30 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto;
import com.ruoyi.warehouse.mapper.DocumentationMapper;
import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
-import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Arrays;
import java.util.List;
/**
-* @author 86151
-* @description 閽堝琛ㄣ�恮arehouse_goods_shelves_rowcol(浠撳簱璐ф灦灞傦紝鍒楄〃)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-08-13 11:49:02
-*/
+ * @author 86151
+ * @description 閽堝琛ㄣ�恮arehouse_goods_shelves_rowcol(浠撳簱璐ф灦灞傦紝鍒楄〃)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-08-13 11:49:02
+ */
@Service
@Slf4j
-public class WarehouseGoodsShelvesRowcolServiceImpl extends ServiceImpl<WarehouseGoodsShelvesRowcolMapper, WarehouseGoodsShelvesRowcol>
- implements WarehouseGoodsShelvesRowcolService {
- @Autowired
- private WarehouseGoodsShelvesRowcolMapper warehouseGoodsShelvesRowcolMapper;
- @Autowired
- private DocumentationMapper documentationMapper;
+@RequiredArgsConstructor
+public class WarehouseGoodsShelvesRowcolServiceImpl extends ServiceImpl<WarehouseGoodsShelvesRowcolMapper, WarehouseGoodsShelvesRowcol> implements WarehouseGoodsShelvesRowcolService {
+ private final WarehouseGoodsShelvesRowcolMapper warehouseGoodsShelvesRowcolMapper;
+ private final DocumentationMapper documentationMapper;
@Override
public List<WarehouseGoodsShelvesRowcolDto> getList(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
@@ -43,6 +40,7 @@
}
return list;
}
+
@Override
public boolean deleteByIds(List<Long> ids) {
// 3. 妫�鏌ユ槸鍚︽湁鍟嗗搧
@@ -53,7 +51,6 @@
warehouseGoodsShelvesRowcolMapper.deleteBatchIds(ids);
return true;
}
-
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
index 3d33d5c..4fc62fc 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
@@ -1,32 +1,26 @@
package com.ruoyi.warehouse.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
import com.ruoyi.warehouse.mapper.DocumentationMapper;
import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesMapper;
import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper;
import com.ruoyi.warehouse.pojo.Documentation;
+import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import com.ruoyi.warehouse.service.DocumentationService;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
-
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,18 +32,12 @@
@Service
@Slf4j
@Transactional(rollbackFor = Exception.class)
-public class WarehouseGoodsShelvesServiceImpl extends ServiceImpl<WarehouseGoodsShelvesMapper, WarehouseGoodsShelves>
- implements WarehouseGoodsShelvesService {
- @Autowired
- private WarehouseGoodsShelvesRowcolService warehouseGoodsShelvesRowcolService;
- @Autowired
- private WarehouseGoodsShelvesRowcolMapper warehouseGoodsShelvesRowcolMapper;
- @Autowired
- private WarehouseGoodsShelvesMapper warehouseGoodsShelvesMapper;
- @Autowired
- private DocumentationService documentationService;
- @Autowired
- private DocumentationMapper documentationMapper;
+@RequiredArgsConstructor
+public class WarehouseGoodsShelvesServiceImpl extends ServiceImpl<WarehouseGoodsShelvesMapper, WarehouseGoodsShelves> implements WarehouseGoodsShelvesService {
+
+ private final WarehouseGoodsShelvesRowcolService warehouseGoodsShelvesRowcolService;
+ private final WarehouseGoodsShelvesMapper warehouseGoodsShelvesMapper;
+ private final DocumentationMapper documentationMapper;
@Override
public boolean add(WarehouseGoodsShelves warehouseGoodsShelves) {
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
index 74276a7..fb8afc6 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
@@ -2,14 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.warehouse.dto.WarehouseDto;
-import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
import com.ruoyi.warehouse.dto.WarehouseTreeDto;
import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesMapper;
import com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper;
@@ -19,12 +12,10 @@
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import com.ruoyi.warehouse.service.WarehouseService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.sql.Array;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,16 +29,12 @@
*/
@Service
@Slf4j
-public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse>
- implements WarehouseService {
- @Autowired
- private WarehouseMapper warehouseMapper;
- @Autowired
- private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
- @Autowired
- private WarehouseGoodsShelvesMapper warehouseGoodsShelvesMapper;
- @Autowired
- private WarehouseGoodsShelvesRowcolMapper warehouseGoodsShelvesRowcolMapper;
+@RequiredArgsConstructor
+public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
+ private final WarehouseMapper warehouseMapper;
+ private final WarehouseGoodsShelvesService warehouseGoodsShelvesService;
+ private final WarehouseGoodsShelvesMapper warehouseGoodsShelvesMapper;
+ private final WarehouseGoodsShelvesRowcolMapper warehouseGoodsShelvesRowcolMapper;
@Override
public boolean deleteByIds(List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index 78244e0..5ee380b 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -11,6 +11,7 @@
import com.ruoyi.waterrecord.service.WaterRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -27,9 +28,9 @@
@RestController
@Api(tags = "鐢ㄦ按绠＄悊")
@RequestMapping("/waterRecord")
+@AllArgsConstructor
public class WaterRecordController extends BaseController {
- @Autowired
private WaterRecordService waterRecordService;
@GetMapping("/listPage")
diff --git a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
index 4359ea8..09604bc 100644
--- a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
@@ -4,13 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.waterrecord.mapper.WaterRecordMapper;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -23,10 +22,10 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class WaterRecordServiceImpl extends ServiceImpl<WaterRecordMapper, WaterRecord> implements WaterRecordService {
- @Autowired
- private WaterRecordMapper waterRecordMapper;
+ private final WaterRecordMapper waterRecordMapper;
@Override
--
Gitblit v1.9.3