From c247f5bf64c98595cc7e4efc9e1ae7ff1df79c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:05:32 +0800
Subject: [PATCH] refactor(swagger): 迁移Swagger注解到OpenAPI 3.0
---
src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java | 10
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java | 49
src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java | 4
src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java | 14
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java | 20
src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingOperationParamController.java | 20
src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomStructureVo.java | 10
src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceExeclDto.java | 14
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentExeclDto.java | 22
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 16
src/main/java/com/ruoyi/quality/dto/QualityInspectStatDto.java | 11
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanSummaryDto.java | 23
src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java | 12
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 20
src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java | 16
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 20
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 16
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 36
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 2
src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java | 14
src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java | 16
src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java | 15
src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java | 27
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 26
src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java | 22
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java | 14
src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java | 9
src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java | 14
src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java | 18
src/main/java/com/ruoyi/staff/pojo/StaffContract.java | 20
src/main/java/com/ruoyi/other/pojo/TempFile.java | 4
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 23
pom.xml | 41
src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java | 20
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 18
src/main/java/com/ruoyi/projectManagement/controller/PlanController.java | 12
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 14
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 20
src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java | 22
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 16
src/main/java/com/ruoyi/staff/pojo/PersonalShift.java | 17
src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java | 25
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java | 12
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 12
src/main/java/com/ruoyi/quality/dto/QualityParameterStatDto.java | 11
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 32
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 34
src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationParamVo.java | 4
src/main/java/com/ruoyi/production/bean/dto/ProductionProductOutputDto.java | 30
src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java | 33
src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java | 7
src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java | 20
src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java | 14
src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java | 70
src/main/java/com/ruoyi/project/tool/swagger/TestController.java | 67
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java | 12
src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java | 10
src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java | 14
src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java | 22
src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java | 27
src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java | 8
src/main/java/com/ruoyi/technology/pojo/TechnologyOperationParam.java | 13
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java | 4
src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java | 23
src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java | 10
src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | 6
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java | 16
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 43
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 14
src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java | 7
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java | 14
src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java | 12
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 16
src/main/java/com/ruoyi/safe/pojo/SafeTraining.java | 43
src/main/java/com/ruoyi/sales/pojo/CommonFile.java | 4
src/main/java/com/ruoyi/technology/controller/TechnologyParamController.java | 14
src/main/java/com/ruoyi/framework/config/SwaggerConfig.java | 177 -
src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java | 4
src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java | 25
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 14
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 18
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 4
src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java | 15
src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java | 29
src/main/java/com/ruoyi/production/bean/dto/BomImportDto.java | 16
src/main/java/com/ruoyi/approve/pojo/ApproveNode.java | 9
src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 33
src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationParamDto.java | 14
src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java | 14
src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java | 6
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 18
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 33
src/main/java/com/ruoyi/account/controller/AccountIncomeController.java | 18
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 36
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java | 4
src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java | 4
src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java | 14
src/main/java/com/ruoyi/account/dto/AccountDto.java | 2
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java | 8
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 45
src/main/java/com/ruoyi/home/dto/StatisticsReceivablePayableDto.java | 13
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java | 4
src/main/java/com/ruoyi/stock/pojo/StockInventory.java | 23
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java | 6
src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java | 41
src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java | 39
src/main/java/com/ruoyi/staff/pojo/Bank.java | 9
src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java | 6
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java | 18
src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java | 14
src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java | 21
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 6
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java | 45
src/main/java/com/ruoyi/project/common/CommonController.java | 10
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 20
src/main/java/com/ruoyi/basic/controller/ProductController.java | 8
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 22
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java | 43
src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java | 10
src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java | 9
src/main/java/com/ruoyi/projectManagement/pojo/Plan.java | 23
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java | 22
src/main/java/com/ruoyi/projectManagement/pojo/Roles.java | 21
src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java | 26
src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java | 37
src/main/java/com/ruoyi/project/system/domain/SysUserDept.java | 10
src/main/java/com/ruoyi/home/dto/AnalysisCustomerContractAmountsDto.java | 11
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java | 20
src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java | 20
src/main/java/com/ruoyi/quality/dto/QualityMonthlyDetailDto.java | 13
src/main/java/com/ruoyi/quality/dto/QualityPassRateDto.java | 19
src/main/java/com/ruoyi/basic/pojo/CustomerPrivatePool.java | 25
src/main/java/com/ruoyi/other/controller/PdaVersionController.java | 6
src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomDto.java | 6
src/main/java/com/ruoyi/warehouse/pojo/Documentation.java | 39
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java | 44
src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateDto.java | 21
src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java | 12
src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java | 2
src/main/java/com/ruoyi/home/dto/ProductionTurnoverDto.java | 15
src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java | 4
src/main/java/com/ruoyi/safe/pojo/SafeHidden.java | 37
src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java | 17
src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java | 4
src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java | 12
src/main/java/com/ruoyi/production/bean/dto/ProductionProductInputDto.java | 34
src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java | 4
src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java | 26
src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java | 35
src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java | 27
src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java | 23
src/main/java/com/ruoyi/basic/pojo/Product.java | 6
src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java | 23
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 30
src/main/java/com/ruoyi/account/pojo/AccountIncome.java | 12
src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java | 18
src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java | 2
src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java | 27
src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java | 16
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java | 27
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 26
src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java | 6
.editorconfig | 13
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | 24
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java | 4
src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java | 4
src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java | 20
src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java | 14
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 14
src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java | 12
src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java | 25
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 22
AGENTS.md | 15
src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java | 24
src/main/java/com/ruoyi/production/bean/dto/ProductionOrderRoutingOperationParamSyncDto.java | 6
src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java | 2
src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java | 20
src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java | 32
src/main/java/com/ruoyi/home/controller/HomeController.java | 86
src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java | 22
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 14
doc/encoding-rules.md | 24
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java | 4
src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java | 12
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 12
src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java | 10
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java | 8
src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java | 10
src/main/java/com/ruoyi/basic/controller/EnumController.java | 4
src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java | 7
src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java | 4
src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java | 4
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 29
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 24
src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java | 15
src/main/java/com/ruoyi/production/bean/dto/SalesLedgerProductionAccountingDto.java | 12
src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java | 10
src/main/java/com/ruoyi/quality/dto/QualityTopParameterDto.java | 9
src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java | 12
src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java | 14
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 4
src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java | 35
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java | 19
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 39
src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingVo.java | 11
src/main/java/com/ruoyi/safe/pojo/SafeAccident.java | 39
src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java | 39
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java | 8
src/main/java/com/ruoyi/staff/vo/MonthlyTurnoverRateVo.java | 20
src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java | 7
src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java | 41
src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java | 35
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 11
src/main/java/com/ruoyi/account/controller/AccountFileController.java | 12
src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java | 23
src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java | 20
src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java | 20
src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java | 24
src/main/java/com/ruoyi/quality/controller/QualityReportController.java | 20
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 42
src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java | 49
src/main/java/com/ruoyi/home/dto/ProductionProgressOrderDto.java | 30
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 12
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java | 17
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | 26
src/main/java/com/ruoyi/account/controller/BorrowInfoController.java | 10
src/main/java/com/ruoyi/account/pojo/BorrowInfo.java | 31
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java | 29
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java | 29
src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java | 16
src/main/java/com/ruoyi/account/controller/AccountingController.java | 12
src/main/java/com/ruoyi/lavorissue/dto/StatisticsLaborIssue.java | 4
src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java | 9
src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java | 24
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | 25
src/main/java/com/ruoyi/projectManagement/controller/InfoController.java | 22
src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java | 27
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 16
src/main/java/com/ruoyi/staff/dto/PerformanceShiftAddDto.java | 10
src/main/java/com/ruoyi/technology/pojo/TechnologyBom.java | 25
src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java | 4
src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java | 9
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 22
src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java | 9
src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java | 8
src/main/java/com/ruoyi/dto/DateQueryDto.java | 9
src/main/java/com/ruoyi/other/pojo/PdaVersion.java | 21
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java | 6
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 14
src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java | 20
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 10
src/main/java/com/ruoyi/home/dto/HomeBusinessDto.java | 17
src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java | 27
src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java | 23
src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java | 4
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java | 47
src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java | 31
src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamDto.java | 4
src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java | 18
src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java | 17
src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java | 14
src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationParamVo.java | 14
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 8
src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java | 27
src/main/java/com/ruoyi/home/dto/QualityStatisticsItem.java | 11
src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java | 4
src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java | 3
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationParamController.java | 20
src/main/java/com/ruoyi/approve/pojo/ApproveLog.java | 4
src/main/java/com/ruoyi/production/pojo/ProductionAccount.java | 35
src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java | 22
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java | 18
src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java | 4
src/main/java/com/ruoyi/safe/controller/SafeHazardController.java | 14
src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java | 23
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 14
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java | 39
src/main/java/com/ruoyi/account/pojo/AccountExpense.java | 12
src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java | 7
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 26
src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java | 25
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 10
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java | 49
src/main/java/com/ruoyi/home/dto/QualityStatisticsDto.java | 11
src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java | 23
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 14
src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java | 9
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 4
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 26
src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | 6
src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java | 6
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java | 26
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 26
src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java | 12
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 32
src/main/java/com/ruoyi/safe/pojo/SafeCertification.java | 17
src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java | 2
src/main/java/com/ruoyi/basic/pojo/Customer.java | 14
src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java | 20
src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java | 4
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 26
src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java | 14
src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java | 2
src/main/java/com/ruoyi/safe/pojo/SafeHazard.java | 29
src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java | 12
src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java | 10
src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java | 14
src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java | 28
src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java | 17
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java | 6
src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java | 9
src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamSyncDto.java | 9
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java | 18
src/main/java/com/ruoyi/staff/pojo/StaffLeave.java | 20
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 20
src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java | 23
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 4
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java | 16
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 10
src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java | 2
src/main/java/com/ruoyi/staff/controller/BankController.java | 12
src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java | 12
src/main/java/com/ruoyi/production/controller/ProductionPlanController.java | 22
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 26
src/main/java/com/ruoyi/staff/pojo/StaffEducation.java | 29
src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java | 21
src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java | 14
src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java | 19
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java | 41
src/main/java/com/ruoyi/common/vo/FileVo.java | 16
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 45
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 48
src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java | 10
src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationDto.java | 4
src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java | 8
src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java | 25
src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java | 29
src/main/java/com/ruoyi/home/dto/WorkOrderEfficiencyDto.java | 13
src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java | 37
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java | 18
src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java | 8
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 2
src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 15
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java | 33
src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java | 17
src/main/java/com/ruoyi/account/pojo/AccountFile.java | 22
src/main/java/com/ruoyi/sales/pojo/Loss.java | 6
src/main/java/com/ruoyi/technology/pojo/TechnologyParam.java | 31
src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateWrapperDto.java | 13
src/main/java/com/ruoyi/stock/pojo/StockUninventory.java | 21
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java | 14
src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java | 4
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java | 14
src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java | 4
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java | 4
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 6
src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java | 25
src/main/java/com/ruoyi/staff/controller/StaffContractController.java | 4
src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java | 35
src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java | 23
src/main/java/com/ruoyi/oA/controller/OaProjectController.java | 20
src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java | 9
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java | 27
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 10
src/main/java/com/ruoyi/dto/MapDto.java | 11
src/main/java/com/ruoyi/production/pojo/ProductionOperationMainParam.java | 47
src/main/java/com/ruoyi/staff/vo/TotalTurnoverRateVo.java | 8
src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java | 17
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java | 14
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 8
src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java | 4
src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java | 25
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java | 12
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 56
src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java | 29
src/main/java/com/ruoyi/production/pojo/ProductionPlan.java | 39
src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java | 14
src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java | 27
src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java | 10
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 30
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 18
src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingDto.java | 11
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 22
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 27
src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java | 4
src/main/java/com/ruoyi/home/dto/ProductionTaskStatisticsDto.java | 28
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java | 35
src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java | 12
src/main/java/com/ruoyi/collaborativeApproval/dto/MeetSummaryDto.java | 1
src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java | 22
src/main/java/com/ruoyi/production/bean/dto/UserAccountDto.java | 6
src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java | 3
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java | 23
src/main/java/com/ruoyi/production/bean/dto/UserProductionAccountingDto.java | 6
src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java | 23
src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java | 4
396 files changed, 3,590 insertions(+), 3,750 deletions(-)
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..4261f1a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{java,xml,yml,yaml,md,properties,sql,js,ts,vue,html,css,scss,json}]
+charset = utf-8
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..edf1666
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,15 @@
+# 缂栫爜涓庝腑鏂囧鐞嗚鍒�
+
+鏈」鐩悗缁墍鏈変唬鐮佷慨鏀瑰繀椤婚伒瀹堜互涓嬭鍒欙細
+
+1. 鏂板缓鏂囦欢缁熶竴浣跨敤 `UTF-8` 缂栫爜锛屼笖涓嶅甫 `BOM`銆�
+2. 淇敼宸叉湁鏂囦欢鍓嶏紝鍏堟鏌ュ師鏂囦欢缂栫爜锛涘鏋滀笉鏄� `UTF-8`锛岄粯璁ゅ厛淇濇寔鍘熺紪鐮侊紝閬垮厤鎶婁腑鏂囧啓鍧忋��
+3. 涓枃鍐呭蹇呴』鐩存帴淇濈暀锛屼笉鍏佽杞箟鎴� `\\uXXXX`銆�
+4. 杈撳嚭銆佹彁浜ゃ�佺敓鎴愪唬鐮佹椂涓嶅緱鍑虹幇涔辩爜锛涘鏋滅粓绔樉绀哄紓甯革紝蹇呴』鍏堟牎楠屾枃浠剁湡瀹炲瓧鑺傜紪鐮侊紝鍐嶇户缁慨鏀广��
+5. 娑夊強鎵归噺鏇挎崲鏃讹紝鍙兘鍦ㄧ‘璁ょ紪鐮佸畨鍏ㄥ悗鎵ц锛涗笉鑳戒负浜嗘壒閲忚縼绉绘妸涓枃鍐呭鏀瑰潖銆�
+
+鎺ㄨ崘鍋氭硶锛�
+
+- 浼樺厛渚濊禆椤圭洰鏍圭洰褰� `.editorconfig`銆�
+- 淇敼鍓嶅厛纭鏂囦欢缂栫爜锛屽啀閫夋嫨瀵瑰簲鐨勫啓鍥炴柟寮忋��
+- 瀵瑰寘鍚ぇ閲忎腑鏂囨敞閲娿�佸瓧绗︿覆鐨勬枃浠讹紝浼樺厛灏忚寖鍥翠慨鏀瑰苟鍙婃椂缂栬瘧楠岃瘉銆�
diff --git a/doc/encoding-rules.md b/doc/encoding-rules.md
new file mode 100644
index 0000000..6aded9e
--- /dev/null
+++ b/doc/encoding-rules.md
@@ -0,0 +1,24 @@
+# 缂栫爜涓庨槻涔辩爜瑙勮寖
+
+鏈」鐩粺涓�閲囩敤浠ヤ笅瑙勫垯锛岄伩鍏嶄腑鏂囦贡鐮佸拰缂栫爜鍐茬獊锛�
+
+## 蹇呴』閬靛畧
+
+1. 鏂板缓鏂囦欢缁熶竴浣跨敤 `UTF-8` 缂栫爜锛屼笖涓嶅甫 `BOM`
+2. 淇敼宸叉湁鏂囦欢鍓嶅厛妫�鏌ュ師鏂囦欢缂栫爜
+3. 濡傛灉鏃ф枃浠朵笉鏄� `UTF-8`锛岄粯璁ゅ厛淇濇寔鍘熺紪鐮侊紝閬垮厤鎶婁腑鏂囧啓鍧�
+4. 涓枃鍐呭鐩存帴淇濈暀锛屼笉瑕佽浆涔夋垚 `\uXXXX`
+5. 杈撳嚭銆佺敓鎴愩�佹壒閲忔浛鎹㈡椂涓嶅緱鍑虹幇涔辩爜
+6. 濡傛灉缁堢鏄剧ず寮傚父锛屽厛鏍￠獙鏂囦欢鐪熷疄瀛楄妭鍜岀紪鐮侊紝鍐嶇户缁慨鏀�
+
+## 鎺ㄨ崘鍋氭硶
+
+- 浼樺厛閬靛惊椤圭洰鏍圭洰褰� `.editorconfig`
+- 瀵瑰寘鍚ぇ閲忎腑鏂囨敞閲娿�佸瓧绗︿覆鐨勬枃浠讹紝浼樺厛灏忚寖鍥翠慨鏀�
+- 鎵归噺鏇挎崲鍓嶅厛鍋氱紪鐮佹娊鏍锋鏌ワ紝鍐嶆墽琛屾壒閲忎慨鏀�
+- 姣忔娑夊強涓枃鍐呭鐨勬壒閲忔敼鍔ㄥ悗锛屽強鏃剁紪璇戞垨妫�鏌� diff
+
+## 椤圭洰鍐呭搴斾綅缃�
+
+- 缂栬緫鍣ㄩ粯璁よ鍒欙細`/.editorconfig`
+- AI 涓庡崗浣滅害鏉燂細`/AGENTS.md`
diff --git a/pom.xml b/pom.xml
index adafdea..6008877 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,9 @@
<bitwalker.version>1.21</bitwalker.version>
<jwt.version>0.13.0</jwt.version>
<kaptcha.version>2.3.3</kaptcha.version>
- <swagger.version>3.0.0</swagger.version>
+ <knife4j.version>4.5.0</knife4j.version>
+ <springdoc.version>2.8.17</springdoc.version>
+ <swagger.annotations.version>1.6.15</swagger.annotations.version>
<poi.version>5.2.3</poi.version>
<oshi.version>6.6.5</oshi.version>
<velocity.version>2.3</velocity.version>
@@ -55,11 +57,17 @@
<dependencies>
<!-- ruoyi-springboot2 / swagger knife4j 閰嶇疆 -->
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>3.0.3</version>
- </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+ <version>${knife4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>${springdoc.version}</version>
+ </dependency>
<!-- SpringBoot 鏍稿績鍖� -->
<dependency>
@@ -238,24 +246,13 @@
</dependency>
<!-- Swagger3渚濊禆 -->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>${swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger.annotations.version}</version>
+ </dependency>
<!-- 闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎3.0.0涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.6.2鐗堟湰 -->
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- <version>1.6.2</version>
- </dependency>
<!-- 鑾峰彇绯荤粺淇℃伅 -->
<dependency>
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index 795b46d..4796d33 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -9,8 +9,8 @@
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.annotation.Resource;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@
*/
@RestController
@RequestMapping("/account/accountExpense")
-@Api(tags = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
+@Tag(name = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
public class AccountExpenseController {
@Resource
@@ -40,7 +40,7 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody AccountExpense accountExpense) {
accountExpense.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -54,7 +54,7 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -69,7 +69,7 @@
* @return
*/
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody AccountExpense accountExpense) {
return AjaxResult.success(accountExpenseService.updateById(accountExpense));
}
@@ -81,7 +81,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
}
@@ -92,7 +92,7 @@
* @return
*/
@GetMapping("/{id}")
- @ApiOperation("璇︽儏")
+ @Operation(summary = "璇︽儏")
public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
return AjaxResult.success(accountExpenseService.getById(id));
}
@@ -103,7 +103,7 @@
* @param accountExpense
*/
@PostMapping("/export")
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
accountExpenseService.accountExpenseExport(response, accountExpense);
}
@@ -114,7 +114,7 @@
* @return
*/
@GetMapping("/report/forms")
- @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
+ @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
public AjaxResult report(DateQueryDto dateQueryDto) {
return AjaxResult.success(accountExpenseService.report(dateQueryDto));
}
@@ -124,7 +124,7 @@
* @return
*/
@GetMapping("/report/analysis")
- @ApiOperation("璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
+ @Operation(summary = "璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
public AjaxResult analysis() {
return AjaxResult.success(accountExpenseService.analysis());
}
@@ -135,7 +135,7 @@
* @return
*/
@GetMapping("/report/income")
- @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
+ @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
public AjaxResult reportIncome(ReportDateDto reportDateDto) {
return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
}
@@ -146,7 +146,7 @@
* @return
*/
@GetMapping("/report/expense")
- @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
+ @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
public AjaxResult reportExpense(ReportDateDto reportDateDto) {
return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountFileController.java b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
index 0ffa1e7..42c20d1 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountFileController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
@@ -6,8 +6,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.service.IQualityInspectFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,7 @@
*/
@RestController
@RequestMapping("/account/accountFile")
-@Api(tags = "璐㈠姟闄勪欢")
+@Tag(name = "璐㈠姟闄勪欢")
public class AccountFileController {
@@ -33,7 +33,7 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody AccountFile accountFile) {
return AjaxResult.success(accountFileService.save(accountFile));
}
@@ -44,7 +44,7 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delAccountFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -60,7 +60,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult accountFileListPage(Page page, AccountFile accountFile) {
return AjaxResult.success(accountFileService.accountFileListPage(page, accountFile));
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
index 8db2730..690e75a 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
@@ -14,8 +14,8 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +29,7 @@
*/
@RestController
@RequestMapping("/account/accountIncome")
-@Api(tags = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
+@Tag(name = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
public class AccountIncomeController {
@Resource
@@ -42,7 +42,7 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody AccountIncome accountIncome) {
accountIncome.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -56,7 +56,7 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -71,7 +71,7 @@
* @return
*/
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody AccountIncome accountIncome) {
return AjaxResult.success(accountIncomeService.updateById(accountIncome));
}
@@ -83,7 +83,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
}
@@ -94,7 +94,7 @@
* @return
*/
@GetMapping("/{id}")
- @ApiOperation("璇︽儏")
+ @Operation(summary = "璇︽儏")
public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
return AjaxResult.success(accountIncomeService.getById(id));
}
@@ -105,7 +105,7 @@
* @param accountIncome
*/
@PostMapping("/export")
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
public void accountIncomeExport(HttpServletResponse response,AccountIncome accountIncome) {
accountIncomeService.accountIncomeExport(response, accountIncome);
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountingController.java b/src/main/java/com/ruoyi/account/controller/AccountingController.java
index 0f0552d..4688942 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountingController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountingController.java
@@ -4,8 +4,8 @@
import com.ruoyi.account.service.impl.AccountingServiceImpl;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +16,7 @@
* @author :yys
* @date : 2026/1/17 10:40
*/
-@Api(tags = "浼氳鏍哥畻")
+@Tag(name = "浼氳鏍哥畻")
@RestController
@RequestMapping("/accounting")
@AllArgsConstructor
@@ -25,19 +25,19 @@
private AccountingServiceImpl accountingService;
- @ApiOperation("鎬昏")
+ @Operation(summary = "鎬昏")
@GetMapping("/total")
public AjaxResult total(@RequestParam Integer year) {
return accountingService.total(year);
}
- @ApiOperation("璁惧绫诲瀷鍒嗗竷")
+ @Operation(summary = "璁惧绫诲瀷鍒嗗竷")
@GetMapping("/deviceTypeDistribution")
public AjaxResult deviceTypeDistribution(@RequestParam Integer year) {
return accountingService.deviceTypeDistribution(year);
}
- @ApiOperation("璁惧鍒嗛〉鏌ヨ璁＄畻鎶樻棫")
+ @Operation(summary = "璁惧鍒嗛〉鏌ヨ璁＄畻鎶樻棫")
@GetMapping("/calculateDepreciation")
public AjaxResult calculateDepreciation(Page page, @RequestParam Integer year) {
return accountingService.calculateDepreciation(page,year);
diff --git a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
index 7dd5473..7620c19 100644
--- a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
+++ b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +25,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-15 02:57:29
*/
-@Api(tags = "鍊熸淇℃伅琛�")
+@Tag(name = "鍊熸淇℃伅琛�")
@RestController
@RequestMapping("/borrowInfo")
@AllArgsConstructor
@@ -34,7 +34,7 @@
private BorrowInfoService borrowInfoService;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
return borrowInfoService.listPage(page,borrowInfo);
}
@@ -74,7 +74,7 @@
* 瀵煎嚭
*/
@PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭鍊熸淇℃伅")
+ @Operation(summary = "瀵煎嚭鍊熸淇℃伅")
public void export(HttpServletResponse response, BorrowInfo borrowInfo) {
List<BorrowInfo> list = borrowInfoService.list();
ExcelUtil<BorrowInfo> util = new ExcelUtil<>(BorrowInfo.class);
diff --git a/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java b/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
index 6586580..786e7c3 100644
--- a/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
+++ b/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
@@ -6,7 +6,7 @@
import com.ruoyi.account.service.SalesReceiptReturnService;
import com.ruoyi.account.service.impl.SalesReceiptReturnServiceImpl;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,7 +31,7 @@
@GetMapping("/page")
- @ApiOperation("鏀舵閫�璐ц〃-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鏀舵閫�璐ц〃-鍒嗛〉鏌ヨ")
public R<IPage<SalesReceiptReturnDto>> page(SalesReceiptReturnDto salesReceiptReturnDto) {
return R.ok(salesReceiptReturnService.pageSalesReceiptReturnDto(salesReceiptReturnDto));
}
diff --git a/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java b/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
index 942e721..7f8bf25 100644
--- a/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
+++ b/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
@@ -5,7 +5,7 @@
import com.ruoyi.account.pojo.SalesRefundAmountOrder;
import com.ruoyi.account.service.SalesRefundAmountOrderService;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,7 +34,7 @@
return R.ok(salesRefundAmountOrderService.pageSalesRefundAmountOrderDto(page, salesRefundAmountOrder));
}
- @ApiOperation("澶勭悊")
+ @Operation(summary = "澶勭悊")
@PostMapping("/dispose")
public R dispose( SalesRefundAmountOrderDto salesRefundAmountOrderId) {
return R.ok(salesRefundAmountOrderService.dispose(salesRefundAmountOrderId));
diff --git a/src/main/java/com/ruoyi/account/dto/AccountDto.java b/src/main/java/com/ruoyi/account/dto/AccountDto.java
index 6da7b3a..93ed680 100644
--- a/src/main/java/com/ruoyi/account/dto/AccountDto.java
+++ b/src/main/java/com/ruoyi/account/dto/AccountDto.java
@@ -6,7 +6,7 @@
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java b/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
index 698e0e1..a948957 100644
--- a/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
+++ b/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
@@ -1,23 +1,23 @@
package com.ruoyi.account.dto;
import com.ruoyi.account.pojo.SalesRefundAmountOrder;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class SalesRefundAmountOrderDto extends SalesRefundAmountOrder {
- @ApiModelProperty("閫�璐у崟鍙�")
+ @Schema(description = "閫�璐у崟鍙�")
private String returnManagementNo;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("閿�鍞崟鍙�")
+ @Schema(description = "閿�鍞崟鍙�")
private String salesContractNo;
- @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ @Schema(description = "鍒涘缓浜哄悕绉�")
private String createUserName;
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
index 82b35f7..dcb6b4b 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -105,23 +105,23 @@
private Date inputTime;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountFile.java b/src/main/java/com/ruoyi/account/pojo/AccountFile.java
index c765a45..b22ab91 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountFile.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountFile.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
@@ -24,42 +24,42 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty(value = "鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private int fileSize;
- @ApiModelProperty(value = "璐㈠姟ID")
+ @Schema(description = "璐㈠姟ID")
@NotBlank(message = "璐㈠姟id涓嶈兘涓虹┖!")
private Long accountId;
/**
* 绫诲瀷(鏀跺叆/鏀嚭)
*/
- @ApiModelProperty(value = "绫诲瀷(鏀跺叆/鏀嚭)")
+ @Schema(description = "绫诲瀷(鏀跺叆/鏀嚭)")
private String accountType;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
index a1b3e35..49856ec 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -105,23 +105,23 @@
private Date inputTime;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java b/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
index 280c3f3..8e4d809 100644
--- a/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
+++ b/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
@@ -13,8 +13,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -30,64 +29,64 @@
@Getter
@Setter
@TableName("borrow_info")
-@ApiModel(value = "BorrowInfo瀵硅薄", description = "鍊熸淇℃伅琛�")
+@Schema(name = "BorrowInfo瀵硅薄", description = "鍊熸淇℃伅琛�")
public class BorrowInfo extends DateQueryDto implements Serializable{
private static final long serialVersionUID = 1L;
- @ApiModelProperty("鍊熸璁板綍涓婚敭ID")
+ @Schema(description = "鍊熸璁板綍涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍊熸浜哄鍚�")
+ @Schema(description = "鍊熸浜哄鍚�")
@Excel(name = "鍊熸浜哄鍚�")
private String borrowerName;
- @ApiModelProperty("鍊熸閲戦锛堝厓锛�")
+ @Schema(description = "鍊熸閲戦锛堝厓锛�")
@Excel(name = "鍊熸閲戦锛堝厓锛�")
private BigDecimal borrowAmount;
- @ApiModelProperty("鍊熸鍒╃巼锛堝锛�5.85 浠ｈ〃5.85%锛�")
+ @Schema(description = "鍊熸鍒╃巼锛堝锛�5.85 浠ｈ〃5.85%锛�")
@Excel(name = "鍊熸鍒╃巼")
private BigDecimal interestRate;
- @ApiModelProperty("鍊熸鏃ユ湡")
+ @Schema(description = "鍊熸鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍊熸鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate borrowDate;
- @ApiModelProperty("瀹為檯杩樻鏃ユ湡锛堣繕娆惧悗濉厖锛�")
+ @Schema(description = "瀹為檯杩樻鏃ユ湡锛堣繕娆惧悗濉厖锛�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "瀹為檯杩樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate repayDate;
- @ApiModelProperty("鍊熸鐘舵�侊細1=寰呰繕娆撅紝2=宸茶繕娆�")
+ @Schema(description = "鍊熸鐘舵�侊細1=寰呰繕娆撅紝2=宸茶繕娆�")
@Excel(name = "鍊熸鐘舵��", readConverterExp = "1=寰呰繕娆�,2=宸茶繕娆�")
private Integer status;
- @ApiModelProperty("澶囨敞锛堝�熸璇存槑锛�")
+ @Schema(description = "澶囨敞锛堝�熸璇存槑锛�")
@Excel(name = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鑰匢D")
+ @Schema(description = "鍒涘缓鑰匢D")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鑰匢D")
+ @Schema(description = "淇敼鑰匢D")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java b/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
index 46eb5cf..939d7e9 100644
--- a/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
+++ b/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
@@ -8,8 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,48 +23,48 @@
@Getter
@Setter
@TableName("sales_receipt_return")
-@ApiModel(value = "SalesReceiptReturn瀵硅薄", description = "鏀舵閫�璐ц〃")
+@Schema(name = "SalesReceiptReturn瀵硅薄", description = "鏀舵閫�璐ц〃")
public class SalesReceiptReturn implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭 ID")
+ @Schema(description = "涓婚敭 ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閫�娆惧崟鍙�")
+ @Schema(description = "閫�娆惧崟鍙�")
private String refundId;
- @ApiModelProperty("浠樻璐﹀彿")
+ @Schema(description = "浠樻璐﹀彿")
private String paymentAccount;
- @ApiModelProperty("浠樻璐﹀彿鍚嶇О")
+ @Schema(description = "浠樻璐﹀彿鍚嶇О")
private String paymentAccountName;
- @ApiModelProperty("浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private Byte paymentMethod;
- @ApiModelProperty("瀹為檯浠樻閲戦")
+ @Schema(description = "瀹為檯浠樻閲戦")
private BigDecimal actualAmount;
- @ApiModelProperty("鎵嬬画璐�")
+ @Schema(description = "鎵嬬画璐�")
private BigDecimal fee;
- @ApiModelProperty("浜ゆ槗鍙�")
+ @Schema(description = "浜ゆ槗鍙�")
private String transactionNo;
- @ApiModelProperty("浼樻儬閲戦")
+ @Schema(description = "浼樻儬閲戦")
private BigDecimal discountAmount;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓鑰�")
+ @Schema(description = "鍒涘缓鑰�")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
diff --git a/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java b/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
index 2541da2..a83f54f 100644
--- a/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
+++ b/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("sales_refund_amount_order")
-@ApiModel(value = "SalesRefundAmountOrder瀵硅薄", description = "閿�鍞鐞�--閫�娆惧崟")
+@Schema(name = "SalesRefundAmountOrder瀵硅薄", description = "閿�鍞鐞�--閫�娆惧崟")
public class SalesRefundAmountOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,39 +34,39 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閫�璐у崟鍙穒d")
+ @Schema(description = "閫�璐у崟鍙穒d")
private Long returnManagementId;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private Integer status;
- @ApiModelProperty("搴旈��娆鹃噾棰�")
+ @Schema(description = "搴旈��娆鹃噾棰�")
private BigDecimal refundAmount;
- @ApiModelProperty("宸查��娆鹃噾棰�")
+ @Schema(description = "宸查��娆鹃噾棰�")
private BigDecimal refundedAmount;
- @ApiModelProperty("鏈��娆鹃噾棰�")
+ @Schema(description = "鏈��娆鹃噾棰�")
private BigDecimal notRefundedAmount;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜篿d")
+ @Schema(description = "鍒涘缓浜篿d")
private Long createUserId;
- @ApiModelProperty("鏇存柊浜篿d")
+ @Schema(description = "鏇存柊浜篿d")
private Long updateUserId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
index 129403c..ccc13b9 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
@@ -8,8 +8,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
* @since 2026/03/02 14:40
*/
@RestController
-@Api(tags = "涓存湡鍞悗绠＄悊")
+@Tag(name = "涓存湡鍞悗绠＄悊")
@RequestMapping("/afterSalesNearExpiryService")
@AllArgsConstructor
public class AfterSalesNearExpiryController extends BaseController {
@@ -34,7 +34,7 @@
* 鏂板涓存湡鍞悗
*/
@PostMapping("/add")
- @ApiOperation("鏂板涓存湡鍞悗")
+ @Operation(summary = "鏂板涓存湡鍞悗")
@Log(title = "鏂板涓存湡鍞悗", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody AfterSalesNearExpiry entity) {
afterSalesNearExpiryService.add(entity);
@@ -45,7 +45,7 @@
* 鏇存柊涓存湡鍞悗
*/
@PostMapping("/update")
- @ApiOperation("鏇存柊涓存湡鍞悗")
+ @Operation(summary = "鏇存柊涓存湡鍞悗")
@Log(title = "鏇存柊涓存湡鍞悗", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody AfterSalesNearExpiry entity) {
afterSalesNearExpiryService.update(entity);
@@ -56,7 +56,7 @@
* 鍒犻櫎涓存湡鍞悗
*/
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎涓存湡鍞悗")
+ @Operation(summary = "鍒犻櫎涓存湡鍞悗")
@Log(title = "鍒犻櫎涓存湡鍞悗", businessType = BusinessType.DELETE)
public AjaxResult delete(Long[] ids) {
afterSalesNearExpiryService.delete(ids);
@@ -67,7 +67,7 @@
* 鍒嗛〉鏌ヨ涓存湡鍞悗
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ涓存湡鍞悗")
+ @Operation(summary = "鍒嗛〉鏌ヨ涓存湡鍞悗")
@Log(title = "鍒嗛〉鏌ヨ涓存湡鍞悗", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page<AfterSalesNearExpiry> page, AfterSalesNearExpiry entity) {
IPage<AfterSalesNearExpiry> listPage = afterSalesNearExpiryService.listPage(page, entity);
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index abb8797..5f4c3a8 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -15,8 +15,8 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -32,7 +32,7 @@
* @date : 2025/7/30 9:27
*/
@RestController
-@Api(tags = "鍞悗鏈嶅姟")
+@Tag(name = "鍞悗鏈嶅姟")
@RequestMapping("/afterSalesService")
@AllArgsConstructor
public class AfterSalesServiceController extends BaseController {
@@ -43,7 +43,7 @@
private ISalesLedgerService salesLedgerService;
@GetMapping("/listPage")
- @ApiOperation("鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
@Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
@@ -52,7 +52,7 @@
@Log(title = "鍞悗鏈嶅姟-鍙嶉鐧昏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("鍞悗鏈嶅姟-鍙嶉鐧昏")
+ @Operation(summary = "鍞悗鏈嶅姟-鍙嶉鐧昏")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
@@ -70,7 +70,7 @@
@Log(title = "鍞悗鏈嶅姟-鍞悗澶勭悊", businessType = BusinessType.EXPORT)
@PostMapping("/exportTwo")
- @ApiOperation("鍞悗鏈嶅姟-鍞悗澶勭悊")
+ @Operation(summary = "鍞悗鏈嶅姟-鍞悗澶勭悊")
public void exportTwo(HttpServletResponse response) {
Page page = new Page(-1,-1);
AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
@@ -83,14 +83,14 @@
}
@PostMapping("/add")
- @ApiOperation("鍞悗鏈嶅姟-鏂板")
+ @Operation(summary = "鍞悗鏈嶅姟-鏂板")
@Log(title = "鍞悗鏈嶅姟-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
- @ApiOperation("鍞悗鏈嶅姟-淇敼")
+ @Operation(summary = "鍞悗鏈嶅姟-淇敼")
@Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
@@ -104,7 +104,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍞悗鏈嶅姟-鍒犻櫎")
+ @Operation(summary = "鍞悗鏈嶅姟-鍒犻櫎")
@Log(title = "鍞悗鏈嶅姟-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
@@ -115,7 +115,7 @@
}
@PostMapping("/dispose")
- @ApiOperation("鍞悗鏈嶅姟-澶勭悊")
+ @Operation(summary = "鍞悗鏈嶅姟-澶勭悊")
@Log(title = "鍞悗鏈嶅姟-澶勭悊", businessType = BusinessType.UPDATE)
public AjaxResult dispose(@RequestBody AfterSalesService afterSalesService) {
AfterSalesService byId = afterSalesServiceService.getById(afterSalesService.getId());
@@ -131,7 +131,7 @@
@GetMapping("listSalesLedger")
- @ApiOperation("鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
+ @Operation(summary = "鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
public AjaxResult listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
IPage<SalesLedgerDto> list = salesLedgerService.listSalesLedger(salesLedgerDto,page);
return AjaxResult.success(list);
@@ -139,12 +139,12 @@
@GetMapping("getById")
- @ApiOperation("鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
+ @Operation(summary = "鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
public AjaxResult getById(Long id) {
return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
}
- @ApiOperation("鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
+ @Operation(summary = "鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
@GetMapping("count")
public AjaxResult count() {
return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
index e538fa1..9032852 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@
* @since 2026/03/02 11:20
*/
@RestController
-@Api(tags = "鍞悗鏈嶅姟闄勪欢琛�")
+@Tag(name = "鍞悗鏈嶅姟闄勪欢琛�")
@RequestMapping("/afterSalesService/file")
@AllArgsConstructor
public class AfterSalesServiceFileController extends BaseController {
@@ -32,7 +32,7 @@
private AfterSalesServiceFileService afterSalesServiceFileService;
@PostMapping("/upload")
- @ApiOperation("鍞悗鏈嶅姟-鏂囦欢涓婁紶")
+ @Operation(summary = "鍞悗鏈嶅姟-鏂囦欢涓婁紶")
@Log(title = "鍞悗鏈嶅姟-鏂囦欢涓婁紶", businessType = BusinessType.INSERT)
public AjaxResult fileUpload(@RequestParam("file") MultipartFile file,
@RequestParam("id") Long afterSalesServiceId) {
@@ -41,14 +41,14 @@
}
@GetMapping("/listPage")
- @ApiOperation("鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃")
+ @Operation(summary = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃")
@Log(title = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃", businessType = BusinessType.OTHER)
public AjaxResult fileList(Page<AfterSalesServiceFile> page, Long afterSalesServiceId) {
return AjaxResult.success(afterSalesServiceFileService.fileList(page, afterSalesServiceId));
}
@DeleteMapping("/del/{fileId}")
- @ApiOperation("鍞悗澶勭悊-鍒犻櫎闄勪欢")
+ @Operation(summary = "鍞悗澶勭悊-鍒犻櫎闄勪欢")
@Log(title = "鍞悗澶勭悊-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
public AjaxResult delFile(@PathVariable Long fileId) {
afterSalesServiceFileService.delFile(fileId);
diff --git a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceExeclDto.java b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceExeclDto.java
index c8526c7..472ffcd 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceExeclDto.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceExeclDto.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +18,7 @@
/**
* 鐘舵�� 1-寰呭鐞� 2-宸插鐞�
*/
- @ApiModelProperty("鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
+ @Schema(description = "鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
private Integer status;
@@ -28,7 +28,7 @@
/**
* 鐧昏浜哄悕绉�
*/
- @ApiModelProperty("鐧昏浜哄悕绉�")
+ @Schema(description = "鐧昏浜哄悕绉�")
@Excel(name = "鐧昏浜哄悕绉�")
private String checkNickName;
@@ -36,14 +36,14 @@
/**
* 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
/**
* 闂鎻忚堪
*/
- @ApiModelProperty("闂鎻忚堪")
+ @Schema(description = "闂鎻忚堪")
@Excel(name = "闂鎻忚堪")
private String proDesc;
@@ -51,14 +51,14 @@
/**
* 鍙嶉鏃ユ湡
*/
- @ApiModelProperty("鍙嶉鏃ユ湡")
+ @Schema(description = "鍙嶉鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date feedbackDate;
- @ApiModelProperty("鍏宠仈閮ㄩ棬")
+ @Schema(description = "鍏宠仈閮ㄩ棬")
@Excel(name = "鍏宠仈閮ㄩ棬")
private String deptName;
diff --git a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
index dd35550..e8f4e5a 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
@@ -4,7 +4,7 @@
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -12,7 +12,7 @@
@Data
public class AfterSalesServiceNewDto extends AfterSalesService {
- @ApiModelProperty("浜у搧鍨嬪彿ID鏁扮粍")
+ @Schema(description = "浜у搧鍨嬪彿ID鏁扮粍")
private List<Long> productModelIdList;
private SalesLedgerDto salesLedgerDto;
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
index 0937b5b..d33a1d0 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
@@ -6,8 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,70 +24,70 @@
*/
@Data
@TableName("after_sales_near_expiry")
-@ApiModel("涓存湡鍞悗绠＄悊琛�")
+@Schema(name = "涓存湡鍞悗绠＄悊琛�")
public class AfterSalesNearExpiry {
@TableId(type = IdType.AUTO)
- @ApiModelProperty("涓婚敭")
+ @Schema(description = "涓婚敭")
private Long id;
- @ApiModelProperty("涓存湡浜у搧鍚嶇О")
+ @Schema(description = "涓存湡浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("浜у搧鎵瑰彿")
+ @Schema(description = "浜у搧鎵瑰彿")
private String batchNumber;
- @ApiModelProperty("涓存湡鏃ユ湡")
+ @Schema(description = "涓存湡鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate expireDate;
- @ApiModelProperty("搴撳瓨鏁伴噺")
+ @Schema(description = "搴撳瓨鏁伴噺")
private Integer stockQuantity;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
private String contactPhone;
- @ApiModelProperty("闂鎻忚堪")
+ @Schema(description = "闂鎻忚堪")
private String disRes;
- @ApiModelProperty("澶勭悊缁撴灉")
+ @Schema(description = "澶勭悊缁撴灉")
private String disposeResult;
- @ApiModelProperty("澶勭悊鐘舵�� (1-寰呭鐞� 2-宸插鐞�)")
+ @Schema(description = "澶勭悊鐘舵�� (1-寰呭鐞� 2-宸插鐞�)")
private Integer status;
- @ApiModelProperty("澶勭悊浜篒D")
+ @Schema(description = "澶勭悊浜篒D")
private Long disposeUserId;
- @ApiModelProperty("澶勭悊浜哄悕绉�")
+ @Schema(description = "澶勭悊浜哄悕绉�")
private String disposeNickName;
- @ApiModelProperty("澶勭悊鏃ユ湡")
+ @Schema(description = "澶勭悊鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate disDate;
- @ApiModelProperty("鍒涘缓鑰�")
+ @Schema(description = "鍒涘缓鑰�")
private Long createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("淇敼鑰�")
+ @Schema(description = "淇敼鑰�")
private Long updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
private Long tenantId;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
index 2c767fb..43fa217 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,7 +18,7 @@
*/
@Data
@TableName("after_sales_service")
-@ApiModel
+@Schema
public class AfterSalesService {
private static final long serialVersionUID = 1L;
@@ -30,10 +29,10 @@
/**
* 鐘舵�� 1-寰呭鐞� 2-宸插鐞�
*/
- @ApiModelProperty("鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
+ @Schema(description = "鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
private Integer status;
- @ApiModelProperty("鍞悗鍗曞彿")
+ @Schema(description = "鍞悗鍗曞彿")
private String afterSalesServiceNo;
@@ -44,54 +43,54 @@
/**
* 鐧昏浜�
*/
- @ApiModelProperty("鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
private Long checkUserId;
/**
* 鐧昏浜哄悕绉�
*/
- @ApiModelProperty("鐧昏浜哄悕绉�")
+ @Schema(description = "鐧昏浜哄悕绉�")
@Excel(name = "鐧昏浜哄悕绉�")
private String checkNickName;
/**
* 澶勭悊浜�
*/
- @ApiModelProperty("澶勭悊浜�")
+ @Schema(description = "澶勭悊浜�")
private Long disposeUserId;
/**
* 澶勭悊浜哄悕绉�
*/
- @ApiModelProperty("澶勭悊浜哄悕绉�")
+ @Schema(description = "澶勭悊浜哄悕绉�")
@Excel(name = "澶勭悊浜哄悕绉�")
private String disposeNickName;
/**
* 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
/**
* 闂鎻忚堪
*/
- @ApiModelProperty("闂鎻忚堪")
+ @Schema(description = "闂鎻忚堪")
@Excel(name = "闂鎻忚堪")
private String proDesc;
/**
* 澶勭悊缁撴灉
*/
- @ApiModelProperty("澶勭悊缁撴灉")
+ @Schema(description = "澶勭悊缁撴灉")
@Excel(name = "澶勭悊缁撴灉")
private String disRes;
/**
* 鍙嶉鏃ユ湡
*/
- @ApiModelProperty("鍙嶉鏃ユ湡")
+ @Schema(description = "鍙嶉鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@@ -100,7 +99,7 @@
/**
* 澶勭悊鏃ユ湡
*/
- @ApiModelProperty("澶勭悊鏃ユ湡")
+ @Schema(description = "澶勭悊鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@@ -138,24 +137,24 @@
private Long tenantId;
@TableField(exist = false)
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Schema(description = "閮ㄩ棬鍚嶇О")
private String deptName;
- @ApiModelProperty("鍞悗绫诲瀷")
+ @Schema(description = "鍞悗绫诲瀷")
private String serviceType;
- @ApiModelProperty("绱ф�ョ▼搴�")
+ @Schema(description = "绱ф�ョ▼搴�")
private String urgency;
- @ApiModelProperty("閿�鍞彴璐D")
+ @Schema(description = "閿�鍞彴璐D")
private Long salesLedgerId;
- @ApiModelProperty("鍒嗛厤浜篒D")
+ @Schema(description = "鍒嗛厤浜篒D")
private Long distributionUserId;
- @ApiModelProperty("浜у搧鍨嬪彿IDs")
+ @Schema(description = "浜у搧鍨嬪彿IDs")
private String productModelIds;
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java
index d2c243b..3dbc478 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java
@@ -5,8 +5,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -22,44 +21,44 @@
*/
@Data
@TableName("after_sales_service_file")
-@ApiModel("鍞悗鏈嶅姟闄勪欢琛�")
+@Schema(name = "鍞悗鏈嶅姟闄勪欢琛�")
public class AfterSalesServiceFile {
@TableId(type = IdType.AUTO)
- @ApiModelProperty("涓婚敭")
+ @Schema(description = "涓婚敭")
private Long id;
- @ApiModelProperty("鍞悗鏈嶅姟璁板綍ID")
+ @Schema(description = "鍞悗鏈嶅姟璁板綍ID")
private Long serviceId;
- @ApiModelProperty("鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String fileName;
- @ApiModelProperty("鏂囦欢璁块棶鍦板潃")
+ @Schema(description = "鏂囦欢璁块棶鍦板潃")
private String fileUrl;
- @ApiModelProperty("鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private Long fileSize;
- @ApiModelProperty("鏂囦欢鍚庣紑")
+ @Schema(description = "鏂囦欢鍚庣紑")
private String fileSuffix;
- @ApiModelProperty("鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�")
+ @Schema(description = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�")
private String delFlag;
- @ApiModelProperty("涓婁紶鑰�")
+ @Schema(description = "涓婁紶鑰�")
private Long createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty("淇敼鑰�")
+ @Schema(description = "淇敼鑰�")
private Long updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
private Long tenantId;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index e33cee8..d0af196 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -3,15 +3,15 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
-@Api(tags = "瀹℃壒璁板綍")
+@Tag(name = "瀹℃壒璁板綍")
@RestController
@RequestMapping("/approveNode")
@AllArgsConstructor
@@ -25,7 +25,7 @@
* @return
*/
@GetMapping("/details/{id}")
- @ApiOperation(value = "娴佺▼鐘舵�佽鎯�")
+ @Operation(summary = "娴佺▼鐘舵�佽鎯�")
public AjaxResult details(@PathVariable String id) {
return AjaxResult.success(approveNodeService.details(id));
}
@@ -37,7 +37,7 @@
*/
@PostMapping("/updateApproveNode")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "瀹℃壒鑺傜偣")
+ @Operation(summary = "瀹℃壒鑺傜偣")
public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
return AjaxResult.success();
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 0699a79..ab9ca9a 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -11,8 +11,8 @@
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 io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -24,7 +24,7 @@
@RestController
@RequestMapping("/approveProcess")
@AllArgsConstructor
-@Api(tags = "瀹℃壒")
+@Tag(name = "瀹℃壒")
public class ApproveProcessController {
private IApproveProcessService approveProcessService;
@@ -49,7 +49,7 @@
*/
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "娣诲姞瀹℃壒")
+ @Operation(summary = "娣诲姞瀹℃壒")
public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
if (approveProcessVO == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
@@ -65,7 +65,7 @@
* @return
*/
@GetMapping("/get")
- @ApiOperation(value = "瀹℃壒璇︽儏")
+ @Operation(summary = "瀹℃壒璇︽儏")
public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
@@ -80,7 +80,7 @@
*/
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "鏇存柊瀹℃壒")
+ @Operation(summary = "鏇存柊瀹℃壒")
public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
if (approveGetAndUpdateVo == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
@@ -93,7 +93,7 @@
* @return
*/
@GetMapping("/list")
- @ApiOperation(value = "鑾峰彇瀹℃壒鍒楄〃")
+ @Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
public AjaxResult list(Page page, ApproveProcess approveProcess) {
return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
}
@@ -104,7 +104,7 @@
* @return
*/
@DeleteMapping("/deleteIds")
- @ApiOperation(value = "鍒犻櫎瀹℃壒")
+ @Operation(summary = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
public AjaxResult deleteIds(@RequestBody List<Long> ids) {
if (ids == null || ids.size() == 0) {
@@ -114,7 +114,7 @@
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
- @ApiOperation(value = "鍏嚭绠＄悊瀵煎嚭")
+ @Operation(summary = "鍏嚭绠＄悊瀵煎嚭")
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -124,7 +124,7 @@
util.exportExcel(response, accountExpenses, "鍏嚭绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "璇峰亣绠＄悊瀵煎嚭")
+ @Operation(summary = "璇峰亣绠＄悊瀵煎嚭")
@PostMapping("/exportTwo")
public void exportTwo(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -134,7 +134,7 @@
util.exportExcel(response, accountExpenses, "璇峰亣绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "鍑哄樊绠＄悊瀵煎嚭")
+ @Operation(summary = "鍑哄樊绠＄悊瀵煎嚭")
@PostMapping("/exportThree")
public void exportThree(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -144,7 +144,7 @@
util.exportExcel(response, accountExpenses, "鍑哄樊绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "鎶ラ攢绠＄悊瀵煎嚭")
+ @Operation(summary = "鎶ラ攢绠＄悊瀵煎嚭")
@PostMapping("/exportFour")
public void exportFour(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -154,7 +154,7 @@
util.exportExcel(response, accountExpenses, "鎶ラ攢绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "閲囪喘鐢宠瀵煎嚭")
+ @Operation(summary = "閲囪喘鐢宠瀵煎嚭")
@PostMapping("/exportFive")
public void exportFive(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -164,7 +164,7 @@
util.exportExcel(response, accountExpenses, "閲囪喘鐢宠瀵煎嚭");
}
- @ApiOperation(value = "鍗忓悓瀹℃壒瀵煎嚭")
+ @Operation(summary = "鍗忓悓瀹℃壒瀵煎嚭")
@PostMapping("/exportZero")
public void exportZero(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -174,7 +174,7 @@
util.exportExcel(response, accountExpenses, "鍗忓悓瀹℃壒瀵煎嚭");
}
- @ApiOperation(value = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
+ @Operation(summary = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
@PostMapping("/exportEight")
public void exportEight(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index 9dd669b..3ebb782 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -6,8 +6,8 @@
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 io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,7 @@
@RestController
@RequestMapping("/knowledgeBase")
@AllArgsConstructor
-@Api(tags = "鐭ヨ瘑搴撶鐞�")
+@Tag(name = "鐭ヨ瘑搴撶鐞�")
public class KnowledgeBaseController {
private KnowledgeBaseService knowledgeBaseService;
@@ -57,7 +57,7 @@
return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
}
- @ApiOperation(value = "鐭ヨ瘑搴撶鐞嗗鍑�")
+ @Operation(summary = "鐭ヨ瘑搴撶鐞嗗鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<KnowledgeBase> accountExpenses = knowledgeBaseService.list();
diff --git a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
index 82b4192..06a0f6d 100644
--- a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
+++ b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
@@ -6,8 +6,8 @@
import com.ruoyi.approve.service.RpaProcessAutomationService;
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 io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,7 @@
@RestController
@RequestMapping("/rpaProcessAutomation")
@AllArgsConstructor
-@Api(tags = "RPA娴佺▼鑷姩鍖�")
+@Tag(name = "RPA娴佺▼鑷姩鍖�")
public class RpaProcessAutomationController {
private RpaProcessAutomationService rpaProcessAutomationService;
/**銆�
@@ -56,7 +56,7 @@
return AjaxResult.success(rpaProcessAutomationService.removeByIds(ids));
}
- @ApiOperation(value = "RPA娴佺▼鑷姩鍖栧鍑�")
+ @Operation(summary = "RPA娴佺▼鑷姩鍖栧鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<RpaProcessAutomation> accountExpenses = rpaProcessAutomationService.list();
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java b/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java
index 6ea4aa4..379dee8 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java
@@ -1,6 +1,6 @@
package com.ruoyi.approve.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -57,7 +57,7 @@
*/
private String approveRemark;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index 09e3f02..2c5da10 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -10,8 +10,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -20,16 +19,16 @@
*/
@Data
@TableName("approve_node")
-@ApiModel
+@Schema
public class ApproveNode{
- @ApiModelProperty("闄勪欢id")
+ @Schema(description = "闄勪欢id")
@TableField(exist = false)
private List<String> tempFileIds;
@TableField(exist = false)
- @ApiModelProperty("闄勪欢鍒楄〃")
+ @Schema(description = "闄勪欢鍒楄〃")
private String url;
/**
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 11d5268..020b71e 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -10,8 +10,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,7 +20,7 @@
*/
@Data
@TableName("approve_process")
-@ApiModel
+@Schema
public class ApproveProcess{
/**
*
@@ -35,7 +34,7 @@
/**
* 娴佺▼缂栧彿
*/
- @ApiModelProperty(value = "娴佺▼缂栧彿")
+ @Schema(description = "娴佺▼缂栧彿")
@Excel(name = "娴佺▼缂栧彿")
private String approveId;
@@ -47,7 +46,7 @@
/**
* 鐢宠浜哄悕绉�
*/
- @ApiModelProperty(value = "鐢宠浜哄悕绉�")
+ @Schema(description = "鐢宠浜哄悕绉�")
@Excel(name = "鐢宠浜�")
private String approveUserName;
@@ -59,7 +58,7 @@
/**
* 鐢宠閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Schema(description = "鐢宠閮ㄩ棬鍚嶇О")
@Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
@@ -76,7 +75,7 @@
/**
* 鐢宠鍘熷洜
*/
- @ApiModelProperty(value = "鐢宠鍘熷洜")
+ @Schema(description = "鐢宠鍘熷洜")
@Excel(name = "瀹℃壒浜嬬敱")
private String approveReason;
@@ -88,7 +87,7 @@
/**
* 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
*/
- @ApiModelProperty(value = "褰撳墠瀹℃壒浜�")
+ @Schema(description = "褰撳墠瀹℃壒浜�")
@Excel(name = "褰撳墠瀹℃壒浜�")
private String approveUserCurrentName;
@@ -96,7 +95,7 @@
* 鐢宠鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鐢宠鏃ユ湡")
+ @Schema(description = "鐢宠鏃ユ湡")
@Excel(name = "鐢宠鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveTime;
@@ -104,14 +103,14 @@
* 瀹℃壒瀹屾垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "瀹℃壒瀹屾垚鏃堕棿")
+ @Schema(description = "瀹℃壒瀹屾垚鏃堕棿")
@Excel(name = "缁撴潫鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveOverTime;
/**
* 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
*/
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
+ @Schema(description = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=寰呭鏍�,1=瀹℃牳涓�,2=瀹℃牳瀹屾垚,3=瀹℃牳鏈�氳繃,4=宸查噸鏂版彁浜�")
private Integer approveStatus;
@@ -137,18 +136,18 @@
/**
* 瀹℃壒澶囨敞
*/
- @ApiModelProperty(value = "瀹℃壒澶囨敞")
+ @Schema(description = "瀹℃壒澶囨敞")
private String approveRemark;
@Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@@ -171,7 +170,7 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java b/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java
index c668079..06dec8e 100644
--- a/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java
+++ b/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java
@@ -1,6 +1,6 @@
package com.ruoyi.approve.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -84,7 +84,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java b/src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java
index 7913ffd..213743a 100644
--- a/src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java
+++ b/src/main/java/com/ruoyi/approve/utils/StartAndEndDateDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.approve.utils;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -10,26 +9,26 @@
* @date : 2023/9/19 10:58
*/
@Data
-@ApiModel
+@Schema
public class StartAndEndDateDto {
- @ApiModelProperty("寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@TableField(exist = false)
private String startDate;
- @ApiModelProperty("缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@TableField(exist = false)
private String endDate;
- @ApiModelProperty("寮�濮嬫湀浠�")
+ @Schema(description = "寮�濮嬫湀浠�")
@TableField(exist = false)
private Integer startMonth;
- @ApiModelProperty("缁撴潫鏈堜唤")
+ @Schema(description = "缁撴潫鏈堜唤")
@TableField(exist = false)
private Integer endMonth;
- @ApiModelProperty("骞翠唤")
+ @Schema(description = "骞翠唤")
@TableField(exist = false)
private Integer year;
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
index 0f8f941..979e270 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -35,13 +35,13 @@
@Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate;
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index 08a5339..aca65bc 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -49,13 +49,13 @@
@Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate;
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
index 0236b55..70b109e 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
@@ -12,7 +12,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -41,7 +41,7 @@
* 鏌ヨ瀹㈡埛璺熻繘鍒楄〃
*/
@GetMapping("/list")
- @ApiOperation("鏌ヨ瀹㈡埛璺熻繘鍒楄〃")
+ @Operation(summary = "鏌ヨ瀹㈡埛璺熻繘鍒楄〃")
public IPage<CustomerFollowUp> list(Page<CustomerFollowUp> page, CustomerFollowUp customerFollowUp) {
LambdaQueryWrapper<CustomerFollowUp> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(customerFollowUp.getCustomerPrivatePoolId() != null, CustomerFollowUp::getCustomerPrivatePoolId, customerFollowUp.getCustomerPrivatePoolId())
@@ -53,7 +53,7 @@
/**
* 鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
+ @Operation(summary = "鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id) {
return AjaxResult.success(customerFollowUpService.getFollowUpWithFiles(id));
@@ -63,7 +63,7 @@
* 鏂板瀹㈡埛璺熻繘
*/
@PostMapping("/add")
- @ApiOperation("鏂板瀹㈡埛璺熻繘")
+ @Operation(summary = "鏂板瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody CustomerFollowUp customerFollowUp) {
return toAjax(customerFollowUpService.insertCustomerFollowUp(customerFollowUp));
@@ -73,7 +73,7 @@
* 淇敼瀹㈡埛璺熻繘
*/
@PutMapping("/edit")
- @ApiOperation("淇敼瀹㈡埛璺熻繘")
+ @Operation(summary = "淇敼瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult edit(@RequestBody CustomerFollowUp customerFollowUp) {
return toAjax(customerFollowUpService.updateCustomerFollowUp(customerFollowUp));
@@ -82,7 +82,7 @@
/**
* 涓婁紶璺熻繘闄勪欢
*/
- @ApiOperation("涓婁紶璺熻繘闄勪欢")
+ @Operation(summary = "涓婁紶璺熻繘闄勪欢")
@PostMapping("/upload/{followUpId}")
@Log(title = "瀹㈡埛璺熻繘-涓婁紶闄勪欢", businessType = BusinessType.INSERT)
public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
@@ -92,7 +92,7 @@
/**
* 涓婁紶璺熻繘闄勪欢锛堝鐢紝鏃營D锛�
*/
- @ApiOperation("涓婁紶闄勪欢(澶嶇敤)")
+ @Operation(summary = "涓婁紶闄勪欢(澶嶇敤)")
@PostMapping("/upload")
@Log(title = "涓婁紶闄勪欢(澶嶇敤)", businessType = BusinessType.INSERT)
public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
@@ -103,7 +103,7 @@
/**
* 鎵归噺鏌ヨ闄勪欢鍒楄〃
*/
- @ApiOperation("鎵归噺鏌ヨ闄勪欢鍒楄〃")
+ @Operation(summary = "鎵归噺鏌ヨ闄勪欢鍒楄〃")
@PostMapping("/file/list")
public AjaxResult getFileList(@RequestBody List<Long> ids) {
return AjaxResult.success(customerFollowUpService.getFollowUpFilesByIds(ids));
@@ -112,7 +112,7 @@
/**
* 鍒犻櫎璺熻繘闄勪欢
*/
- @ApiOperation("鍒犻櫎璺熻繘闄勪欢")
+ @Operation(summary = "鍒犻櫎璺熻繘闄勪欢")
@DeleteMapping("/file/{fileId}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
public AjaxResult deleteFile(@PathVariable Integer fileId) {
@@ -123,7 +123,7 @@
/**
* 鍒犻櫎瀹㈡埛璺熻繘
*/
- @ApiOperation("鍒犻櫎瀹㈡埛璺熻繘")
+ @Operation(summary = "鍒犻櫎瀹㈡埛璺熻繘")
@DeleteMapping("/{id}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult remove(@PathVariable Integer id) {
@@ -133,7 +133,7 @@
/**
* 鏂板/鏇存柊鍥炶鎻愰啋
*/
- @ApiOperation("鏂板/鏇存柊鍥炶鎻愰啋")
+ @Operation(summary = "鏂板/鏇存柊鍥炶鎻愰啋")
@PostMapping("/return-visit")
@Log(title = "鍥炶鎻愰啋-鏂板/鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult saveReturnVisit(@RequestBody CustomerReturnVisit customerReturnVisit) {
@@ -143,7 +143,7 @@
/**
* 鑾峰彇鍥炶鎻愰啋璇︽儏
*/
- @ApiOperation("鑾峰彇鍥炶鎻愰啋璇︽儏")
+ @Operation(summary = "鑾峰彇鍥炶鎻愰啋璇︽儏")
@GetMapping("/return-visit/{customerId}")
public AjaxResult getReturnVisit(@PathVariable Integer customerId) {
return AjaxResult.success(customerReturnVisitService.getByCustomerId(customerId));
@@ -152,7 +152,7 @@
/**
* 鏍囪鍥炶鎻愰啋宸茶
*/
- @ApiOperation("鏍囪鍥炶鎻愰啋宸茶")
+ @Operation(summary = "鏍囪鍥炶鎻愰啋宸茶")
@PutMapping("/return-visit/read/{id}")
@Log(title = "鍥炶鎻愰啋-鏍囪宸茶", businessType = BusinessType.UPDATE)
public AjaxResult markAsRead(@PathVariable Long id) {
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java b/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
index 7ed08d0..83597cf 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerPrivatePoolController.java
@@ -6,8 +6,8 @@
import com.ruoyi.basic.service.CustomerPrivatePoolService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +20,7 @@
* @since 2026-04-16 04:43:00
*/
@RestController
-@Api(tags = "瀹㈡埛锛堢娴凤級")
+@Tag(name = "瀹㈡埛锛堢娴凤級")
@RequestMapping("/customerPrivatePool")
@AllArgsConstructor
public class CustomerPrivatePoolController {
@@ -29,7 +29,7 @@
@GetMapping("/listPage")
- @ApiOperation("瀹㈡埛锛堢娴凤級鍒楄〃")
+ @Operation(summary = "瀹㈡埛锛堢娴凤級鍒楄〃")
public R listPage(CustomerPrivatePoolDto customerPrivatePoolDto, Page<CustomerPrivatePoolDto> page){
//鏌ヨ褰撳墠鐢ㄦ埛鐨勫鎴蜂俊鎭�
customerPrivatePoolDto.setBoundId(SecurityUtils.getUserId());
@@ -38,7 +38,7 @@
}
@PostMapping("/add")
- @ApiOperation("鍒嗛厤瀹㈡埛锛堢娴凤級")
+ @Operation(summary = "鍒嗛厤瀹㈡埛锛堢娴凤級")
public R add(@RequestBody CustomerPrivatePoolDto customerPrivatePool){
boolean result = customerPrivatePoolService.add(customerPrivatePool);
return R.ok(result);
@@ -51,28 +51,28 @@
@DeleteMapping("/delete/{id}")
- @ApiOperation("鍒犻櫎瀹㈡埛锛堢娴凤級")
+ @Operation(summary = "鍒犻櫎瀹㈡埛锛堢娴凤級")
public R delete(@PathVariable Long id){
boolean result = customerPrivatePoolService.deleteCustomerPrivatePool(id);
return R.ok(result);
}
@PostMapping("/together")
- @ApiOperation("鍏变韩")
+ @Operation(summary = "鍏变韩")
public R together( @RequestBody CustomerPrivatePoolDto customerPrivatePool){
boolean result = customerPrivatePoolService.together(customerPrivatePool);
return R.ok(result);
}
@GetMapping("/info/{id}")
- @ApiOperation("璇︽儏")
+ @Operation(summary = "璇︽儏")
public R getInfo(@PathVariable Long id){
CustomerPrivatePoolDto customerPrivatePool = customerPrivatePoolService.getInfo(id);
return R.ok(customerPrivatePool);
}
@GetMapping("/getbyId/{id}")
- @ApiOperation("璇︽儏")
+ @Operation(summary = "璇︽儏")
public R getbyId(@PathVariable Long id){
CustomerPrivatePoolDto customerPrivatePool = customerPrivatePoolService.getbyId(id);
return R.ok(customerPrivatePool);
diff --git a/src/main/java/com/ruoyi/basic/controller/EnumController.java b/src/main/java/com/ruoyi/basic/controller/EnumController.java
index 235eb26..f4d172b 100644
--- a/src/main/java/com/ruoyi/basic/controller/EnumController.java
+++ b/src/main/java/com/ruoyi/basic/controller/EnumController.java
@@ -5,7 +5,7 @@
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +15,7 @@
import java.util.Map;
@RestController
-@Api(tags = "鏋氫妇鎺ュ彛")
+@Tag(name = "鏋氫妇鎺ュ彛")
@RequestMapping("/basic/enum")
public class EnumController {
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 7fde4fe..77334e0 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -18,8 +18,8 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -116,7 +116,7 @@
return productModelService.modelListPage(page, productDto);
}
- @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈変骇鍝佸瀷鍙�")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈変骇鍝佸瀷鍙�")
@GetMapping("/pageModel")
public IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel) {
return productService.listPageProductModel(page, productModel);
@@ -135,7 +135,7 @@
* 浜у搧瀵煎叆妯℃澘
*/
@GetMapping("/export")
- @ApiOperation("浜у搧瀵煎叆妯℃澘")
+ @Operation(summary = "浜у搧瀵煎叆妯℃澘")
@Log(title = "浜у搧瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
public void importProduct(HttpServletResponse response) {
ExcelUtil<ProductModelExportDto> excelUtil = new ExcelUtil<>(ProductModelExportDto.class);
diff --git a/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java b/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java
index c06f542..e452a24 100644
--- a/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java
@@ -8,7 +8,7 @@
import com.ruoyi.basic.pojo.CustomerFollowUp;
import com.ruoyi.basic.pojo.CustomerPrivatePool;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,7 +25,7 @@
private String customerName;
/** 瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴� */
- @ApiModelProperty(value = "瀹㈡埛瑕乮d")
+ @Schema(description = "瀹㈡埛瑕乮d")
private Long customerId;
/**
@@ -95,26 +95,26 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "閾惰鍩烘湰鎴�")
+ @Schema(description = "閾惰鍩烘湰鎴�")
@Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
- @ApiModelProperty(value = "閾惰璐﹀彿")
+ @Schema(description = "閾惰璐﹀彿")
@Excel(name = "閾惰璐﹀彿")
private String bankAccount;
- @ApiModelProperty(value = "寮�鎴疯鍙�")
+ @Schema(description = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璺熻繘璁板綍")
+ @Schema(description = "璺熻繘璁板綍")
private List<CustomerFollowUpDto> followUpList;
- @ApiModelProperty(value = "缁戝畾浜篿ds")
+ @Schema(description = "缁戝畾浜篿ds")
private List< Long> boundIds;
@Excel(isExport = false)
diff --git a/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java b/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
index 30044ad..8e2de0b 100644
--- a/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
@@ -1,12 +1,12 @@
package com.ruoyi.basic.dto;
import com.ruoyi.basic.pojo.SupplierManage;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class SupplierManageDto extends SupplierManage {
- @ApiModelProperty(value = "缁存姢浜哄憳鍚嶇О")
+ @Schema(description = "缁存姢浜哄憳鍚嶇О")
private String maintainUserName;
}
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index 29e1af0..87b197f 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index e63c512..1b47163 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import org.checkerframework.checker.units.qual.A;
@@ -106,27 +106,27 @@
@TableField(exist = false)
private String addressPhone;
- @ApiModelProperty(value = "閾惰鍩烘湰鎴�")
+ @Schema(description = "閾惰鍩烘湰鎴�")
@Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
- @ApiModelProperty(value = "閾惰璐﹀彿")
+ @Schema(description = "閾惰璐﹀彿")
@Excel(name = "閾惰璐﹀彿")
private String bankAccount;
- @ApiModelProperty(value = "寮�鎴疯鍙�")
+ @Schema(description = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty(value = "浣跨敤鐢ㄦ埛")
+ @Schema(description = "浣跨敤鐢ㄦ埛")
private Long usageUser;
- @ApiModelProperty(value = "浣跨敤鐘舵��")
+ @Schema(description = "浣跨敤鐘舵��")
private Long usageStatus;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
index 5f174a5..9f34f61 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
@@ -1,6 +1,6 @@
package com.ruoyi.basic.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -87,7 +87,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
index 85f49a5..87f2cc6 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
@@ -11,8 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("customer_private")
-@ApiModel(value = "CustomerPrivate瀵硅薄", description = "瀹㈡埛妗ｆ")
+@Schema(name = "CustomerPrivate瀵硅薄", description = "瀹㈡埛妗ｆ")
public class CustomerPrivate implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,73 +34,73 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("绾崇◣浜鸿瘑鍒彿")
+ @Schema(description = "绾崇◣浜鸿瘑鍒彿")
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNumber;
- @ApiModelProperty("鍏徃鍦板潃")
+ @Schema(description = "鍏徃鍦板潃")
@Excel(name = "鍏徃鍦板潃")
private String companyAddress;
- @ApiModelProperty("鍏徃鐢佃瘽")
+ @Schema(description = "鍏徃鐢佃瘽")
@Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
- @ApiModelProperty("鑱旂郴浜�")
+ @Schema(description = "鑱旂郴浜�")
@Excel(name = "鑱旂郴浜�")
private String contactPerson;
- @ApiModelProperty("鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING)
private String contactPhone;
- @ApiModelProperty("缁存姢浜�")
+ @Schema(description = "缁存姢浜�")
@Excel(name = "缁存姢浜�")
private String maintainer;
- @ApiModelProperty("缁存姢鏃堕棿")
+ @Schema(description = "缁存姢鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date maintenanceTime;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("閾惰鍩烘湰鎴�")
+ @Schema(description = "閾惰鍩烘湰鎴�")
@Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
- @ApiModelProperty("閾惰璐﹀彿")
+ @Schema(description = "閾惰璐﹀彿")
@Excel(name = "閾惰璐﹀彿")
private String bankAccount;
- @ApiModelProperty("寮�鎴疯鍙�")
+ @Schema(description = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
- @ApiModelProperty("瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴�")
+ @Schema(description = "瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴�")
@Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("璺熻繘绋嬪害")
+ @Schema(description = "璺熻繘绋嬪害")
@TableField(exist = false)
private String followUpLevel;
- @ApiModelProperty("璺熻繘鏃堕棿")
+ @Schema(description = "璺熻繘鏃堕棿")
@TableField(exist = false)
private Date followUpTime;
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivatePool.java b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivatePool.java
index edf88d7..86dfc5a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivatePool.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivatePool.java
@@ -9,8 +9,7 @@
import java.time.LocalDateTime;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -25,44 +24,44 @@
*/
@Data
@TableName("customer_private_pool")
-@ApiModel(value = "CustomerPrivatePool瀵硅薄", description = "")
+@Schema(name = "CustomerPrivatePool瀵硅薄", description = "")
public class CustomerPrivatePool implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭id")
+ @Schema(description = "涓婚敭id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("瀹㈡埛id")
+ @Schema(description = "瀹㈡埛id")
private Long customerId;
- @ApiModelProperty("缁戝畾浜篿d")
+ @Schema(description = "缁戝畾浜篿d")
private Long boundId;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("绫诲瀷鍖哄垎鍏捣瀹㈡埛鍜岀娴峰鎴� 榛樿鏄娴峰鎴�0 鍏捣1")
+ @Schema(description = "绫诲瀷鍖哄垎鍏捣瀹㈡埛鍜岀娴峰鎴� 榛樿鏄娴峰鎴�0 鍏捣1")
private Long type;
- @ApiModelProperty("閮ㄩ棬id")
+ @Schema(description = "閮ㄩ棬id")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("鍒犻櫎鏍囪瘑 榛樿0 1宸茬粡鍒犻櫎")
+ @Schema(description = "鍒犻櫎鏍囪瘑 榛樿0 1宸茬粡鍒犻櫎")
private Integer DeleteFlag;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/Product.java b/src/main/java/com/ruoyi/basic/pojo/Product.java
index 788be1d..17f0fea 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Product.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Product.java
@@ -1,7 +1,7 @@
package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@@ -26,10 +26,10 @@
*/
private String productName;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index e449263..1e21583 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -48,7 +48,7 @@
@Excel(name = "鐢熶骇鐐掓満")
private String speculativeTradingName;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@TableField(exist = false)
@@ -64,14 +64,14 @@
@TableField(exist = false)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("椤堕儴鐖朵骇鍝乮d")
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
@TableField(exist = false)
private Long topProductParentId;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 7153751..fa10c92 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@@ -16,71 +16,71 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
+ @Schema(description = "绾崇◣浜鸿瘑鍒彿")
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
- @ApiModelProperty(value = "鍏徃鍦板潃")
+ @Schema(description = "鍏徃鍦板潃")
@Excel(name = "鍏徃鍦板潃")
private String companyAddress;
- @ApiModelProperty(value = "鍏徃鐢佃瘽")
+ @Schema(description = "鍏徃鐢佃瘽")
@Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
- @ApiModelProperty(value = "寮�鎴疯")
+ @Schema(description = "寮�鎴疯")
@Excel(name = "寮�鎴疯")
private String bankAccountName;
- @ApiModelProperty(value = "璐﹀彿")
+ @Schema(description = "璐﹀彿")
@Excel(name = "璐﹀彿")
private String bankAccountNum;
- @ApiModelProperty(value = "鑱旂郴浜�")
+ @Schema(description = "鑱旂郴浜�")
@Excel(name = "鑱旂郴浜�")
private String contactUserName;
- @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽")
private String contactUserPhone;
- @ApiModelProperty(value = "缁存姢浜篒D")
+ @Schema(description = "缁存姢浜篒D")
@Excel(name = "缁存姢浜�")
private Integer maintainUserId;
- @ApiModelProperty(value = "缁存姢鏃堕棿")
+ @Schema(description = "缁存姢鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
// @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate maintainTime;
@Excel(name = "鏄惁鐧藉悕鍗�")
- @ApiModelProperty(value = "鏄惁鐧藉悕鍗曪紙0鏄� 1鍚︼級")
+ @Schema(description = "鏄惁鐧藉悕鍗曪紙0鏄� 1鍚︼級")
private Integer isWhite;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
+ @Schema(description = "渚涘簲鍟嗙被鍨�")
@TableField(value = "supplier_type")
private String supplierType;
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java
index f8e79fa..012352f 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java
@@ -1,7 +1,7 @@
package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
@@ -23,36 +23,36 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty(value = "鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private int fileSize;
- @ApiModelProperty(value = "渚涘簲鍟咺D")
+ @Schema(description = "渚涘簲鍟咺D")
@NotBlank(message = "渚涘簲鍟唅d涓嶈兘涓虹┖!")
private Long supplierId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
index c5023eb..d622e99 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
@@ -8,7 +8,7 @@
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.excel.ExcelUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -24,30 +24,30 @@
private DutyPlanService dutyPlanService;
@GetMapping("/getList")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, DutyPlanDTO dutyPlanDTO){
return AjaxResult.success(dutyPlanService.listPage(page, dutyPlanDTO));
}
@GetMapping("/getNum")
- @ApiOperation("鑾峰彇绛夌骇鏁版嵁")
+ @Operation(summary = "鑾峰彇绛夌骇鏁版嵁")
public AjaxResult getNum(){
return AjaxResult.success(dutyPlanService.getNum());
}
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody DutyPlan dutyPlan){
return AjaxResult.success(dutyPlanService.save(dutyPlan));
}
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody DutyPlan dutyPlan){
return AjaxResult.success(dutyPlanService.updateById(dutyPlan));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -55,7 +55,7 @@
return AjaxResult.success(dutyPlanService.removeBatchByIds(ids));
}
@PostMapping("/export")
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
public void exportData(HttpServletResponse response, DutyPlanDTO dutyPlanDTO){
dutyPlanService.exportData(response, dutyPlanDTO);
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
index 453986e..917bda6 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
@@ -14,8 +14,8 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@
@RestController
@RequestMapping("/meeting")
@RequiredArgsConstructor
-@Api(tags = "浼氳")
+@Tag(name = "浼氳")
public class MeetingController {
private final MeetingService meetingService;
@@ -126,7 +126,7 @@
return R.ok(meetingService.getMeetSummaryItems());
}
- @ApiOperation(value = "浼氳瀹よ缃鍑�")
+ @Operation(summary = "浼氳瀹よ缃鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<MeetingRoom> accountExpenses = meetingService.list();
@@ -136,7 +136,7 @@
private final MeetDraftMapper meetDraftMapper;
- @ApiOperation(value = "浼氳鑽夌瀵煎嚭")
+ @Operation(summary = "浼氳鑽夌瀵煎嚭")
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
List<MeetDraft> accountExpenses = meetDraftMapper.selectList(new LambdaQueryWrapper<MeetDraft>());
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
index 8fe67d0..ba1df00 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
@@ -11,8 +11,8 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysNoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
@RestController
@AllArgsConstructor
-@Api(tags = "閫氱煡鍏憡")
+@Tag(name = "閫氱煡鍏憡")
@RequestMapping("/collaborativeApproval/notice")
public class NoticeController extends BaseController {
@@ -31,14 +31,14 @@
@GetMapping("/page")
@Log(title = "鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, NoticeDTO noticeDTO){
return AjaxResult.success(noticeService.listPage(page, noticeDTO));
}
@PostMapping("/add")
@Log(title = "鏂板", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody NoticeDTO noticeDTO){
if (noticeDTO.getStatus()==1){
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
@@ -51,7 +51,7 @@
@PutMapping("/update")
@Log(title = "淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody NoticeDTO noticeDTO){
if (ObjectUtils.isNotNull(noticeDTO.getStatus()) && noticeDTO.getStatus()==1){
Notice notice = noticeService.getById(noticeDTO.getId());
@@ -65,7 +65,7 @@
@DeleteMapping("/{ids}")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -75,7 +75,7 @@
@GetMapping("/count")
@Log(title = "鑾峰彇鍏憡鏁伴噺", businessType = BusinessType.OTHER)
- @ApiOperation("鑾峰彇鍏憡鏁伴噺")
+ @Operation(summary = "鑾峰彇鍏憡鏁伴噺")
public AjaxResult count(){
return AjaxResult.success(noticeService.selectCount());
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index 6d7ba9c..5e59117 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -9,8 +9,8 @@
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementService;
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 io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -22,32 +22,32 @@
@RestController
@RequestMapping("/rulesRegulationsManagement")
@AllArgsConstructor
-@Api(tags = "鍒跺害绠＄悊")
+@Tag(name = "鍒跺害绠＄悊")
public class RulesRegulationsManagementController {
private RulesRegulationsManagementService rulesRegulationsManagementService;
private ReadingStatusMapper readingStatusMapper;
@GetMapping("/getList")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
return AjaxResult.success(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
}
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
rulesRegulationsManagementService.save(rulesRegulationsManagement);
return AjaxResult.success(rulesRegulationsManagement.getId());
}
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
return AjaxResult.success(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -56,27 +56,27 @@
}
//瑙勫垯鏌ョ湅鏃舵柊澧為槄璇荤姸鎬�
@PostMapping("/addReadingStatus")
- @ApiOperation("鏂板闃呰鐘舵��")
+ @Operation(summary = "鏂板闃呰鐘舵��")
public AjaxResult addReadingStatus(@RequestBody ReadingStatus readingStatus){
return AjaxResult.success(readingStatusMapper.insert(readingStatus));
}
@PostMapping("/updateReadingStatus")
- @ApiOperation("淇敼闃呰鐘舵��")
+ @Operation(summary = "淇敼闃呰鐘舵��")
public AjaxResult updateReadingStatus(@RequestBody ReadingStatus readingStatus){
return AjaxResult.success(readingStatusMapper.updateById(readingStatus));
}
@GetMapping("/getReadingStatusList")
- @ApiOperation("鍒嗛〉鏌ヨ闃呰鐘舵��")
+ @Operation(summary = "鍒嗛〉鏌ヨ闃呰鐘舵��")
public AjaxResult listPage(Page page, ReadingStatus readingStatus){
return AjaxResult.success(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
}
@GetMapping("/getReadingStatusByRuleId/{ruleId}")
- @ApiOperation("鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
+ @Operation(summary = "鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
}
- @ApiOperation(value = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
+ @Operation(summary = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<RulesRegulationsManagement> accountExpenses = rulesRegulationsManagementService.list();
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index 31f9ad1..6a3824d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -9,8 +9,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysNoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -23,19 +23,19 @@
@AllArgsConstructor
@RestController
@RequestMapping("/sealApplicationManagement")
-@Api(tags = "鐢ㄥ嵃鐢宠绠＄悊")
+@Tag(name = "鐢ㄥ嵃鐢宠绠＄悊")
public class SealApplicationManagementController {
private SealApplicationManagementService sealApplicationManagementService;
private ISysNoticeService sysNoticeService;
@GetMapping("/getList")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
return AjaxResult.success(sealApplicationManagementService.listPage(page,sealApplicationManagement));
}
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
sealApplicationManagementService.save(sealApplicationManagement);
//娑堟伅閫氱煡
@@ -48,13 +48,13 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody SealApplicationManagement sealApplicationManagement){
return AjaxResult.success(sealApplicationManagementService.updateById(sealApplicationManagement));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -62,7 +62,7 @@
return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
}
- @ApiOperation(value = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
+ @Operation(summary = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<SealApplicationManagement> accountExpenses = sealApplicationManagementService.list();
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
index 0b924df..3673208 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
@@ -5,7 +5,7 @@
import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
import com.ruoyi.collaborativeApproval.service.StaffContactsPersonalService;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -16,19 +16,19 @@
private StaffContactsPersonalService staffContactsPersonalService;
@GetMapping("/getList")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
return AjaxResult.success(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
}
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
return AjaxResult.success(staffContactsPersonalService.save(staffContactsPersonal));
}
@DeleteMapping("/delete/{id}")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable("id") Long id) {
// if (CollectionUtils.isEmpty(id)) {
// throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/MeetSummaryDto.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/MeetSummaryDto.java
index 1c43eeb..d62c8ad 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/MeetSummaryDto.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/MeetSummaryDto.java
@@ -1,6 +1,5 @@
package com.ruoyi.collaborativeApproval.dto;
-import io.swagger.models.auth.In;
import lombok.Data;
import java.io.Serializable;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
index 42b759d..ef8fc01 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.ListToStringTypeHandler;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.springframework.format.annotation.DateTimeFormat;
@@ -22,13 +22,13 @@
* 璁″垝鏍囬
*/
@Excel(name = "璁″垝鏍囬")
- @ApiModelProperty("璁″垝鏍囬")
+ @Schema(description = "璁″垝鏍囬")
private String title;
/**
* 璁″垝鎻忚堪
*/
@Excel(name = "璁″垝鎻忚堪")
- @ApiModelProperty("璁″垝鎻忚堪")
+ @Schema(description = "璁″垝鎻忚堪")
private String description;
@@ -36,13 +36,13 @@
* 璁″垝绾у埆
*/
@Excel(name = "璁″垝绾у埆")
- @ApiModelProperty("璁″垝绾у埆")
+ @Schema(description = "璁″垝绾у埆")
private String level;
/**
* 鏃堕棿鍛ㄦ湡
*/
@Excel(name = "鏃堕棿鍛ㄦ湡")
- @ApiModelProperty("鏃堕棿鍛ㄦ湡")
+ @Schema(description = "鏃堕棿鍛ㄦ湡")
private String period;
/**
* 寮�濮嬫椂闂�
@@ -63,31 +63,31 @@
* 璐熻矗浜�
*/
@Excel(name = "璐熻矗浜�")
- @ApiModelProperty("璐熻矗浜�")
+ @Schema(description = "璐熻矗浜�")
private String assignee;
/**
* 鐘舵��
*/
@Excel(name = "鐘舵��")
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
/**
* 浼樺厛绾�
*/
@Excel(name = "浼樺厛绾�")
- @ApiModelProperty("浼樺厛绾�")
+ @Schema(description = "浼樺厛绾�")
private String priority;
/**
* 瀹屾垚搴�
*/
@Excel(name = "瀹屾垚搴�")
- @ApiModelProperty("瀹屾垚搴�")
+ @Schema(description = "瀹屾垚搴�")
private Integer progress;
/**
* 鏍囩
*/
@Excel(name = "鏍囩")
- @ApiModelProperty("鏍囩")
+ @Schema(description = "鏍囩")
@TableField(value = "tags",typeHandler = ListToStringTypeHandler.class,jdbcType = JdbcType.VARCHAR)
private List<String> tags;
/**
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java
index 3308198..5c9d9c0 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java
@@ -7,7 +7,6 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.models.auth.In;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -140,4 +139,4 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index 514ff00..7d688b4 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -15,7 +14,7 @@
*/
@Data
@TableName("notice")
-@ApiModel
+@Schema
public class Notice {
private static final long serialVersionUID = 1L;
@@ -26,31 +25,31 @@
/**
* 鍏憡鏍囬
*/
- @ApiModelProperty("鍏憡鏍囬")
+ @Schema(description = "鍏憡鏍囬")
private String title;
/**
* 鍏憡绫诲瀷
*/
- @ApiModelProperty("鍏憡绫诲瀷")
+ @Schema(description = "鍏憡绫诲瀷")
private String type;
/**
* 鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級
*/
- @ApiModelProperty("鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級")
+ @Schema(description = "鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級")
private Integer status;
/**
* 鍏憡鍐呭
*/
- @ApiModelProperty("鍏憡鍐呭")
+ @Schema(description = "鍏憡鍐呭")
private String content;
/**
* 浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)
*/
- @ApiModelProperty("浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)")
+ @Schema(description = "浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)")
private Integer priority;
@@ -83,7 +82,7 @@
/**
* 澶囨敞
*/
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java
index 79cdf52..8faf9d9 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -19,7 +18,7 @@
@Getter
@Setter
@TableName("notice_type")
-@ApiModel(value = "NoticeType瀵硅薄", description = "閫氱煡鍏憡鐨勫叕鍛婄被鍨嬬淮鎶�")
+@Schema(name = "NoticeType瀵硅薄", description = "閫氱煡鍏憡鐨勫叕鍛婄被鍨嬬淮鎶�")
public class NoticeType implements Serializable {
private static final long serialVersionUID = 1L;
@@ -27,12 +26,12 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("閫氱煡鍏憡鐨勫叕鍛婄被鍨�")
+ @Schema(description = "閫氱煡鍏憡鐨勫叕鍛婄被鍨�")
private String noticeType;
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
index 94f2d2c..f1abf11 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.ListToStringTypeHandler;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.springframework.format.annotation.DateTimeFormat;
@@ -20,26 +20,26 @@
/**
* 鍒跺害缂栧彿
*/
- @ApiModelProperty("鍒跺害缂栧彿")
+ @Schema(description = "鍒跺害缂栧彿")
@Excel(name = "鍒跺害缂栧彿")
private String regulationNum;
/**
* 鏍囬
*/
- @ApiModelProperty("鏍囬")
+ @Schema(description = "鏍囬")
@Excel(name = "鏍囬")
private String title;
/**
* 鍒跺害鍒嗙被
*/
- @ApiModelProperty("鍒跺害鍒嗙被")
+ @Schema(description = "鍒跺害鍒嗙被")
@Excel(name = "鍒跺害鍒嗙被", readConverterExp = "finance=璐㈠姟鍒跺害,hr=浜轰簨鍒跺害,safety=瀹夊叏鍒跺害,tech=鎶�鏈埗搴�")
private String category;
/**
* 鍒跺害鍐呭
*/
- @ApiModelProperty("鍒跺害鍐呭")
+ @Schema(description = "鍒跺害鍐呭")
private String content;
/**
* 鐢熸晥鏃堕棿
@@ -51,30 +51,30 @@
/**
* 閫傜敤鑼冨洿
*/
- @ApiModelProperty("閫傜敤鑼冨洿")
+ @Schema(description = "閫傜敤鑼冨洿")
@TableField(value = "scope",typeHandler = ListToStringTypeHandler.class,jdbcType = JdbcType.VARCHAR)
private List<String> scope;
/**
* 鏄惁闇�瑕佺‘璁�
*/
- @ApiModelProperty("鏄惁闇�瑕佺‘璁�")
+ @Schema(description = "鏄惁闇�瑕佺‘璁�")
private Boolean requireConfirm;
/**
* 鐗堟湰
*/
- @ApiModelProperty("鐗堟湰")
+ @Schema(description = "鐗堟湰")
@Excel(name = "鐗堟湰")
private String version;
/**
* 鐘舵��
*/
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��", readConverterExp = "repealed=宸插簾姝�,active=鐢熸晥涓�")
private String status;
/**
* 宸茶浜烘暟
*/
- @ApiModelProperty("宸茶浜烘暟")
+ @Schema(description = "宸茶浜烘暟")
@Excel(name = "宸茶浜烘暟")
private Integer readCount;
/**
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
index 9079c90..b2c287d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("rules_regulations_management_file")
-@ApiModel(value = "RulesRegulationsManagementFile瀵硅薄", description = "瑙勭珷鍒跺害绠＄悊--闄勪欢")
+@Schema(name = "RulesRegulationsManagementFile瀵硅薄", description = "瑙勭珷鍒跺害绠＄悊--闄勪欢")
public class RulesRegulationsManagementFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,35 +30,35 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty("鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty("鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private Integer fileSize;
- @ApiModelProperty("瑙勭珷鍒跺害ID")
+ @Schema(description = "瑙勭珷鍒跺害ID")
private Integer rulesRegulationsManagementId;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index 0acac2d..d655683 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,37 +18,37 @@
/**
* 鐢宠缂栧彿
*/
- @ApiModelProperty("鐢宠缂栧彿")
+ @Schema(description = "鐢宠缂栧彿")
@Excel(name = "鐢宠缂栧彿")
private String applicationNum;
/**
* 鍏憡鏍囬
*/
- @ApiModelProperty("鍏憡鏍囬")
+ @Schema(description = "鍏憡鏍囬")
@Excel(name = "鐢宠鏍囬")
private String title;
/**
* 鐢ㄥ嵃绫诲瀷
*/
- @ApiModelProperty("鐢ㄥ嵃绫诲瀷")
+ @Schema(description = "鐢ㄥ嵃绫诲瀷")
@Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
*/
- @ApiModelProperty("鐢宠鐢ㄥ嵃鍘熷洜")
+ @Schema(description = "鐢宠鐢ㄥ嵃鍘熷洜")
private String reason;
/**
* 绱ф�ョ▼搴�
*/
- @ApiModelProperty("绱ф�ョ▼搴�")
+ @Schema(description = "绱ф�ョ▼搴�")
private String urgency;
/**
* 鐘舵��
*/
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
index 18bb633..ae11cff 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
@@ -1,7 +1,7 @@
package com.ruoyi.collaborativeApproval.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -15,13 +15,13 @@
// /**
// * 鐢ㄦ埛ID锛堟墍灞炶�咃級
// */
-// @ApiModelProperty("鐢ㄦ埛ID锛堟墍灞炶�咃級")
+// @Schema(description = "鐢ㄦ埛ID锛堟墍灞炶�咃級")
// private Integer userId;
/**
* 鍛樺伐ID
*/
- @ApiModelProperty("鍛樺伐ID")
+ @Schema(description = "鍛樺伐ID")
private Integer contactId;
/**
* 鍒涘缓鑰�
diff --git a/src/main/java/com/ruoyi/common/vo/FileVo.java b/src/main/java/com/ruoyi/common/vo/FileVo.java
index bc7adb8..4ac5307 100644
--- a/src/main/java/com/ruoyi/common/vo/FileVo.java
+++ b/src/main/java/com/ruoyi/common/vo/FileVo.java
@@ -1,6 +1,6 @@
package com.ruoyi.common.vo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -8,25 +8,25 @@
@Data
public class FileVo {
- @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty(value = "鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private int fileSize;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
private Integer updateUser;
private Long id;
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index 492b923..25f91c5 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -11,8 +11,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@
* @date : 2025/8/8 9:56
*/
@RestController
-@Api(tags = "钖叕缁╂晥")
+@Tag(name = "钖叕缁╂晥")
@RequestMapping("/compensationPerformance")
@AllArgsConstructor
public class CompensationPerformanceController extends BaseController {
@@ -39,7 +39,7 @@
@GetMapping("/listPage")
@Log(title = "钖叕缁╂晥-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("钖叕缁╂晥-鍒嗛〉鏌ヨ")
+ @Operation(summary = "钖叕缁╂晥-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, String staffName, String payDateStr) {
IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, staffName, payDateStr);
return AjaxResult.success(listPage);
@@ -47,7 +47,7 @@
@PostMapping("/add")
@Log(title = "钖叕缁╂晥-娣诲姞", businessType = BusinessType.INSERT)
- @ApiOperation("钖叕缁╂晥-娣诲姞")
+ @Operation(summary = "钖叕缁╂晥-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance) {
boolean save = compensationPerformanceService.save(compensationPerformance);
@@ -56,7 +56,7 @@
@PostMapping("/update")
@Log(title = "钖叕缁╂晥-淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("钖叕缁╂晥-淇敼")
+ @Operation(summary = "钖叕缁╂晥-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance) {
boolean update = compensationPerformanceService.updateById(compensationPerformance);
@@ -65,7 +65,7 @@
@DeleteMapping("/delete")
@Log(title = "钖叕缁╂晥-鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("钖叕缁╂晥-鍒犻櫎")
+ @Operation(summary = "钖叕缁╂晥-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
diff --git a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
index 2fea048..bc28ded 100644
--- a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
+++ b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,25 +20,25 @@
*/
@Data
@TableName("compensation_performance")
-@ApiModel("钖叕缁╂晥鏄庣粏")
+@Schema(name = "钖叕缁╂晥鏄庣粏")
public class CompensationPerformance implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty("涓婚敭")
+ @Schema(description = "涓婚敭")
private Long id;
/**
* 鍛樺伐id
*/
- @ApiModelProperty("鍛樺伐id")
+ @Schema(description = "鍛樺伐id")
private Long staffId;
/**
* 鍛樺伐濮撳悕
*/
- @ApiModelProperty("鍛樺伐濮撳悕")
+ @Schema(description = "鍛樺伐濮撳悕")
@Excel(name = "鍛樺伐濮撳悕")
@TableField(exist = false)
private String staffName;
@@ -47,7 +46,7 @@
/**
* 宀椾綅鍚嶇О
*/
- @ApiModelProperty("宀椾綅鍚嶇О")
+ @Schema(description = "宀椾綅鍚嶇О")
@Excel(name = "宀椾綅鍚嶇О")
@TableField(exist = false)
private String postName;
@@ -55,7 +54,7 @@
/**
* 閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Schema(description = "閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String deptName;
@@ -63,7 +62,7 @@
/**
* 钖祫鏈堜唤
*/
- @ApiModelProperty("钖祫鏈堜唤")
+ @Schema(description = "钖祫鏈堜唤")
@Excel(name = "鏈堜唤", dateFormat = "yyyy-MM", width = 20)
@JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM")
@@ -72,84 +71,84 @@
/**
* 鍩烘湰宸ヨ祫
*/
- @ApiModelProperty("鍩烘湰宸ヨ祫")
+ @Schema(description = "鍩烘湰宸ヨ祫")
@Excel(name = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
/**
* 璁′欢宸ヨ祫
*/
- @ApiModelProperty("璁′欢宸ヨ祫")
+ @Schema(description = "璁′欢宸ヨ祫")
@Excel(name = "璁′欢宸ヨ祫")
private BigDecimal pieceworkSalary;
/**
* 璁℃椂宸ヨ祫
*/
- @ApiModelProperty("璁℃椂宸ヨ祫")
+ @Schema(description = "璁℃椂宸ヨ祫")
@Excel(name = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
/**
* 鍏朵粬鏀跺叆
*/
- @ApiModelProperty("鍏朵粬鏀跺叆")
+ @Schema(description = "鍏朵粬鏀跺叆")
@Excel(name = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
/**
* 绀句繚涓汉
*/
- @ApiModelProperty("绀句繚涓汉")
+ @Schema(description = "绀句繚涓汉")
@Excel(name = "绀句繚涓汉")
private BigDecimal socialSecurityIndividuals;
/**
* 鍏Н閲戜釜浜�
*/
- @ApiModelProperty("鍏Н閲戜釜浜�")
+ @Schema(description = "鍏Н閲戜釜浜�")
@Excel(name = "鍏Н閲戜釜浜�")
private BigDecimal providentFundIndividuals;
/**
* 宸ヨ祫涓◣
*/
- @ApiModelProperty("宸ヨ祫涓◣")
+ @Schema(description = "宸ヨ祫涓◣")
@Excel(name = "宸ヨ祫涓◣")
private BigDecimal personalIncomeTax;
/**
* 鍏朵粬鏀嚭
*/
- @ApiModelProperty("鍏朵粬鏀嚭")
+ @Schema(description = "鍏朵粬鏀嚭")
@Excel(name = "鍏朵粬鏀嚭")
private BigDecimal otherDeductions;
/**
* 搴斿彂宸ヨ祫
*/
- @ApiModelProperty("搴斿彂宸ヨ祫")
+ @Schema(description = "搴斿彂宸ヨ祫")
@Excel(name = "搴斿彂宸ヨ祫")
private BigDecimal payableWages;
/**
* 搴旀墸宸ヨ祫
*/
- @ApiModelProperty("搴旀墸宸ヨ祫")
+ @Schema(description = "搴旀墸宸ヨ祫")
@Excel(name = "搴旀墸宸ヨ祫")
private BigDecimal deductibleWages;
/**
* 瀹炲彂宸ヨ祫
*/
- @ApiModelProperty("瀹炲彂宸ヨ祫")
+ @Schema(description = "瀹炲彂宸ヨ祫")
@Excel(name = "瀹炲彂宸ヨ祫")
private BigDecimal actualWages;
/**
* 澶囨敞
*/
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remark;
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 23c322a..586ee42 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -9,8 +9,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +21,7 @@
* @date : 2025/8/29 10:28
*/
@RestController
-@Api(tags = "瀹㈡埛鎷滆")
+@Tag(name = "瀹㈡埛鎷滆")
@RequestMapping("/customerVisits")
@AllArgsConstructor
public class CustomerVisitsController extends BaseController {
@@ -30,14 +30,14 @@
@GetMapping("/listPage")
@Log(title = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
+ @Operation(summary = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, CustomerVisits customerVisits) {
IPage<CustomerVisits> listPage = customerVisitsService.listPage(page, customerVisits);
return AjaxResult.success(listPage);
}
@Log(title = "瀹㈡埛鎷滆-娣诲姞", businessType = BusinessType.INSERT)
- @ApiOperation("瀹㈡埛鎷滆-娣诲姞")
+ @Operation(summary = "瀹㈡埛鎷滆-娣诲姞")
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody CustomerVisits customerVisits) {
@@ -49,7 +49,7 @@
}
@Log(title = "瀹㈡埛鎷滆-缂栬緫", businessType = BusinessType.UPDATE)
- @ApiOperation("瀹㈡埛鎷滆-缂栬緫")
+ @Operation(summary = "瀹㈡埛鎷滆-缂栬緫")
@PostMapping("update")
public AjaxResult updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
@@ -60,7 +60,7 @@
}
@Log(title = "瀹㈡埛鎷滆-鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("瀹㈡埛鎷滆-鍒犻櫎")
+ @Operation(summary = "瀹㈡埛鎷滆-鍒犻櫎")
@DeleteMapping("{customerId}")
public AjaxResult deleteCustomerVisit(@PathVariable Integer customerId) {
if (customerId == null) {
diff --git a/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java b/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
index b19a74c..2f19cf1 100644
--- a/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
+++ b/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,7 +20,7 @@
@TableName("customer_visits")
@Data
@Builder
-@ApiModel
+@Schema
public class CustomerVisits {
private static final long serialVersionUID = 1L;
@@ -32,55 +31,55 @@
/**
* 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
/**
* 鑱旂郴浜�
*/
- @ApiModelProperty("鑱旂郴浜�")
+ @Schema(description = "鑱旂郴浜�")
private String contact;
/**
* 鑱旂郴鐢佃瘽
*/
- @ApiModelProperty("鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
private String contactPhone;
/**
* 浣嶇疆
*/
- @ApiModelProperty("浣嶇疆")
+ @Schema(description = "浣嶇疆")
private String location;
/**
* 鎷滆浜�
*/
- @ApiModelProperty("鎷滆浜�")
+ @Schema(description = "鎷滆浜�")
private String visitingPeople;
/**
* 鎷滆鐩殑
*/
- @ApiModelProperty("鎷滆鐩殑")
+ @Schema(description = "鎷滆鐩殑")
private String purposeVisit;
/**
* 鎷滆鏃堕棿
*/
- @ApiModelProperty("鎷滆鏃堕棿")
+ @Schema(description = "鎷滆鏃堕棿")
private String purposeDate;
/**
* 鎷滆鍦板潃
*/
- @ApiModelProperty("鎷滆鍦板潃")
+ @Schema(description = "鎷滆鍦板潃")
private String visitAddress;
/**
* 澶囨敞
*/
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
/**
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index 574d150..1fd1c04 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -5,23 +5,23 @@
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.service.DeviceDefectRecordService;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-@Api(tags = "璁惧缂洪櫡璁板綍绠＄悊")
+@Tag(name = "璁惧缂洪櫡璁板綍绠＄悊")
@RequestMapping("/defect")
@AllArgsConstructor
@RestController
public class DeviceDefectRecordController {
private DeviceDefectRecordService deviceDefectRecordService;
- @ApiOperation("璁惧缂洪櫡璁板綍鍒楄〃")
+ @Operation(summary = "璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
}
- @ApiOperation("璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
+ @Operation(summary = "璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/find/{deviceLedgerId}")
public AjaxResult find(@PathVariable Long deviceLedgerId) {
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
@@ -30,17 +30,17 @@
}
@PostMapping("/add")
- @ApiOperation("娣诲姞璁惧缂洪櫡璁板綍")
+ @Operation(summary = "娣诲姞璁惧缂洪櫡璁板綍")
public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
}
@PostMapping("/update")
- @ApiOperation("淇敼璁惧缂洪櫡璁板綍")
+ @Operation(summary = "淇敼璁惧缂洪櫡璁板綍")
public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎璁惧缂洪櫡璁板綍")
+ @Operation(summary = "鍒犻櫎璁惧缂洪櫡璁板綍")
public AjaxResult delete(@PathVariable Long id) {
return AjaxResult.success(deviceDefectRecordService.removeById(id));
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
index bcd45ed..f4b807d 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -13,8 +13,8 @@
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-@Api(tags = "璁惧鍙拌处绠＄悊")
+@Tag(name = "璁惧鍙拌处绠＄悊")
@RequestMapping("/device/ledger")
@RestController
@AllArgsConstructor
@@ -36,33 +36,33 @@
- @ApiOperation("璁惧鍙拌处鍒楄〃")
+ @Operation(summary = "璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceLedgerDto deviceLedger) {
return AjaxResult.success(deviceLedgerService.queryPage(page,deviceLedger));
}
@PostMapping()
- @ApiOperation("娣诲姞璁惧鍙拌处")
+ @Operation(summary = "娣诲姞璁惧鍙拌处")
public AjaxResult add(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.saveDeviceLedger(deviceLedger);
}
- @ApiOperation("鏍规嵁id鏌ヨ璁惧鍙拌处")
+ @Operation(summary = "鏍规嵁id鏌ヨ璁惧鍙拌处")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
return AjaxResult.success(deviceLedgerService.getById(id));
}
@PutMapping ()
- @ApiOperation("淇敼璁惧鍙拌处")
+ @Operation(summary = "淇敼璁惧鍙拌处")
public AjaxResult update(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.updateDeviceLedger(deviceLedger);
}
@DeleteMapping("/{ids}")
- @ApiOperation("鍒犻櫎璁惧鍙拌处")
+ @Operation(summary = "鍒犻櫎璁惧鍙拌处")
public AjaxResult delete(@PathVariable("ids") ArrayList<Long> ids) {
boolean b = deviceLedgerService.removeBatchByIds(ids);
if (!b) {
@@ -72,12 +72,12 @@
}
@PostMapping("export")
- @ApiOperation("瀵煎嚭璁惧鍙拌处")
+ @Operation(summary = "瀵煎嚭璁惧鍙拌处")
public void export(HttpServletResponse response, Long[] ids) {
deviceLedgerService.export(response, ids);
}
- @ApiOperation("涓嬭浇妯℃澘")
+ @Operation(summary = "涓嬭浇妯℃澘")
@PostMapping("/downloadTemplate")
public void downloadTemplate(HttpServletResponse response) {
ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<>(DeviceLedgerExeclDto.class);
@@ -85,7 +85,7 @@
}
@PostMapping("/import")
- @ApiOperation("瀵煎叆璁惧鍙拌处")
+ @Operation(summary = "瀵煎叆璁惧鍙拌处")
public AjaxResult importData(MultipartFile file) throws IOException {
Boolean b = deviceLedgerService.importData(file);
if (b) {
@@ -96,14 +96,14 @@
@GetMapping("getDeviceLedger")
- @ApiOperation("鑾峰彇璁惧鍙拌处")
+ @Operation(summary = "鑾峰彇璁惧鍙拌处")
public AjaxResult getDeviceLedger( ) {
return AjaxResult.success(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda()
.select(DeviceLedger::getId, DeviceLedger::getDeviceName,DeviceLedger::getDeviceModel)));
}
@GetMapping("scanDevice")
- @ApiOperation("鑾峰彇璁惧鍙拌处")
+ @Operation(summary = "鑾峰彇璁惧鍙拌处")
@Anonymous
public AjaxResult scanDevice(Long id) {
List<DeviceMaintenance> list = deviceMaintenanceMapper.list1(id);
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 338569a..e53953d 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -8,15 +8,15 @@
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
-@Api(tags = "璁惧淇濆吇")
+@Tag(name = "璁惧淇濆吇")
@RestController
@RequestMapping("/device/maintenance")
@AllArgsConstructor
@@ -26,14 +26,14 @@
private IDeviceMaintenanceService deviceMaintenanceService;
private IDeviceLedgerService deviceLedgerService;
- @ApiOperation("璁惧淇濆吇鍒楄〃")
+ @Operation(summary = "璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
@PostMapping()
- @ApiOperation("娣诲姞璁惧淇濆吇")
+ @Operation(summary = "娣诲姞璁惧淇濆吇")
public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
@@ -41,14 +41,14 @@
return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
}
- @ApiOperation("鏍规嵁id鏌ヨ璁惧淇濆吇")
+ @Operation(summary = "鏍规嵁id鏌ヨ璁惧淇濆吇")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
return AjaxResult.success(deviceMaintenanceService.detailById(id));
}
@PutMapping ()
- @ApiOperation("淇敼璁惧淇濆吇")
+ @Operation(summary = "淇敼璁惧淇濆吇")
public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
@@ -57,14 +57,14 @@
}
@PostMapping ("maintenance")
- @ApiOperation("淇敼璁惧淇濆吇")
+ @Operation(summary = "淇敼璁惧淇濆吇")
public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@DeleteMapping("/{ids}")
- @ApiOperation("鍒犻櫎璁惧淇濆吇")
+ @Operation(summary = "鍒犻櫎璁惧淇濆吇")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
@@ -74,7 +74,7 @@
}
@PostMapping("export")
- @ApiOperation("瀵煎嚭璁惧淇濆吇")
+ @Operation(summary = "瀵煎嚭璁惧淇濆吇")
public void export(HttpServletResponse response, Long[] ids) {
deviceMaintenanceService.export(response, ids);
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
index b3e2423..d92d334 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
@@ -5,7 +5,7 @@
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
*/
@RestController
@RequestMapping("/maintenanceTaskFile")
-@Api(tags = "璁惧淇濆吇闄勪欢")
+@Tag(name = "璁惧淇濆吇闄勪欢")
public class DeviceMaintenanceFileController {
@Resource
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index d763337..8e969ad 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -6,15 +6,15 @@
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
-@Api(tags = "璁惧鎶ヤ慨绠＄悊")
+@Tag(name = "璁惧鎶ヤ慨绠＄悊")
@RequestMapping("/device/repair")
@RestController
@AllArgsConstructor
@@ -22,19 +22,19 @@
private IDeviceRepairService deviceRepairService;
- @ApiOperation("璁惧鎶ヤ慨鍒楄〃")
+ @Operation(summary = "璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
}
@PostMapping()
- @ApiOperation("娣诲姞璁惧鎶ヤ慨")
+ @Operation(summary = "娣诲姞璁惧鎶ヤ慨")
public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.saveDeviceRepair(deviceRepair);
}
- @ApiOperation("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
+ @Operation(summary = "鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
DeviceRepairDto byId = deviceRepairService.detailById(id);
@@ -42,19 +42,19 @@
}
@PutMapping ()
- @ApiOperation("淇敼璁惧鎶ヤ慨")
+ @Operation(summary = "淇敼璁惧鎶ヤ慨")
public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
@PostMapping ("repair")
- @ApiOperation("璁惧缁翠慨")
+ @Operation(summary = "璁惧缁翠慨")
public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
@DeleteMapping("/{ids}")
- @ApiOperation("鍒犻櫎璁惧鎶ヤ慨")
+ @Operation(summary = "鍒犻櫎璁惧鎶ヤ慨")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
@@ -64,7 +64,7 @@
}
@PostMapping("export")
- @ApiOperation("瀵煎嚭璁惧鎶ヤ慨")
+ @Operation(summary = "瀵煎嚭璁惧鎶ヤ慨")
public void export(HttpServletResponse response, Long[] ids) {
deviceRepairService.export(response, ids);
}
diff --git a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
index 0616e50..b6f8c27 100644
--- a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
+++ b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,7 @@
* @author :yys
* @date : 2025/12/22 14:58
*/
-@Api(tags = "璁惧淇濆吇瀹氭椂浠诲姟绠＄悊")
+@Tag(name = "璁惧淇濆吇瀹氭椂浠诲姟绠＄悊")
@RestController
@RequestMapping("/deviceMaintenanceTask")
@AllArgsConstructor
@@ -30,28 +30,28 @@
@GetMapping("/listPage")
- @ApiOperation(value = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
+ @Operation(summary = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
return maintenanceTaskService.listPage(page,maintenanceTask);
}
@PostMapping("/add")
- @ApiOperation(value = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
+ @Operation(summary = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.add(maintenanceTask);
}
@PostMapping("/update")
- @ApiOperation(value = "淇敼璁惧淇濆吇瀹氭椂浠诲姟")
+ @Operation(summary = "淇敼璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.updateByMaintenanceTaskId(maintenanceTask);
}
@DeleteMapping("/delete")
- @ApiOperation(value = "鍒犻櫎璁惧淇濆吇瀹氭椂浠诲姟")
+ @Operation(summary = "鍒犻櫎璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
return maintenanceTaskService.delete(ids);
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java b/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
index aa1e0aa..e7d1602 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
@@ -1,14 +1,14 @@
package com.ruoyi.device.dto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class DeviceDefectRecordDto extends DeviceDefectRecord {
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("璁惧鍨嬪彿")
+ @Schema(description = "璁惧鍨嬪彿")
private String deviceModel;
}
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 75d9250..79e0aff 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -39,13 +39,13 @@
/**
* 璁惧鍝佺墝
*/
- @ApiModelProperty("璁惧鍝佺墝")
+ @Schema(description = "璁惧鍝佺墝")
private String deviceBrand;
/**
* 瀛樻斁浣嶇疆
*/
- @ApiModelProperty("瀛樻斁浣嶇疆")
+ @Schema(description = "瀛樻斁浣嶇疆")
private String storageLocation;
@@ -115,34 +115,34 @@
*/
private Long tenantId;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planRuntimeTime;
- @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+ @Schema(description = "寮�濮嬭繍琛屾椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startRuntimeTime;
- @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+ @Schema(description = "缁撴潫杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endRuntimeTime;
- @ApiModelProperty("杩愯鏃堕暱")
+ @Schema(description = "杩愯鏃堕暱")
private String runtimeDuration;
- @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+ @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
private Integer isDepr;
- @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+ @Schema(description = "姣忓勾鎶樻棫閲戦")
private BigDecimal annualDepreciationAmount;
- @ApiModelProperty("璁惧绫诲瀷")
+ @Schema(description = "璁惧绫诲瀷")
private String type;
}
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index f4e71c5..75b870c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.device.pojo.DeviceMaintenance;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -12,40 +12,40 @@
public class DeviceMaintenanceDto extends DeviceMaintenance {
- @ApiModelProperty("璁惧淇濆吇id")
+ @Schema(description = "璁惧淇濆吇id")
private Long id;
- @ApiModelProperty("璁惧鍙拌处id")
+ @Schema(description = "璁惧鍙拌处id")
private Long deviceLedgerId;
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("瀹為檯淇濆吇浜�")
+ @Schema(description = "瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+ @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
+ @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
private LocalDateTime updateTime;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
private String updateUserName;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
private Long tenantId;
- @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ @Schema(description = "鍒涘缓浜哄悕绉�")
private String createUserName;
}
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 4ab8513..34b3086 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -1,15 +1,15 @@
package com.ruoyi.device.dto;
import com.ruoyi.device.pojo.DeviceRepair;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class DeviceRepairDto extends DeviceRepair {
- @ApiModelProperty("鎶ヤ慨鏃堕棿瀛楃涓�")
+ @Schema(description = "鎶ヤ慨鏃堕棿瀛楃涓�")
private String repairTimeStr;
- @ApiModelProperty("缁翠慨鏃堕棿瀛楃涓�")
+ @Schema(description = "缁翠慨鏃堕棿瀛楃涓�")
private String maintenanceTimeStr;
}
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
index 01906d6..a9eafa8 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -26,7 +26,7 @@
@Excel(name = "璁惧绫诲瀷",sort = 0,combo = {"鐢熶骇璁惧","鍔炲叕璁惧","妫�鏌ヨ澶�","杩愯緭璁惧","鍏朵粬璁惧"})
private String type;
- @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "璁″垝杩愯鏃堕棿",sort = 10,dateFormat = "yyyy-MM-dd")
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 2f0e29c..0614da2 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.device.execl;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -13,39 +13,39 @@
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
@Excel(name = "瑙勬牸鍨嬪彿")
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
@Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+ @Schema(description = "璁″垝淇濆吇鏃ユ湡")
private Date maintenancePlanTime;
- @ApiModelProperty("瀹為檯淇濆吇浜�")
+ @Schema(description = "瀹為檯淇濆吇浜�")
@Excel(name = "瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+ @Schema(description = "瀹為檯淇濆吇鏃ユ湡")
@Excel(name = "瀹為檯淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private LocalDateTime maintenanceActuallyTime;
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+ @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
@Excel(name = "淇濆吇缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
+ @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
@Excel(name = "鐘舵��")
private String status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@Excel(name = "褰曞叆鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private Date createTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
// @Excel(name = "褰曞叆浜�")
private String createUser;
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index 9d16e4d..7e0a580 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -2,7 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -11,48 +11,48 @@
@Data
public class DeviceRepairExeclDto {
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("璁惧鍨嬪彿")
+ @Schema(description = "璁惧鍨嬪彿")
@Excel(name = "璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
+ @Schema(description = "鎶ヤ慨鏃堕棿")
@Excel(name = "鎶ヤ慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date repairTime;
- @ApiModelProperty("鎶ヤ慨浜�")
+ @Schema(description = "鎶ヤ慨浜�")
@Excel(name = "鎶ヤ慨浜�")
private String repairName;
- @ApiModelProperty("鎶ヤ慨鍐呭")
+ @Schema(description = "鎶ヤ慨鍐呭")
@Excel(name = "鎶ヤ慨鍐呭")
private String remark;
- @ApiModelProperty("缁翠慨浜�")
+ @Schema(description = "缁翠慨浜�")
@Excel(name = "缁翠慨浜�")
private String maintenanceName;
- @ApiModelProperty("缁翠慨鏃堕棿")
+ @Schema(description = "缁翠慨鏃堕棿")
@Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime maintenanceTime;
- @ApiModelProperty("缁翠慨缁撴灉")
+ @Schema(description = "缁翠慨缁撴灉")
@Excel(name = "缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��")
private String statusStr;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@Excel(name = "褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime createTime;
// @Excel(name = "褰曞叆浜�")
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private String createUser;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
index 6943b0a..f188b35 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -13,39 +13,39 @@
@Data
@TableName("device_defect_record")
public class DeviceDefectRecord {
- @ApiModelProperty("璁惧缂洪櫡璁板綍id")
+ @Schema(description = "璁惧缂洪櫡璁板綍id")
private Long id;
- @ApiModelProperty("璁惧鍙拌处id")
+ @Schema(description = "璁惧鍙拌处id")
private Long deviceLedgerId;
- @ApiModelProperty("缂洪櫡鎻忚堪")
+ @Schema(description = "缂洪櫡鎻忚堪")
private String defectDescription;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty("娑堥櫎鏃堕棿")
+ @Schema(description = "娑堥櫎鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime eliminateTime;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index cd55444..61239ac 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("device_ledger")
-@ApiModel
+@Schema
public class DeviceLedger {
/**
@@ -30,25 +29,25 @@
/**
* 璁惧鍚嶇О
*/
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
/**
* 瑙勬牸鍨嬪彿
*/
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
/**
* 璁惧鍝佺墝
*/
- @ApiModelProperty("璁惧鍝佺墝")
+ @Schema(description = "璁惧鍝佺墝")
private String deviceBrand;
/**
* 瀛樻斁浣嶇疆
*/
- @ApiModelProperty("瀛樻斁浣嶇疆")
+ @Schema(description = "瀛樻斁浣嶇疆")
private String storageLocation;
/**
@@ -122,42 +121,42 @@
/* *************************** 杩愯绠＄悊 *************************** */
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planRuntimeTime;
- @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+ @Schema(description = "寮�濮嬭繍琛屾椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startRuntimeTime;
- @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+ @Schema(description = "缁撴潫杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endRuntimeTime;
- @ApiModelProperty("杩愯鏃堕暱")
+ @Schema(description = "杩愯鏃堕暱")
private String runtimeDuration;
- @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+ @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
private Integer isDepr;
- @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+ @Schema(description = "姣忓勾鎶樻棫閲戦")
private BigDecimal annualDepreciationAmount;
@TableField(exist = false)
- @ApiModelProperty("绱鎶樻棫")
+ @Schema(description = "绱鎶樻棫")
private BigDecimal deprAmount;
@TableField(exist = false)
- @ApiModelProperty("鍑�鍊�")
+ @Schema(description = "鍑�鍊�")
private BigDecimal netValue;
- @ApiModelProperty("璁惧绫诲瀷")
+ @Schema(description = "璁惧绫诲瀷")
private String type;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index cbf8dbf..2294338 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,31 +13,31 @@
@Data
@TableName("device_maintenance")
-@ApiModel("璁惧淇濆吇璁板綍")
+@Schema(name = "璁惧淇濆吇璁板綍")
public class DeviceMaintenance {
- @ApiModelProperty("璁惧淇濆吇id")
+ @Schema(description = "璁惧淇濆吇id")
private Long id;
- @ApiModelProperty("璁惧鍙拌处id")
+ @Schema(description = "璁惧鍙拌处id")
private Long deviceLedgerId;
- @ApiModelProperty("淇濆吇浠诲姟id")
+ @Schema(description = "淇濆吇浠诲姟id")
private Long maintenanceTaskId;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "棰戞璇︽儏")
+ @Schema(description = "棰戞璇︽儏")
private String frequencyDetail;
- @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
+ @Schema(description = "涓嬫鎵ц鏃堕棿")
private LocalDateTime nextExecutionTime;
- @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
+ @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @ApiModelProperty(value = "璁惧绫荤洰")
+ @Schema(description = "璁惧绫荤洰")
private String machineryCategory;
@@ -46,53 +45,53 @@
private String deviceModel;
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+ @Schema(description = "璁″垝淇濆吇鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime maintenancePlanTime;
- @ApiModelProperty("瀹為檯淇濆吇浜�")
+ @Schema(description = "瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+ @Schema(description = "瀹為檯淇濆吇鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime maintenanceActuallyTime;
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+ @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
+ @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("棰嗙敤澶囦欢ids")
+ @Schema(description = "棰嗙敤澶囦欢ids")
private String sparePartsIds;
- @ApiModelProperty("浣跨敤澶囦欢鍒楄〃")
+ @Schema(description = "浣跨敤澶囦欢鍒楄〃")
@TableField(exist = false)
private List<SparePartUse> sparePartsUseList;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
index 352ea9a..a6ae8ae 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("device_maintenance_file")
-@ApiModel(value = "DeviceMaintenanceFile瀵硅薄", description = "璁惧淇濆吇璁板綍闄勪欢")
+@Schema(name = "DeviceMaintenanceFile瀵硅薄", description = "璁惧淇濆吇璁板綍闄勪欢")
public class DeviceMaintenanceFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,35 +30,35 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty("鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty("鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private Integer fileSize;
- @ApiModelProperty("璁惧淇濆吇璁板綍ID")
+ @Schema(description = "璁惧淇濆吇璁板綍ID")
private Integer deviceMaintenanceId;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 7beedee..a469ee1 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,71 +16,71 @@
@TableName("device_repair")
public class DeviceRepair {
- @ApiModelProperty("璁惧鎶ヤ慨id")
+ @Schema(description = "璁惧鎶ヤ慨id")
private Long id;
- @ApiModelProperty("璁惧鍙拌处id")
+ @Schema(description = "璁惧鍙拌处id")
private Long deviceLedgerId;
private String deviceName;
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
+ @Schema(description = "鎶ヤ慨鏃堕棿")
private Date repairTime;
- @ApiModelProperty("鎶ヤ慨浜�")
+ @Schema(description = "鎶ヤ慨浜�")
private String repairName;
- @ApiModelProperty("鎶ヤ慨鍐呭")
+ @Schema(description = "鎶ヤ慨鍐呭")
private String remark;
- @ApiModelProperty(value = "璁惧绫荤洰")
+ @Schema(description = "璁惧绫荤洰")
private String machineryCategory;
- @ApiModelProperty("缁翠慨浜�")
+ @Schema(description = "缁翠慨浜�")
private String maintenanceName;
- @ApiModelProperty("缁翠慨鏃堕棿")
+ @Schema(description = "缁翠慨鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime maintenanceTime;
- @ApiModelProperty("缁翠慨缁撴灉")
+ @Schema(description = "缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
+ @Schema(description = "鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("棰嗙敤澶囦欢ids")
+ @Schema(description = "棰嗙敤澶囦欢ids")
private String sparePartsIds;
- @ApiModelProperty("浣跨敤澶囦欢鍒楄〃")
+ @Schema(description = "浣跨敤澶囦欢鍒楄〃")
@TableField(exist = false)
private List<SparePartUse> sparePartsUseList;
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index ad9a709..0edfc7b 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -20,13 +19,13 @@
* @date : 2025/9/19 10:27
*/
@Data
-@ApiModel
+@Schema
@TableName("maintenance_task")
public class MaintenanceTask {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
/**
@@ -35,75 +34,75 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "淇濆吇浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "璁惧id")
+ @Schema(description = "璁惧id")
private Long taskId;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
@Excel(name = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "棰戞璇︽儏")
+ @Schema(description = "棰戞璇︽儏")
@Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
- @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
+ @Schema(description = "涓嬫鎵ц鏃堕棿")
private LocalDateTime nextExecutionTime;
- @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
+ @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @ApiModelProperty(value = "鏄惁婵�娲�")
+ @Schema(description = "鏄惁婵�娲�")
private boolean isActive;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "褰曞叆浜篿d")
+ @Schema(description = "褰曞叆浜篿d")
private Long registrantId;
- @ApiModelProperty(value = "褰曞叆浜�")
+ @Schema(description = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String registrant;
- @ApiModelProperty(value = "褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate registrationDate;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
@TableField(exist = false)
private String dateStr;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
// @JsonFormat(pattern = "yyyy-MM-dd")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/dto/DateQueryDto.java b/src/main/java/com/ruoyi/dto/DateQueryDto.java
index c653fea..22dac0e 100644
--- a/src/main/java/com/ruoyi/dto/DateQueryDto.java
+++ b/src/main/java/com/ruoyi/dto/DateQueryDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.dto;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -10,14 +9,14 @@
* @date : 2025/7/23 11:31
*/
@Data
-@ApiModel
+@Schema
public class DateQueryDto {
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@TableField(exist = false)
private String entryDateStart;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@TableField(exist = false)
private String entryDateEnd;
diff --git a/src/main/java/com/ruoyi/dto/MapDto.java b/src/main/java/com/ruoyi/dto/MapDto.java
index 4a8847c..ddf3bd5 100644
--- a/src/main/java/com/ruoyi/dto/MapDto.java
+++ b/src/main/java/com/ruoyi/dto/MapDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,16 +10,16 @@
* @date : 2025/7/25 10:37
*/
@Data
-@ApiModel
+@Schema
public class MapDto {
- @ApiModelProperty(value = "鍚嶇О")
+ @Schema(description = "鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏁伴噺")
+ @Schema(description = "鏁伴噺")
private String value;
- @ApiModelProperty(value = "鍗犳瘮")
+ @Schema(description = "鍗犳瘮")
private String rate;
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
index 8f11b13..bba6088 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -9,8 +9,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +18,7 @@
import java.util.List;
@RestController
-@Api(tags = "鐢ㄧ數鍖哄煙")
+@Tag(name = "鐢ㄧ數鍖哄煙")
@RequestMapping("/electricityConsumptionArea")
@AllArgsConstructor
public class ElectricityConsumptionAreaController extends BaseController {
@@ -34,7 +34,7 @@
}
@GetMapping("/listPage")
- @ApiOperation("鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
IPage<ElectricityConsumptionArea> listPage = electricityConsumptionAreaService.listPage(page, electricityConsumptionArea);
@@ -42,7 +42,7 @@
}
@PostMapping("/add")
- @ApiOperation("鐢ㄧ數鍖哄煙-鏂板")
+ @Operation(summary = "鐢ㄧ數鍖哄煙-鏂板")
@Log(title = "鐢ㄧ數鍖哄煙-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
boolean save = electricityConsumptionAreaService.saveOrUpdate(electricityConsumptionArea);
@@ -50,7 +50,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鐢ㄧ數鍖哄煙-鍒犻櫎")
+ @Operation(summary = "鐢ㄧ數鍖哄煙-鍒犻櫎")
@Log(title = "鐢ㄧ數鍖哄煙-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index af51f43..e0409b5 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -9,8 +9,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
@@ -20,13 +20,13 @@
@RestController
@RequestMapping("/energyPeriod")
-@Api(tags = "鐢ㄧ數鏃舵")
+@Tag(name = "鐢ㄧ數鏃舵")
@AllArgsConstructor
public class EnergyPeriodController extends BaseController {
private final EnergyPeriodService energyPeriodService;
@GetMapping("/listPage")
- @ApiOperation("鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, EnergyPeriod energyPeriod) {
IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
@@ -34,7 +34,7 @@
}
@PostMapping("/add")
- @ApiOperation("鐢ㄧ數鏃舵-鏂板")
+ @Operation(summary = "鐢ㄧ數鏃舵-鏂板")
@Log(title = "鐢ㄧ數鏃舵-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody EnergyPeriod energyPeriod) {
boolean save = energyPeriodService.save(energyPeriod);
@@ -42,7 +42,7 @@
}
@PostMapping("/addBatch")
- @ApiOperation("鐢ㄧ數鏃舵-鎵归噺鏂板")
+ @Operation(summary = "鐢ㄧ數鏃舵-鎵归噺鏂板")
@Log(title = "鐢ㄧ數鏃舵-鎵归噺鏂板", businessType = BusinessType.INSERT)
public AjaxResult addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
boolean save = energyPeriodService.saveBatch(energyPeriods);
@@ -50,7 +50,7 @@
}
@PostMapping("/update")
- @ApiOperation("鐢ㄧ數鏃舵-淇敼")
+ @Operation(summary = "鐢ㄧ數鏃舵-淇敼")
@Log(title = "鐢ㄧ數鏃舵-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody EnergyPeriod energyPeriod) {
boolean update = energyPeriodService.updateById(energyPeriod);
@@ -58,7 +58,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鐢ㄧ數鏃舵-鍒犻櫎")
+ @Operation(summary = "鐢ㄧ數鏃舵-鍒犻櫎")
@Log(title = "鐢ㄧ數鏃舵-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -72,7 +72,7 @@
*/
@Log(title = "瀵煎嚭鐢ㄧ數鏃舵", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鐢ㄧ數鏃舵")
+ @Operation(summary = "瀵煎嚭鐢ㄧ數鏃舵")
public void export(HttpServletResponse response) {
Page page = new Page(-1, -1);
EnergyPeriod energyPeriod = new EnergyPeriod();
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index 0bddae6..d401a99 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -13,8 +13,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +31,7 @@
* @date : 2025/7/29 13:19
*/
@RestController
-@Api(tags = "璁惧鑳借��")
+@Tag(name = "璁惧鑳借��")
@RequestMapping("/equipmentEnergyConsumption")
@AllArgsConstructor
public class EquipmentEnergyConsumptionController extends BaseController {
@@ -39,7 +39,7 @@
private EquipmentEnergyConsumptionService equipmentEnergyConsumptionService;
@GetMapping("/listPage")
- @ApiOperation("璁惧鑳借��-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁惧鑳借��-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
@@ -47,7 +47,7 @@
}
@GetMapping("/deviceList")
- @ApiOperation("璁惧鍙拌处-鏌ヨ")
+ @Operation(summary = "璁惧鍙拌处-鏌ヨ")
@Log(title = "璁惧鍙拌处-鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult deviceList(DeviceLedger deviceLedger) {
List<DeviceLedger> listPage = equipmentEnergyConsumptionService.deviceList(deviceLedger);
@@ -55,7 +55,7 @@
}
@PostMapping("/add")
- @ApiOperation("璁惧鑳借��-鏂板")
+ @Operation(summary = "璁惧鑳借��-鏂板")
@Log(title = "璁惧鑳借��-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean save = equipmentEnergyConsumptionService.save(equipmentEnergyConsumption);
@@ -63,7 +63,7 @@
}
@PostMapping("/addBatch")
- @ApiOperation("璁惧鑳借��-鎵归噺鏂板")
+ @Operation(summary = "璁惧鑳借��-鎵归噺鏂板")
@Log(title = "璁惧鑳借��-鎵归噺鏂板", businessType = BusinessType.INSERT)
public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
boolean save = equipmentEnergyConsumptionService.saveBatch(list);
@@ -71,7 +71,7 @@
}
@PostMapping("/update")
- @ApiOperation("璁惧鑳借��-淇敼")
+ @Operation(summary = "璁惧鑳借��-淇敼")
@Log(title = "璁惧鑳借��-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean update = equipmentEnergyConsumptionService.updateById(equipmentEnergyConsumption);
@@ -79,7 +79,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("璁惧鑳借��-鍒犻櫎")
+ @Operation(summary = "璁惧鑳借��-鍒犻櫎")
@Log(title = "璁惧鑳借��-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -92,7 +92,7 @@
*/
@Log(title = "瀵煎叆璁惧鑳借��", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- @ApiOperation("瀵煎叆璁惧鑳借��")
+ @Operation(summary = "瀵煎叆璁惧鑳借��")
public AjaxResult importData(MultipartFile file) throws Exception {
return equipmentEnergyConsumptionService.importData(file);
}
@@ -102,7 +102,7 @@
*/
@Log(title = "瀵煎嚭璁惧鑳借��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭璁惧鑳借��")
+ @Operation(summary = "瀵煎嚭璁惧鑳借��")
public void export(HttpServletResponse response) {
Page page = new Page<>(-1,-1);
EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
@@ -112,7 +112,7 @@
}
@GetMapping("/listPageByTrend")
- @ApiOperation("璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
@@ -124,7 +124,7 @@
*/
@Log(title = "瀵煎嚭鑳芥簮瓒嬪娍", businessType = BusinessType.EXPORT)
@PostMapping("/exportTwo")
- @ApiOperation("瀵煎嚭鑳芥簮瓒嬪娍")
+ @Operation(summary = "瀵煎嚭鑳芥簮瓒嬪娍")
public void exportTwo(HttpServletResponse response) {
Page page = new Page<>(-1,-1);
EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
index b481090..1ce0969 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/ElectricityConsumptionAreaTreeDto.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.basic.dto.ProductTreeDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java
index 15689d0..f21660a 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/dto/EquipmentEnergyConsumptionDto.java
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -28,28 +28,28 @@
/**
* 璁惧缂栧彿
*/
- @ApiModelProperty("璁惧缂栧彿")
+ @Schema(description = "璁惧缂栧彿")
@Excel(name = "瑙勬牸鍨嬪彿")
private String code;
/**
* 璁惧鍚嶇О
*/
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String name;
/**
* 棰濆畾鍔熺巼
*/
- @ApiModelProperty("棰濆畾鍔熺巼")
+ @Schema(description = "棰濆畾鍔熺巼")
// @Excel(name = "棰濆畾鍔熺巼")
private String powerRating;
/**
* 瀹為檯鍔熺巼
*/
- @ApiModelProperty("瀹為檯鍔熺巼")
+ @Schema(description = "瀹為檯鍔熺巼")
// @Excel(name = "瀹為檯鍔熺巼")
private String powerActual;
@@ -57,14 +57,14 @@
/**
* 褰撴棩鐢ㄧ數閲�
*/
- @ApiModelProperty("褰撴棩鐢ㄧ數閲�")
+ @Schema(description = "褰撴棩鐢ㄧ數閲�")
// @Excel(name = "褰撴棩鐢ㄧ數閲�")
private BigDecimal dayNum;
/**
* 鏄ㄧ敤鐢甸噺
*/
- @ApiModelProperty("鏄ㄧ敤鐢甸噺")
+ @Schema(description = "鏄ㄧ敤鐢甸噺")
@TableField(exist = false)
@Excel(name = "鏄ㄧ敤鐢甸噺")
private BigDecimal toDayNum;
@@ -72,7 +72,7 @@
/**
* 鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級
*/
- @ApiModelProperty("鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
+ @Schema(description = "鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
@TableField(exist = false)
@Excel(name = "鏈湀骞冲潎鐢甸噺")
private BigDecimal avgNum;
@@ -81,7 +81,7 @@
/**
* 瓒嬪娍
*/
- @ApiModelProperty("瓒嬪娍")
+ @Schema(description = "瓒嬪娍")
@TableField(exist = false)
@Excel(name = "瓒嬪娍")
private String trend;
@@ -89,13 +89,13 @@
/**
* 绱鐢ㄧ數閲�
*/
- @ApiModelProperty("绱鐢ㄧ數閲�")
+ @Schema(description = "绱鐢ㄧ數閲�")
// @Excel(name = "绱鐢ㄧ數閲�")
private BigDecimal sumNum;
/**
* 杩愯鏃堕棿
*/
- @ApiModelProperty("杩愯鏃堕棿")
+ @Schema(description = "杩愯鏃堕棿")
@Excel(name = "杩愯鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date runDate;
@@ -103,7 +103,7 @@
/**
* 姣忔棩闄愬埗鐢甸噺
*/
- @ApiModelProperty("姣忔棩闄愬埗鐢甸噺")
+ @Schema(description = "姣忔棩闄愬埗鐢甸噺")
// @Excel(name = "姣忔棩闄愬埗鐢甸噺")
private BigDecimal everyNum;
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index 61442c4..c0101a2 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@TableName("electricity_consumption_area")
-@ApiModel
+@Schema
public class ElectricityConsumptionArea {
@TableId(value = "id", type = IdType.AUTO)
@@ -18,13 +17,13 @@
/**
* 鍖哄煙鍚嶇О
*/
- @ApiModelProperty("鍖哄煙鍚嶇О")
+ @Schema(description = "鍖哄煙鍚嶇О")
private String areaName;
/**
* 鍖哄煙绫诲瀷
*/
- @ApiModelProperty("鍖哄煙绫诲瀷")
+ @Schema(description = "鍖哄煙绫诲瀷")
private String areaType;
/**
* 鎺掑簭
@@ -40,7 +39,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index f5ed8da..876606c 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -2,29 +2,28 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@Data
@TableName("energy_period")
-@ApiModel
+@Schema
public class EnergyPeriod {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏃ユ湡
*/
- @ApiModelProperty("鏃ユ湡")
+ @Schema(description = "鏃ユ湡")
@Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
/**
* 鍗曚环
*/
- @ApiModelProperty("鍗曚环")
+ @Schema(description = "鍗曚环")
@Excel(name = "鍗曚环")
private Double price;
/**
@@ -35,28 +34,28 @@
/**
* 宄版
*/
- @ApiModelProperty("宄版")
+ @Schema(description = "宄版")
@Excel(name = "宄版")
private Double peak;
/**
* 璋锋
*/
- @ApiModelProperty("璋锋")
+ @Schema(description = "璋锋")
@Excel(name = "璋锋")
private Double valley;
/**
* 骞虫
*/
- @ApiModelProperty("骞虫")
+ @Schema(description = "骞虫")
@Excel(name = "骞虫")
private Double flat;
/**
* 灏栨
*/
- @ApiModelProperty("灏栨")
+ @Schema(description = "灏栨")
@Excel(name = "灏栨")
private Double sharp;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
index 6277fab..249e84b 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;
import lombok.Data;
@@ -19,7 +18,7 @@
*/
@Data
@TableName("equipment_energy_consumption")
-@ApiModel
+@Schema
public class EquipmentEnergyConsumption {
private static final long serialVersionUID = 1L;
@@ -30,28 +29,28 @@
/**
* 璁惧缂栧彿
*/
- @ApiModelProperty("璁惧缂栧彿")
+ @Schema(description = "璁惧缂栧彿")
@Excel(name = "璁惧缂栧彿")
private String code;
/**
* 璁惧鍚嶇О
*/
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String name;
/**
* 棰濆畾鍔熺巼
*/
- @ApiModelProperty("棰濆畾鍔熺巼")
+ @Schema(description = "棰濆畾鍔熺巼")
@Excel(name = "棰濆畾鍔熺巼")
private String powerRating;
/**
* 瀹為檯鍔熺巼
*/
- @ApiModelProperty("瀹為檯鍔熺巼")
+ @Schema(description = "瀹為檯鍔熺巼")
@Excel(name = "瀹為檯鍔熺巼")
private String powerActual;
@@ -59,21 +58,21 @@
/**
* 褰撴棩鐢ㄧ數閲�
*/
- @ApiModelProperty("褰撴棩鐢ㄧ數閲�")
+ @Schema(description = "褰撴棩鐢ㄧ數閲�")
@Excel(name = "褰撴棩鐢ㄧ數閲�")
private BigDecimal dayNum;
/**
* 鏄ㄧ敤鐢甸噺
*/
- @ApiModelProperty("鏄ㄧ敤鐢甸噺")
+ @Schema(description = "鏄ㄧ敤鐢甸噺")
@TableField(exist = false)
private BigDecimal toDayNum;
/**
* 鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級
*/
- @ApiModelProperty("鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
+ @Schema(description = "鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
@TableField(exist = false)
private BigDecimal avgNum;
@@ -81,20 +80,20 @@
/**
* 瓒嬪娍
*/
- @ApiModelProperty("瓒嬪娍")
+ @Schema(description = "瓒嬪娍")
@TableField(exist = false)
private String trend;
/**
* 绱鐢ㄧ數閲�
*/
- @ApiModelProperty("绱鐢ㄧ數閲�")
+ @Schema(description = "绱鐢ㄧ數閲�")
@Excel(name = "绱鐢ㄧ數閲�")
private BigDecimal sumNum;
/**
* 杩愯鏃堕棿
*/
- @ApiModelProperty("杩愯鏃堕棿")
+ @Schema(description = "杩愯鏃堕棿")
@Excel(name = "杩愯鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date runDate;
@@ -102,7 +101,7 @@
/**
* 姣忔棩闄愬埗鐢甸噺
*/
- @ApiModelProperty("姣忔棩闄愬埗鐢甸噺")
+ @Schema(description = "姣忔棩闄愬埗鐢甸噺")
@Excel(name = "姣忔棩闄愬埗鐢甸噺")
private BigDecimal everyNum;
diff --git a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index d4ac717..dcaa947 100644
--- a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -134,12 +134,15 @@
).permitAll();
// 4. swagger / druid 鏀捐
- requests.requestMatchers(
- "/swagger-ui.html",
- "/swagger-resources/**",
- "/webjars/**",
- "/*/api-docs",
- "/druid/**"
+ requests.requestMatchers(
+ "/swagger-ui.html",
+ "/doc.html",
+ "/swagger-ui/**",
+ "/swagger-resources/**",
+ "/v3/api-docs/**",
+ "/webjars/**",
+ "/*/api-docs",
+ "/druid/**"
).permitAll();
// 5. 鍏朵粬鍏ㄩ儴鎷︽埅
diff --git a/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
index ccf8d65..e42ef54 100644
--- a/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
@@ -1,124 +1,53 @@
-package com.ruoyi.framework.config;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-/**
- * Swagger2鐨勬帴鍙ｉ厤缃�
- *
- * @author ruoyi
- */
-@Configuration
-public class SwaggerConfig
-{
- /** 绯荤粺鍩虹閰嶇疆 */
- @Autowired
- private RuoYiConfig ruoyiConfig;
-
- /** 鏄惁寮�鍚痵wagger */
- @Value("${swagger.enabled}")
- private boolean enabled;
-
- /** 璁剧疆璇锋眰鐨勭粺涓�鍓嶇紑 */
- @Value("${swagger.pathMapping}")
- private String pathMapping;
-
- /**
- * 鍒涘缓API
- */
- @Bean
- public Docket createRestApi()
- {
- return new Docket(DocumentationType.OAS_30)
- // 鏄惁鍚敤Swagger
- .enable(enabled)
- // 鐢ㄦ潵鍒涘缓璇PI鐨勫熀鏈俊鎭紝灞曠ず鍦ㄦ枃妗ｇ殑椤甸潰涓紙鑷畾涔夊睍绀虹殑淇℃伅锛�
- .apiInfo(apiInfo())
- // 璁剧疆鍝簺鎺ュ彛鏆撮湶缁橲wagger灞曠ず
- .select()
- // 鎵弿鎵�鏈夋湁娉ㄨВ鐨刟pi锛岀敤杩欑鏂瑰紡鏇寸伒娲�
- .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
- // 鎵弿鎸囧畾鍖呬腑鐨剆wagger娉ㄨВ
- // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
- // 鎵弿鎵�鏈� .apis(RequestHandlerSelectors.any())
- .paths(PathSelectors.any())
- .build()
- /* 璁剧疆瀹夊叏妯″紡锛宻wagger鍙互璁剧疆璁块棶token */
- .securitySchemes(securitySchemes())
- .securityContexts(securityContexts());
-// .pathMapping(pathMapping);
- }
-
- /**
- * 瀹夊叏妯″紡锛岃繖閲屾寚瀹歵oken閫氳繃Authorization澶磋姹傚ご浼犻��
- */
- private List<SecurityScheme> securitySchemes()
- {
- List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
- apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
- return apiKeyList;
- }
-
- /**
- * 瀹夊叏涓婁笅鏂�
- */
- private List<SecurityContext> securityContexts()
- {
- List<SecurityContext> securityContexts = new ArrayList<>();
- securityContexts.add(
- SecurityContext.builder()
- .securityReferences(defaultAuth())
- .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
- .build());
- return securityContexts;
- }
-
- /**
- * 榛樿鐨勫畨鍏ㄤ笂寮曠敤
- */
- private List<SecurityReference> defaultAuth()
- {
- AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
- AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
- authorizationScopes[0] = authorizationScope;
- List<SecurityReference> securityReferences = new ArrayList<>();
- securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
- return securityReferences;
- }
-
- /**
- * 娣诲姞鎽樿淇℃伅
- */
- private ApiInfo apiInfo()
- {
- // 鐢ˋpiInfoBuilder杩涜瀹氬埗
- return new ApiInfoBuilder()
- // 璁剧疆鏍囬
- .title("鏍囬锛氳嫢渚濈鐞嗙郴缁焈鎺ュ彛鏂囨。")
- // 鎻忚堪
- .description("鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...")
- // 浣滆�呬俊鎭�
- .contact(new Contact(ruoyiConfig.getName(), null, null))
- // 鐗堟湰
- .version("鐗堟湰鍙�:" + ruoyiConfig.getVersion())
- .build();
- }
-}
+package com.ruoyi.framework.config;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * OpenAPI 鏂囨。閰嶇疆銆�
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "swagger", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class SwaggerConfig
+{
+ @Autowired
+ private RuoYiConfig ruoyiConfig;
+
+ @Bean
+ public OpenAPI openAPI()
+ {
+ String schemeName = "Authorization";
+ return new OpenAPI()
+ .info(new Info()
+ .title("鏍囬锛氳嫢渚濈鐞嗙郴缁熸帴鍙ｆ枃妗�")
+ .description("鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅锛屽叿浣撳寘鎷� XXX銆乆XX 妯″潡銆�")
+ .version("鐗堟湰鍙凤細" + ruoyiConfig.getVersion())
+ .contact(new Contact().name(ruoyiConfig.getName())))
+ .components(new Components().addSecuritySchemes(schemeName,
+ new SecurityScheme()
+ .name(schemeName)
+ .type(SecurityScheme.Type.APIKEY)
+ .in(SecurityScheme.In.HEADER)))
+ .addSecurityItem(new SecurityRequirement().addList(schemeName));
+ }
+
+ @Bean
+ public GroupedOpenApi defaultOpenApi()
+ {
+ return GroupedOpenApi.builder()
+ .group("default")
+ // 鎵弿椤圭洰鐪熷疄鏆撮湶鐨勬帴鍙ｈ矾寰勶紝涓嶇敤 swagger.pathMapping 鍋氫簩娆¤繃婊わ紝
+ // 鍚﹀垯鍍� /dev-api 杩欑被缃戝叧鍓嶇紑浼氭妸鏈湴 Controller 鍏ㄩ儴杩囨护鎺夈��
+ .pathsToMatch("/**")
+ .build();
+ }
+}
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index e372f5a..41ae224 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -9,8 +9,8 @@
import com.ruoyi.home.annotation.DefaultType;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +26,7 @@
* @date : 2025/7/25 9:15
*/
@RestController
-@Api(tags = "棣栭〉缁熻")
+@Tag(name = "棣栭〉缁熻")
@RequestMapping("/home")
@AllArgsConstructor
public class HomeController extends BaseController {
@@ -36,35 +36,35 @@
/********************************************************鍩虹绫�*****************************************************/
@GetMapping("/todos")
@Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
- @ApiOperation("寰呭姙浜嬮」")
+ @Operation(summary = "寰呭姙浜嬮」")
public AjaxResult todos(ApproveProcess req) throws ParseException {
List<ApproveProcess> approveProcessList = homeService.todos();
return AjaxResult.success(approveProcessList);
}
@GetMapping("/approveAndDeviceTodos")
- @ApiOperation("瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
+ @Operation(summary = "瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
public AjaxResult approveAndDeviceTodos(){
Map<String, Object> map = homeService.approveAndDeviceTodos();
return AjaxResult.success(map);
}
@GetMapping("/noticesCount")
- @ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
+ @Operation(summary = "鏈繃鏈熺殑鍏憡鏁伴噺")
public AjaxResult noticesCount(){
Long count = homeService.noticesCount();
return AjaxResult.success(count);
}
@GetMapping("/deptStaffDistribution")
- @ApiOperation("鍚勯儴闂ㄤ汉鍛樺垎甯�")
+ @Operation(summary = "鍚勯儴闂ㄤ汉鍛樺垎甯�")
public AjaxResult deptStaffDistribution() {
DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
return AjaxResult.success(dto);
}
@GetMapping("/summaryStatistics")
- @ApiOperation("鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
+ @Operation(summary = "鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
public AjaxResult summaryStatistics() {
HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
return AjaxResult.success(homeSummaryDto);
@@ -72,35 +72,35 @@
/********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/supplierPurchaseRanking")
- @ApiOperation("渚涘簲鍟嗛噰璐帓鍚�")
+ @Operation(summary = "渚涘簲鍟嗛噰璐帓鍚�")
public AjaxResult supplierPurchaseRanking(@DefaultType Integer type) {
List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
return AjaxResult.success(list);
}
@GetMapping("/customerRevenueAnalysis")
- @ApiOperation("瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
+ @Operation(summary = "瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
public AjaxResult customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
return AjaxResult.success(dto);
}
@GetMapping("/customerContributionRanking")
- @ApiOperation("瀹㈡埛閲戦璐＄尞鎺掑悕")
+ @Operation(summary = "瀹㈡埛閲戦璐＄尞鎺掑悕")
public AjaxResult customerContributionRanking(@DefaultType Integer type) {
List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
return AjaxResult.success(list);
}
@GetMapping("/productSalesAnalysis")
- @ApiOperation("鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
+ @Operation(summary = "鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
public AjaxResult productSalesAnalysis() {
List<MapDto> list = homeService.productSalesAnalysis();
return AjaxResult.success(list);
}
@GetMapping("/rawMaterialPurchaseAmountRatio")
- @ApiOperation("鍘熸潗鏂欓噰璐噾棰濆崰姣�")
+ @Operation(summary = "鍘熸潗鏂欓噰璐噾棰濆崰姣�")
public AjaxResult rawMaterialPurchaseAmountRatio(){
List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
return AjaxResult.success(list);
@@ -108,7 +108,7 @@
@GetMapping("/business")
@Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
- @ApiOperation("閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
+ @Operation(summary = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
public AjaxResult business(HomeBusinessDto req) {
HomeBusinessDto homeBusinessDto = homeService.business();
return AjaxResult.success(homeBusinessDto);
@@ -116,7 +116,7 @@
@GetMapping("/analysisCustomerContractAmounts")
@Log(title = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽", businessType = BusinessType.OTHER)
- @ApiOperation("瀹㈡埛鍚堝悓閲戦鍒嗘瀽")
+ @Operation(summary = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽")
public AjaxResult analysisCustomerContractAmounts(AnalysisCustomerContractAmountsDto req) {
AnalysisCustomerContractAmountsDto analysisCustomerContractAmounts = homeService.analysisCustomerContractAmounts();
return AjaxResult.success(analysisCustomerContractAmounts);
@@ -124,55 +124,55 @@
/********************************************************鐢熶骇绫�*****************************************************/
@GetMapping("/inputOutputAnalysis")
- @ApiOperation("鎶曞叆浜у嚭鍒嗘瀽")
+ @Operation(summary = "鎶曞叆浜у嚭鍒嗘瀽")
public AjaxResult inputOutputAnalysis(@DefaultType Integer type){
List<InputOutputAnalysisDto> list = homeService.inputOutputAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/processOutputAnalysis")
- @ApiOperation("宸ュ簭浜у嚭鍒嗘瀽")
+ @Operation(summary = "宸ュ簭浜у嚭鍒嗘瀽")
public AjaxResult processOutputAnalysis(@DefaultType Integer type){
List<MapDto> list = homeService.processOutputAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/workOrderEfficiencyAnalysis")
- @ApiOperation("宸ュ崟鎵ц鏁堢巼鍒嗘瀽")
+ @Operation(summary = "宸ュ崟鎵ц鏁堢巼鍒嗘瀽")
public AjaxResult workOrderEfficiencyAnalysis(@DefaultType Integer type){
List<WorkOrderEfficiencyDto> list = homeService.workOrderEfficiencyAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/productionAccountingAnalysis")
- @ApiOperation("鐢熶骇鏍哥畻鍒嗘瀽")
+ @Operation(summary = "鐢熶骇鏍哥畻鍒嗘瀽")
public AjaxResult productionAccountingAnalysis(@DefaultType Integer type){
List<ProductionAccountingDto> list = homeService.productionAccountingAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/orderCount")
- @ApiOperation("璁㈠崟鏁�")
+ @Operation(summary = "璁㈠崟鏁�")
public AjaxResult orderCount(){
return AjaxResult.success(homeService.orderCount());
}
@GetMapping("/progressStatistics")
- @ApiOperation("鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
+ @Operation(summary = "鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
public AjaxResult progressStatistics(){
ProductionProgressDto productionProgressDto = homeService.productionProgress();
return AjaxResult.success(productionProgressDto);
}
@GetMapping("/workInProcessTurnover")
- @ApiOperation("鍦ㄥ埗鍝佸懆杞儏鍐�")
+ @Operation(summary = "鍦ㄥ埗鍝佸懆杞儏鍐�")
public AjaxResult workInProcessTurnover(){
ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
return AjaxResult.success(productionTurnoverDto);
}
@GetMapping("/processDataProductionStatistics")
- @ApiOperation("宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁")
+ @Operation(summary = "宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁")
public AjaxResult processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
List<processDataProductionStatisticsDto> list = homeService.processDataProductionStatistics(type, processIds);
return AjaxResult.success(list);
@@ -180,53 +180,53 @@
/********************************************************璐ㄩ噺绫�*****************************************************/
@GetMapping("/rawMaterialDetection")
- @ApiOperation("鍘熸潗鏂欐娴�")
+ @Operation(summary = "鍘熸潗鏂欐娴�")
public AjaxResult rawMaterialDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.rawMaterialDetection(type));
}
@GetMapping("/processDetection")
- @ApiOperation("杩囩▼妫�娴�")
+ @Operation(summary = "杩囩▼妫�娴�")
public AjaxResult processDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.processDetection(type));
}
@GetMapping("/factoryDetection")
- @ApiOperation("鎴愬搧鍑哄巶妫�娴�")
+ @Operation(summary = "鎴愬搧鍑哄巶妫�娴�")
public AjaxResult factoryDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.factoryDetection(type));
}
@GetMapping("/qualityInspectionCount")
- @ApiOperation("璐ㄩ噺妫�楠屾暟閲�")
+ @Operation(summary = "璐ㄩ噺妫�楠屾暟閲�")
public AjaxResult qualityInspectionCount(){
QualityInspectionCountDto qualityInspectionCountDto = homeService.qualityInspectionCount();
return AjaxResult.success(qualityInspectionCountDto);
}
@GetMapping("/nonComplianceWarning")
- @ApiOperation("涓嶅悎鏍奸璀�")
+ @Operation(summary = "涓嶅悎鏍奸璀�")
public AjaxResult nonComplianceWarning(){
NonComplianceWarningDto nonComplianceWarningDto = homeService.nonComplianceWarning();
return AjaxResult.success(nonComplianceWarningDto);
}
@GetMapping("/completedInspectionCount")
- @ApiOperation("瀹屾垚妫�楠屾暟")
+ @Operation(summary = "瀹屾垚妫�楠屾暟")
public AjaxResult completedInspectionCount(){
List<CompletedInspectionCountDto> list = homeService.completedInspectionCount();
return AjaxResult.success(list);
}
@GetMapping("/unqualifiedProductRanking")
- @ApiOperation("涓嶅悎鏍间骇鍝佹帓鍚�")
+ @Operation(summary = "涓嶅悎鏍间骇鍝佹帓鍚�")
public AjaxResult unqualifiedProductRanking(){
List<UnqualifiedProductRankDto> list = homeService.unqualifiedProductRanking();
return AjaxResult.success(list);
}
@GetMapping("/unqualifiedProductProcessingAnalysis")
- @ApiOperation("涓嶅悎鏍兼鍝佸鐞嗗垎鏋�")
+ @Operation(summary = "涓嶅悎鏍兼鍝佸鐞嗗垎鏋�")
public AjaxResult unqualifiedProductProcessingAnalysis(){
List<MapDto> list = homeService.unqualifiedProductProcessingAnalysis();
return AjaxResult.success(list);
@@ -234,14 +234,14 @@
@GetMapping("/qualityStatistics")
@Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
- @ApiOperation("璐ㄩ噺鍒嗘瀽")
+ @Operation(summary = "璐ㄩ噺鍒嗘瀽")
public AjaxResult qualityStatistics(QualityStatisticsDto req) {
QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
return AjaxResult.success(qualityStatisticsDto);
}
@GetMapping("/qualityInspectionStatistics")
- @ApiOperation("璐ㄩ噺缁熻")
+ @Operation(summary = "璐ㄩ噺缁熻")
public AjaxResult qualityInspectionStatistics(@DefaultType Integer type) {
QualityStatisticsDto dto = homeService.qualityInspectionStatistics(type);
return AjaxResult.success(dto);
@@ -249,35 +249,35 @@
/********************************************************璐㈠姟绫�*****************************************************/
@GetMapping("/incomeExpenseAnalysis")
- @ApiOperation("鏀敹瀵规瘮鍒嗘瀽")
+ @Operation(summary = "鏀敹瀵规瘮鍒嗘瀽")
public AjaxResult incomeExpenseAnalysis(@DefaultType Integer type) {
List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
return AjaxResult.success(result);
}
@GetMapping("/profitTrendAnalysis")
- @ApiOperation("鍒╂鼎瓒嬪娍鍒嗘瀽")
+ @Operation(summary = "鍒╂鼎瓒嬪娍鍒嗘瀽")
public AjaxResult profitTrendAnalysis(){
List<MapDto> list = homeService.profitTrendAnalysis();
return AjaxResult.success(list);
}
@GetMapping("/expenseCompositionAnalysis")
- @ApiOperation("鏋勬垚鍒嗘瀽")
+ @Operation(summary = "鏋勬垚鍒嗘瀽")
public AjaxResult expenseCompositionAnalysis(@DefaultType Integer type) {
List<MapDto> list = homeService.expenseCompositionAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/monthlyIncome")
- @ApiOperation("鏈堝害鏀跺叆")
+ @Operation(summary = "鏈堝害鏀跺叆")
public AjaxResult monthlyIncome(){
MonthlyIncomeDto dto = homeService.monthlyIncome();
return AjaxResult.success(dto);
}
@GetMapping("/monthlyExpenditure")
- @ApiOperation("鏈堝害鏀嚭")
+ @Operation(summary = "鏈堝害鏀嚭")
public AjaxResult monthlyExpenditure(){
MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
return AjaxResult.success(dto);
@@ -285,7 +285,7 @@
@GetMapping("/statisticsReceivablePayable")
@Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
- @ApiOperation("搴旀敹搴斾粯缁熻")
+ @Operation(summary = "搴旀敹搴斾粯缁熻")
public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
return AjaxResult.success(statisticsReceivablePayable);
@@ -294,28 +294,28 @@
/********************************************************浠撳偍绫�*****************************************************/
@GetMapping("/productCategoryDistribution")
- @ApiOperation("浜у搧澶х被鍒嗗竷")
+ @Operation(summary = "浜у搧澶х被鍒嗗竷")
public AjaxResult productCategoryDistribution() {
ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
return AjaxResult.success(dto);
}
@GetMapping("/salesPurchaseStorageProductCount")
- @ApiOperation("閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
+ @Operation(summary = "閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
public AjaxResult salesPurchaseStorageProductCount(){
List<MapDto> list = homeService.salesPurchaseStorageProductCount();
return AjaxResult.success(list);
}
@GetMapping("/productInOutAnalysis")
- @ApiOperation("浜у搧鍑哄叆搴撳垎鏋�")
+ @Operation(summary = "浜у搧鍑哄叆搴撳垎鏋�")
public AjaxResult productInOutAnalysis(@DefaultType Integer type){
List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
return AjaxResult.success(result);
}
@GetMapping("/productTurnoverDays")
- @ApiOperation("浜у搧鍛ㄨ浆澶╂暟")
+ @Operation(summary = "浜у搧鍛ㄨ浆澶╂暟")
public AjaxResult productTurnoverDays(){
List<MapDto> list = homeService.productTurnoverDays();
return AjaxResult.success(list);
diff --git a/src/main/java/com/ruoyi/home/dto/AnalysisCustomerContractAmountsDto.java b/src/main/java/com/ruoyi/home/dto/AnalysisCustomerContractAmountsDto.java
index e126ff0..709dd7c 100644
--- a/src/main/java/com/ruoyi/home/dto/AnalysisCustomerContractAmountsDto.java
+++ b/src/main/java/com/ruoyi/home/dto/AnalysisCustomerContractAmountsDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.home.dto;
import com.ruoyi.dto.MapDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -13,16 +12,16 @@
* @date : 2025/7/25 10:31
*/
@Data
-@ApiModel
+@Schema
public class AnalysisCustomerContractAmountsDto {
- @ApiModelProperty(value = "鍚堝悓鎬婚噾棰�")
+ @Schema(description = "鍚堝悓鎬婚噾棰�")
private String sum;
- @ApiModelProperty(value = "鏃ョ幆姣�")
+ @Schema(description = "鏃ョ幆姣�")
private String chain;
- @ApiModelProperty(value = "鍛ㄥ悓姣�")
+ @Schema(description = "鍛ㄥ悓姣�")
private String yny;
private List<MapDto> item;
diff --git a/src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java b/src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java
index 2b6468d..1d174ba 100644
--- a/src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java
+++ b/src/main/java/com/ruoyi/home/dto/CustomerContributionRankingDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -10,12 +9,12 @@
* 瀹㈡埛閲戦璐＄尞鎺掑悕DTO
*/
@Data
-@ApiModel("瀹㈡埛閲戦璐＄尞鎺掑悕")
+@Schema(name = "瀹㈡埛閲戦璐＄尞鎺掑悕")
public class CustomerContributionRankingDto {
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("鍚堝悓鎬婚噾棰�")
+ @Schema(description = "鍚堝悓鎬婚噾棰�")
private BigDecimal totalAmount;
}
diff --git a/src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java b/src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java
index 1bad069..c5fc3d5 100644
--- a/src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java
+++ b/src/main/java/com/ruoyi/home/dto/CustomerRevenueAnalysisDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.home.dto;
import com.ruoyi.dto.MapDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -11,9 +10,9 @@
* 瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋怐TO
*/
@Data
-@ApiModel("瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
+@Schema(name = "瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
public class CustomerRevenueAnalysisDto {
- @ApiModelProperty("鍒嗘瀽鏉＄洰鍒楄〃")
+ @Schema(description = "鍒嗘瀽鏉＄洰鍒楄〃")
private List<MapDto> items;
}
diff --git a/src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java b/src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java
index 4ead293..5d61df3 100644
--- a/src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java
+++ b/src/main/java/com/ruoyi/home/dto/DeptStaffDistributionDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.home.dto;
import com.ruoyi.dto.MapDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -11,12 +10,12 @@
* 閮ㄩ棬浜哄憳鍒嗗竷缁熻DTO
*/
@Data
-@ApiModel("閮ㄩ棬浜哄憳鍒嗗竷缁熻")
+@Schema(name = "閮ㄩ棬浜哄憳鍒嗗竷缁熻")
public class DeptStaffDistributionDto {
- @ApiModelProperty("閮ㄩ棬鎬讳汉鏁�")
+ @Schema(description = "閮ㄩ棬鎬讳汉鏁�")
private Long total;
- @ApiModelProperty("閮ㄩ棬鍒嗗竷鍒楄〃")
+ @Schema(description = "閮ㄩ棬鍒嗗竷鍒楄〃")
private List<MapDto> items;
}
diff --git a/src/main/java/com/ruoyi/home/dto/HomeBusinessDto.java b/src/main/java/com/ruoyi/home/dto/HomeBusinessDto.java
index 6c5a20a..6e968a0 100644
--- a/src/main/java/com/ruoyi/home/dto/HomeBusinessDto.java
+++ b/src/main/java/com/ruoyi/home/dto/HomeBusinessDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,25 +10,25 @@
* @date : 2025/7/25 9:25
*/
@Data
-@ApiModel
+@Schema
public class HomeBusinessDto {
- @ApiModelProperty("鏈湀閿�鍞噾棰�")
+ @Schema(description = "鏈湀閿�鍞噾棰�")
private String monthSaleMoney = "0.00";
- @ApiModelProperty("鏈湀閿�鍞湭寮�绁ㄩ噾棰�")
+ @Schema(description = "鏈湀閿�鍞湭寮�绁ㄩ噾棰�")
private String monthSaleHaveMoney = "0.00";
- @ApiModelProperty("鏈湀閲囪喘閲戦")
+ @Schema(description = "鏈湀閲囪喘閲戦")
private String monthPurchaseMoney = "0.00";
- @ApiModelProperty("鏈湀閲囪喘鏈紑绁ㄩ噾棰�")
+ @Schema(description = "鏈湀閲囪喘鏈紑绁ㄩ噾棰�")
private String monthPurchaseHaveMoney = "0.00";
- @ApiModelProperty("褰撳墠搴撳瓨鏁伴噺")
+ @Schema(description = "褰撳墠搴撳瓨鏁伴噺")
private String inventoryNum = "0.00";
- @ApiModelProperty("浠婃棩搴撳瓨鏁伴噺")
+ @Schema(description = "浠婃棩搴撳瓨鏁伴噺")
private String todayInventoryNum = "0.00";
}
diff --git a/src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java b/src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java
index 9d8863b..42d3262 100644
--- a/src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java
+++ b/src/main/java/com/ruoyi/home/dto/HomeSummaryDto.java
@@ -1,31 +1,30 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 棣栭〉姹囨�荤粺璁TO
*/
@Data
-@ApiModel("棣栭〉姹囨�荤粺璁�")
+@Schema(name = "棣栭〉姹囨�荤粺璁�")
public class HomeSummaryDto {
- @ApiModelProperty("鎬诲伐浣滀汉鍛�")
+ @Schema(description = "鎬诲伐浣滀汉鍛�")
private Long totalStaff;
- @ApiModelProperty("鎬诲伐浣滀汉鍛樺悓姣斿闀跨巼")
+ @Schema(description = "鎬诲伐浣滀汉鍛樺悓姣斿闀跨巼")
private String staffGrowthRate;
- @ApiModelProperty("鎬诲鎴锋暟")
+ @Schema(description = "鎬诲鎴锋暟")
private Long totalCustomer;
- @ApiModelProperty("鎬诲鎴峰悓姣斿闀跨巼")
+ @Schema(description = "鎬诲鎴峰悓姣斿闀跨巼")
private String customerGrowthRate;
- @ApiModelProperty("鎬讳緵搴斿晢鏁�")
+ @Schema(description = "鎬讳緵搴斿晢鏁�")
private Long totalSupplier;
- @ApiModelProperty("鎬讳緵搴斿晢鍚屾瘮澧為暱鐜�")
+ @Schema(description = "鎬讳緵搴斿晢鍚屾瘮澧為暱鐜�")
private String supplierGrowthRate;
}
diff --git a/src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java b/src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java
index 5b11452..cc4359a 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductCategoryDistributionDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.home.dto;
import com.ruoyi.dto.MapDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -11,39 +10,39 @@
* 浜у搧澶х被鍒嗗竷缁熻DTO
*/
@Data
-@ApiModel("浜у搧澶х被鍒嗗竷缁熻")
+@Schema(name = "浜у搧澶х被鍒嗗竷缁熻")
public class ProductCategoryDistributionDto {
- @ApiModelProperty("澶х被鍒嗗竷鍒楄〃")
+ @Schema(description = "澶х被鍒嗗竷鍒楄〃")
private List<MajorCategoryDto> items;
@Data
public static class MajorCategoryDto {
- @ApiModelProperty("澶х被鍚嶇О")
+ @Schema(description = "澶х被鍚嶇О")
private String name;
- @ApiModelProperty("搴撳瓨鎬绘暟")
+ @Schema(description = "搴撳瓨鎬绘暟")
private String value;
- @ApiModelProperty("鍗犳瘮")
+ @Schema(description = "鍗犳瘮")
private String rate;
- @ApiModelProperty("灏忕被鍒嗗竷璇︽儏")
+ @Schema(description = "灏忕被鍒嗗竷璇︽儏")
private List<MinorCategoryDto> children;
}
@Data
public static class MinorCategoryDto {
- @ApiModelProperty("灏忕被鍚嶇О")
+ @Schema(description = "灏忕被鍚嶇О")
private String name;
- @ApiModelProperty("搴撳瓨鏁伴噺")
+ @Schema(description = "搴撳瓨鏁伴噺")
private String value;
- @ApiModelProperty("鍗犳瘮")
+ @Schema(description = "鍗犳瘮")
private String rate;
- @ApiModelProperty("鍨嬪彿鍒嗗竷璇︽儏")
+ @Schema(description = "鍨嬪彿鍒嗗竷璇︽儏")
private List<MapDto> children;
}
}
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
index 46373b2..852bbf8 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
@@ -1,22 +1,21 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Data
-@ApiModel
+@Schema
public class ProductionProgressDto {
- @ApiModelProperty("鎬昏鍗曟暟")
+ @Schema(description = "鎬昏鍗曟暟")
private Long totalOrderCount;
- @ApiModelProperty("宸插畬鎴愯鍗曟暟")
+ @Schema(description = "宸插畬鎴愯鍗曟暟")
private Long completedOrderCount;
- @ApiModelProperty("鏈畬鎴愯鍗曟暟")
+ @Schema(description = "鏈畬鎴愯鍗曟暟")
private Long uncompletedOrderCount;
- @ApiModelProperty("閮ㄥ垎瀹屾垚璁㈠崟鏁�")
+ @Schema(description = "閮ㄥ垎瀹屾垚璁㈠崟鏁�")
private Long partialCompletedOrderCount;
- @ApiModelProperty("璁㈠崟璇︽儏")
+ @Schema(description = "璁㈠崟璇︽儏")
private List<ProductionProgressOrderDto> completedOrderDetails;
}
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionProgressOrderDto.java b/src/main/java/com/ruoyi/home/dto/ProductionProgressOrderDto.java
index a219e3d..b53bfb3 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionProgressOrderDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionProgressOrderDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.home.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -11,47 +11,47 @@
@Data
public class ProductionProgressOrderDto {
- @ApiModelProperty("鐢熶骇璁㈠崟鍙�")
+ @Schema(description = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
- @ApiModelProperty("閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty("椤圭洰鍚嶇О")
+ @Schema(description = "椤圭洰鍚嶇О")
private String projectName;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productCategory;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ApiModelProperty("宸ヨ壓璺嚎缂栧彿")
+ @Schema(description = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal quantity;
- @ApiModelProperty("瀹屾垚鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @ApiModelProperty("瀹屾垚杩涘害")
+ @Schema(description = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
- @ApiModelProperty("BOM缂栧彿")
+ @Schema(description = "BOM缂栧彿")
private String bomNo;
- @ApiModelProperty("浜ゆ湡鍋忓樊")
+ @Schema(description = "浜ゆ湡鍋忓樊")
private Integer deliveryDaysDiff;
- @ApiModelProperty("浜ゆ湡")
+ @Schema(description = "浜ゆ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate deliveryDate;
- @ApiModelProperty("鏄惁鍙戣揣")
+ @Schema(description = "鏄惁鍙戣揣")
private Boolean isFh;
}
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionTaskStatisticsDto.java b/src/main/java/com/ruoyi/home/dto/ProductionTaskStatisticsDto.java
index dcde43f..28949d7 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionTaskStatisticsDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionTaskStatisticsDto.java
@@ -1,6 +1,6 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -9,42 +9,42 @@
@Data
public class ProductionTaskStatisticsDto {
- @ApiModelProperty("宸ュ崟ID")
+ @Schema(description = "宸ュ崟ID")
private Long id;
- @ApiModelProperty("宸ュ崟缂栧彿")
+ @Schema(description = "宸ュ崟缂栧彿")
private String workOrderNo;
- @ApiModelProperty("璁″垝寮�濮嬫椂闂�")
+ @Schema(description = "璁″垝寮�濮嬫椂闂�")
private LocalDate planStartTime;
- @ApiModelProperty("璁″垝缁撴潫鏃堕棿")
+ @Schema(description = "璁″垝缁撴潫鏃堕棿")
private LocalDate planEndTime;
- @ApiModelProperty("瀹為檯寮�濮嬫椂闂�")
+ @Schema(description = "瀹為檯寮�濮嬫椂闂�")
private LocalDate actualStartTime;
- @ApiModelProperty("瀹為檯缁撴潫鏃堕棿")
+ @Schema(description = "瀹為檯缁撴潫鏃堕棿")
private LocalDate actualEndTime;
- @ApiModelProperty("璁″垝鏁伴噺")
+ @Schema(description = "璁″垝鏁伴噺")
private BigDecimal planQuantity;
- @ApiModelProperty("瀹屾垚鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String processName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鐢熶骇璁㈠崟鍙�")
+ @Schema(description = "鐢熶骇璁㈠崟鍙�")
private String productOrderNpsNo;
}
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionTurnoverDto.java b/src/main/java/com/ruoyi/home/dto/ProductionTurnoverDto.java
index 80af148..02fdcd3 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionTurnoverDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionTurnoverDto.java
@@ -1,25 +1,24 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
-@ApiModel
+@Schema
public class ProductionTurnoverDto {
- @ApiModelProperty("鎬诲湪鍒舵暟閲�")
+ @Schema(description = "鎬诲湪鍒舵暟閲�")
private Long totalOrderCount;
- @ApiModelProperty("骞冲潎鍛ㄨ浆澶╂暟")
+ @Schema(description = "骞冲潎鍛ㄨ浆澶╂暟")
private BigDecimal averageTurnoverDays;
- @ApiModelProperty("鍛ㄨ浆鏁堢巼")
+ @Schema(description = "鍛ㄨ浆鏁堢巼")
private BigDecimal turnoverEfficiency;
- @ApiModelProperty("宸ュ簭璇︽儏")
+ @Schema(description = "宸ュ簭璇︽儏")
private List<String> processDetails;
- @ApiModelProperty("宸ュ簭瀵瑰簲鐨勬暟閲忚鎯�")
+ @Schema(description = "宸ュ簭瀵瑰簲鐨勬暟閲忚鎯�")
private List<Long> processQuantityDetails;
}
diff --git a/src/main/java/com/ruoyi/home/dto/QualityStatisticsDto.java b/src/main/java/com/ruoyi/home/dto/QualityStatisticsDto.java
index 970449a..16850b5 100644
--- a/src/main/java/com/ruoyi/home/dto/QualityStatisticsDto.java
+++ b/src/main/java/com/ruoyi/home/dto/QualityStatisticsDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -12,16 +11,16 @@
* @date : 2025/7/25 11:22
*/
@Data
-@ApiModel
+@Schema
public class QualityStatisticsDto {
- @ApiModelProperty(value = "鍘熸潗鏂欏凡妫�娴嬫暟")
+ @Schema(description = "鍘熸潗鏂欏凡妫�娴嬫暟")
private BigDecimal supplierNum;
- @ApiModelProperty(value = "鍑哄巶宸叉娴嬫暟")
+ @Schema(description = "鍑哄巶宸叉娴嬫暟")
private BigDecimal factoryNum;
- @ApiModelProperty(value = "杩囩▼宸叉娴嬫暟")
+ @Schema(description = "杩囩▼宸叉娴嬫暟")
private BigDecimal processNum;
private List<QualityStatisticsItem> item;
diff --git a/src/main/java/com/ruoyi/home/dto/QualityStatisticsItem.java b/src/main/java/com/ruoyi/home/dto/QualityStatisticsItem.java
index 38ca74a..35bc14a 100644
--- a/src/main/java/com/ruoyi/home/dto/QualityStatisticsItem.java
+++ b/src/main/java/com/ruoyi/home/dto/QualityStatisticsItem.java
@@ -1,7 +1,6 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,16 +10,16 @@
* @date : 2025/7/25 11:27
*/
@Data
-@ApiModel
+@Schema
public class QualityStatisticsItem {
- @ApiModelProperty(value = "鍘熸潗鏂欎笉鍚堟牸鏁�")
+ @Schema(description = "鍘熸潗鏂欎笉鍚堟牸鏁�")
private BigDecimal supplierNum;
- @ApiModelProperty(value = "鍑哄巶涓嶅悎鏍兼暟")
+ @Schema(description = "鍑哄巶涓嶅悎鏍兼暟")
private BigDecimal factoryNum;
- @ApiModelProperty(value = "杩囩▼涓嶅悎鏍兼暟")
+ @Schema(description = "杩囩▼涓嶅悎鏍兼暟")
private BigDecimal processNum;
private String date;
diff --git a/src/main/java/com/ruoyi/home/dto/StatisticsReceivablePayableDto.java b/src/main/java/com/ruoyi/home/dto/StatisticsReceivablePayableDto.java
index c929543..a16390c 100644
--- a/src/main/java/com/ruoyi/home/dto/StatisticsReceivablePayableDto.java
+++ b/src/main/java/com/ruoyi/home/dto/StatisticsReceivablePayableDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,19 +10,19 @@
* @date : 2025/7/25 13:34
*/
@Data
-@ApiModel
+@Schema
public class StatisticsReceivablePayableDto {
- @ApiModelProperty("搴旀敹閲戦")
+ @Schema(description = "搴旀敹閲戦")
private BigDecimal receivableMoney;
- @ApiModelProperty("搴斾粯閲戦")
+ @Schema(description = "搴斾粯閲戦")
private BigDecimal payableMoney;
- @ApiModelProperty("棰勬敹閲戦")
+ @Schema(description = "棰勬敹閲戦")
private BigDecimal advanceMoney;
- @ApiModelProperty("棰勪粯閲戦")
+ @Schema(description = "棰勪粯閲戦")
private BigDecimal prepayMoney;
}
diff --git a/src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java b/src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java
index db9c370..a397b24 100644
--- a/src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java
+++ b/src/main/java/com/ruoyi/home/dto/SupplierPurchaseRankingDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -10,12 +9,12 @@
* 渚涘簲鍟嗛噰璐帓鍚岲TO
*/
@Data
-@ApiModel("渚涘簲鍟嗛噰璐帓鍚�")
+@Schema(name = "渚涘簲鍟嗛噰璐帓鍚�")
public class SupplierPurchaseRankingDto {
- @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @ApiModelProperty("閲囪喘鎬婚噾棰�")
+ @Schema(description = "閲囪喘鎬婚噾棰�")
private BigDecimal totalAmount;
}
diff --git a/src/main/java/com/ruoyi/home/dto/WorkOrderEfficiencyDto.java b/src/main/java/com/ruoyi/home/dto/WorkOrderEfficiencyDto.java
index b9eb5fb..012a097 100644
--- a/src/main/java/com/ruoyi/home/dto/WorkOrderEfficiencyDto.java
+++ b/src/main/java/com/ruoyi/home/dto/WorkOrderEfficiencyDto.java
@@ -1,24 +1,23 @@
package com.ruoyi.home.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@Data
-@ApiModel("宸ュ崟鎵ц鏁堢巼鍒嗘瀽Dto")
+@Schema(name = "宸ュ崟鎵ц鏁堢巼鍒嗘瀽Dto")
public class WorkOrderEfficiencyDto {
- @ApiModelProperty(value = "鏃ユ湡")
+ @Schema(description = "鏃ユ湡")
private String date;
- @ApiModelProperty(value = "寮�宸ユ暟閲�")
+ @Schema(description = "寮�宸ユ暟閲�")
private BigDecimal startQuantity;
- @ApiModelProperty(value = "瀹屽伐鏁伴噺")
+ @Schema(description = "瀹屽伐鏁伴噺")
private BigDecimal finishQuantity;
- @ApiModelProperty(value = "鑹搧鐜�")
+ @Schema(description = "鑹搧鐜�")
private String yieldRate;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
index 34d6205..ecda3bd 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -8,8 +8,8 @@
import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.inspectiontask.service.InspectionTaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -22,7 +22,7 @@
* @date : 2025/9/19 10:52
*/
@RestController
-@Api(tags = "宸℃浠诲姟璁板綍")
+@Tag(name = "宸℃浠诲姟璁板綍")
@RequestMapping("/inspectionTask")
@AllArgsConstructor
public class InspectionTaskController extends BaseController {
@@ -33,7 +33,7 @@
* 宸℃浠诲姟琛ㄨ〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("宸℃浠诲姟琛ㄨ〃鏌ヨ")
+ @Operation(summary = "宸℃浠诲姟琛ㄨ〃鏌ヨ")
public R<IPage<InspectionTaskDto>> list(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page, inspectionTaskDto);
return R.ok(list);
@@ -44,7 +44,7 @@
* 瀵煎嚭
*/
@PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
+ @Operation(summary = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
public void export(HttpServletResponse response) {
Page page = new Page<>(-1, -1);
InspectionTaskDto timingTask = new InspectionTaskDto();
@@ -57,7 +57,7 @@
* 宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
*/
@PostMapping("/addOrEditInspectionTask")
- @ApiOperation("宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
+ @Operation(summary = "宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
@Transactional(rollbackFor = Exception.class)
public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) throws IOException {
return R.ok(inspectionTaskService.addOrEditInspectionTask(inspectionTaskDto));
@@ -67,7 +67,7 @@
* 宸℃浠诲姟琛ㄥ垹闄�
*/
@DeleteMapping("/delInspectionTask")
- @ApiOperation("宸℃浠诲姟琛ㄥ垹闄�")
+ @Operation(summary = "宸℃浠诲姟琛ㄥ垹闄�")
@Transactional(rollbackFor = Exception.class)
public R remove(@RequestBody Long[] ids) {
return R.ok(inspectionTaskService.delByIds(ids));
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
index 0d71102..9baaf09 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
@@ -7,8 +7,8 @@
import com.ruoyi.inspectiontask.dto.QrCodeDto;
import com.ruoyi.inspectiontask.pojo.QrCode;
import com.ruoyi.inspectiontask.service.QrCodeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,7 @@
* @date : 2025/9/19 10:52
*/
@RestController
-@Api(tags = "浜岀淮鐮佺鐞�")
+@Tag(name = "浜岀淮鐮佺鐞�")
@RequestMapping("/qrCode")
@AllArgsConstructor
public class QrCodeController extends BaseController {
@@ -28,7 +28,7 @@
* 浜岀淮鐮佺鐞嗚〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鏌ヨ")
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鏌ヨ")
public R<IPage<QrCode>> list(Page page, QrCodeDto qrCodeDto) {
IPage<QrCode> list = qrCodeService.selectQrCodeList(page, qrCodeDto);
return R.ok(list);
@@ -38,7 +38,7 @@
* 浜岀淮鐮佺鐞嗚〃鏂板淇敼
*/
@PostMapping("/addOrEditQrCode")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鏂板淇敼")
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鏂板淇敼")
public R<Long> addOrEditQrCode(@RequestBody QrCodeDto qrCodeDto) {
return R.ok(qrCodeService.addOrEditQrCode(qrCodeDto));
}
@@ -47,7 +47,7 @@
* 浜岀淮鐮佺鐞嗚〃鍒犻櫎
*/
@DeleteMapping("/delQrCode")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鍒犻櫎")
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鍒犻櫎")
public R remove(@RequestBody Long[] ids) {
return R.ok(qrCodeService.delByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
index 659f37e..f597205 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
@@ -7,8 +7,8 @@
import com.ruoyi.inspectiontask.dto.QrCodeScanRecordDto;
import com.ruoyi.inspectiontask.pojo.QrCodeScanRecord;
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +18,7 @@
* @date : 2025/9/19 10:53
*/
@RestController
-@Api(tags = "浜岀淮鐮佹壂鎻忚褰曠鐞�")
+@Tag(name = "浜岀淮鐮佹壂鎻忚褰曠鐞�")
@RequestMapping("/qrCodeScanRecord")
@AllArgsConstructor
public class QrCodeScanRecordController extends BaseController {
@@ -29,7 +29,7 @@
* 浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ")
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ")
public R<IPage<QrCodeScanRecordDto>> list(Page<QrCodeScanRecord> page, QrCodeScanRecordDto qrCodeScanRecordDto) {
IPage<QrCodeScanRecordDto> list = qrCodeScanRecordService.selectQrCodeScanRecordList(page, qrCodeScanRecordDto);
return R.ok(list);
@@ -39,7 +39,7 @@
* 浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼
*/
@PostMapping("/addOrEditQrCodeRecord")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼")
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼")
public R addOrEditQrCodeRecord(@RequestBody QrCodeScanRecordDto qrCodeScanRecordDto) {
return R.ok(qrCodeScanRecordService.addOrEditQrCodeRecord(qrCodeScanRecordDto));
}
@@ -48,7 +48,7 @@
* 浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎
*/
@DeleteMapping("/delSalesRecord")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎")
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎")
public R remove(@RequestBody Long[] ids) {
return R.ok(qrCodeScanRecordService.delByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
index c2b49a7..ad2e338 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
@@ -10,8 +10,8 @@
import com.ruoyi.inspectiontask.dto.TimingTaskDto;
import com.ruoyi.inspectiontask.pojo.TimingTask;
import com.ruoyi.inspectiontask.service.TimingTaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.quartz.SchedulerException;
@@ -22,7 +22,7 @@
* @date : 2025/9/19 10:53
*/
@RestController
-@Api(tags = "宸℃绠＄悊")
+@Tag(name = "宸℃绠＄悊")
@RequestMapping("/timingTask")
@AllArgsConstructor
public class TimingTaskController extends BaseController {
@@ -33,7 +33,7 @@
* 瀹氭椂宸℃浠诲姟琛ㄦ煡璇�
*/
@GetMapping("/list")
- @ApiOperation(value = "瀹氭椂浠诲姟鍒楄〃")
+ @Operation(summary = "瀹氭椂浠诲姟鍒楄〃")
public R<IPage<TimingTaskDto>> list(Page<TimingTask> page, TimingTask timingTask) {
IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page,timingTask);
return R.ok(list);
@@ -43,7 +43,7 @@
* 瀵煎嚭
*/
@PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟")
+ @Operation(summary = "瀵煎嚭瀹氭椂浠诲姟")
public void export(HttpServletResponse response) {
Page page = new Page<>(-1,-1);
TimingTaskDto timingTask = new TimingTaskDto();
@@ -56,7 +56,7 @@
* 瀹氭椂宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
*/
@PostMapping("/addOrEditTimingTask")
- @ApiOperation(value = "鏂板淇敼瀹氭椂浠诲姟")
+ @Operation(summary = "鏂板淇敼瀹氭椂浠诲姟")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
public R addOrEditTimingTask(@RequestBody TimingTaskDto timingTaskDto) throws SchedulerException {
return R.ok(timingTaskService.addOrEditTimingTask(timingTaskDto));
@@ -66,7 +66,7 @@
* 瀹氭椂宸℃浠诲姟琛ㄥ垹闄�
*/
@DeleteMapping("/delTimingTask")
- @ApiOperation(value = "鍒犻櫎瀹氭椂浠诲姟")
+ @Operation(summary = "鍒犻櫎瀹氭椂浠诲姟")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
public R remove(@RequestBody Long[] ids) {
return R.ok(timingTaskService.delByIds(ids));
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index dd11354..c41d626 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +14,7 @@
* @date : 2025/9/19 10:25
*/
@Data
-@ApiModel
+@Schema
@TableName("inspection_task")
public class InspectionTask {
@@ -27,65 +26,65 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "璁惧id")
+ @Schema(description = "璁惧id")
private Integer taskId;
- @ApiModelProperty(value = "宸℃浜篒D")
+ @Schema(description = "宸℃浜篒D")
private String inspectorId;
- @ApiModelProperty(value = "鎵ц宸℃鐨勪汉鍛樺鍚�")
+ @Schema(description = "鎵ц宸℃鐨勪汉鍛樺鍚�")
@Excel(name = "鎵ц宸℃浜哄憳")
private String inspector;
- @ApiModelProperty(value = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
+ @Schema(description = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "浠诲姟鐧昏浜篒D")
+ @Schema(description = "浠诲姟鐧昏浜篒D")
private Long registrantId;
- @ApiModelProperty(value = "浠诲姟鐧昏浜哄鍚�")
+ @Schema(description = "浠诲姟鐧昏浜哄鍚�")
@Excel(name = "鐧昏浜�")
private String registrant;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
@Excel(name = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "鏃堕棿缁嗚妭")
+ @Schema(description = "鏃堕棿缁嗚妭")
@Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
- @ApiModelProperty(value = "宸℃鍦扮偣璇︾粏鎻忚堪")
+ @Schema(description = "宸℃鍦扮偣璇︾粏鎻忚堪")
private String inspectionLocation;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛")
+ @Schema(description = "绉熸埛")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
index 55fc343..6c3ef6b 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
@@ -6,8 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +17,7 @@
* @date : 2025/9/19 10:29
*/
@Data
-@ApiModel
+@Schema
@TableName("qr_code")
public class QrCode {
@@ -30,34 +29,34 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty(value = "鎵�鍦ㄤ綅缃弿杩�")
+ @Schema(description = "鎵�鍦ㄤ綅缃弿杩�")
private String location;
- @ApiModelProperty(value = "绉熸埛ID锛岀敤浜庡绉熸埛闅旂")
+ @Schema(description = "绉熸埛ID锛岀敤浜庡绉熸埛闅旂")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java
index f487b67..86e5c7b 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +14,7 @@
*/
@Data
@TableName("qr_code_scan_record")
-@ApiModel
+@Schema
public class QrCodeScanRecord {
private static final long serialVersionUID = 1L;
@@ -26,19 +25,19 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鍏宠仈鐨勪簩缁寸爜ID")
+ @Schema(description = "鍏宠仈鐨勪簩缁寸爜ID")
private Long qrCodeId;
- @ApiModelProperty(value = "鎵爜浜虹敤鎴稩D")
+ @Schema(description = "鎵爜浜虹敤鎴稩D")
private Long scannerId;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty(value = "璁惧id")
+ @Schema(description = "璁惧id")
private Integer deviceId;
- @ApiModelProperty(value = "瀹為檯鎵爜鏃堕棿")
+ @Schema(description = "瀹為檯鎵爜鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime scanTime;
@@ -49,24 +48,24 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 4019ca0..2d8722e 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -6,8 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@@ -18,7 +17,7 @@
* @date : 2025/9/19 10:27
*/
@Data
-@ApiModel
+@Schema
@TableName("timing_task")
public class TimingTask {
@@ -30,80 +29,80 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "璁惧id")
+ @Schema(description = "璁惧id")
private Integer taskId;
- @ApiModelProperty(value = "宸℃浜�")
+ @Schema(description = "宸℃浜�")
@Excel(name = "鎵ц宸℃浜�")
private String inspectorIds;
- @ApiModelProperty(value = "宸℃鍦扮偣")
+ @Schema(description = "宸℃鍦扮偣")
private String inspectionLocation;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
@Excel(name = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "棰戞璇︽儏")
+ @Schema(description = "棰戞璇︽儏")
@Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
- @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
+ @Schema(description = "涓嬫鎵ц鏃堕棿")
private LocalDateTime nextExecutionTime;
- @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
+ @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @ApiModelProperty(value = "鏄惁婵�娲�")
+ @Schema(description = "鏄惁婵�娲�")
private boolean isActive;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "鐧昏浜篿d")
+ @Schema(description = "鐧昏浜篿d")
private Long registrantId;
- @ApiModelProperty(value = "鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
@Excel(name = "鐧昏浜�")
private String registrant;
- @ApiModelProperty(value = "鐧昏鏃ユ湡")
+ @Schema(description = "鐧昏鏃ユ湡")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDate registrationDate;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
@TableField(exist = false)
private String dateStr;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
// @JsonFormat(pattern = "yyyy-MM-dd")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 343501e..9b4779e 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -18,8 +18,8 @@
import com.ruoyi.lavorissue.service.LavorIssueService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +40,7 @@
* @date : 2025/8/13 11:19
*/
@RestController
-@Api(tags = "鍔充繚鍙戞斁")
+@Tag(name = "鍔充繚鍙戞斁")
@RequestMapping("/lavorIssue")
@AllArgsConstructor
public class LavorIssueController extends BaseController {
@@ -51,7 +51,7 @@
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, LaborIssue laborIssue){
IPage<LaborIssue> listPage = laborIssueService.listPage(page, laborIssue);
return AjaxResult.success(listPage);
@@ -59,7 +59,7 @@
@GetMapping("/statisticsList")
@Log(title = "鍔充繚鍙戞斁-缁熻鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍔充繚鍙戞斁-缁熻鏌ヨ")
+ @Operation(summary = "鍔充繚鍙戞斁-缁熻鏌ヨ")
public AjaxResult statisticsList(LaborIssue laborIssue){
List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
return AjaxResult.success(listPage);
@@ -67,7 +67,7 @@
@PostMapping("/add")
@Log(title = "鍔充繚鍙戞斁-娣诲姞", businessType = BusinessType.INSERT)
- @ApiOperation("鍔充繚鍙戞斁-娣诲姞")
+ @Operation(summary = "鍔充繚鍙戞斁-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody LaborIssue laborIssue){
String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
@@ -89,7 +89,7 @@
@PostMapping("/update")
@Log(title = "鍔充繚鍙戞斁-淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("鍔充繚鍙戞斁-淇敼")
+ @Operation(summary = "鍔充繚鍙戞斁-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody LaborIssue laborIssue){
boolean update = laborIssueService.updateById(laborIssue);
@@ -98,7 +98,7 @@
@DeleteMapping("/delete")
@Log(title = "鍔充繚鍙戞斁-鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("鍔充繚鍙戞斁-鍒犻櫎")
+ @Operation(summary = "鍔充繚鍙戞斁-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids){
boolean delete = laborIssueService.removeBatchByIds(ids);
@@ -106,7 +106,7 @@
}
@GetMapping("/statistics")
- @ApiOperation("鍔充繚鍙戞斁-缁熻")
+ @Operation(summary = "鍔充繚鍙戞斁-缁熻")
public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
return AjaxResult.success(statisticsLaborIssue);
@@ -119,7 +119,7 @@
*/
@Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
+ @Operation(summary = "鍔充繚鍙戞斁-瀵煎嚭")
public void export(HttpServletResponse response) {
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
ExcelUtil<LaborIssue> util = new ExcelUtil<LaborIssue>(LaborIssue.class);
@@ -139,7 +139,7 @@
*/
@Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/exportCopy")
- @ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
+ @Operation(summary = "鍔充繚鍙戞斁-瀵煎嚭")
public void exportCopy(HttpServletResponse response,LaborIssue laborIssue) throws UnsupportedEncodingException {
laborIssueService.exportCopy(response,laborIssue);
}
diff --git a/src/main/java/com/ruoyi/lavorissue/dto/StatisticsLaborIssue.java b/src/main/java/com/ruoyi/lavorissue/dto/StatisticsLaborIssue.java
index 7e7a4a2..bd733e6 100644
--- a/src/main/java/com/ruoyi/lavorissue/dto/StatisticsLaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/dto/StatisticsLaborIssue.java
@@ -1,6 +1,6 @@
package com.ruoyi.lavorissue.dto;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -11,7 +11,7 @@
* @date : 2025/8/14 11:53
*/
@Data
-@ApiModel
+@Schema
public class StatisticsLaborIssue {
private Integer season;
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index b1732d4..af9dd0e 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("labor_issue")
-@ApiModel
+@Schema
public class LaborIssue extends StartAndEndDateDto {
private static final long serialVersionUID = 1L;
@@ -27,7 +26,7 @@
private Long id;
@TableField(exist = false)
- @ApiModelProperty("1-宸查鍙栧姵淇濇暟閲� 2-鏈鍙栧姵淇濇暟閲� 3-瓒呮椂宸查鍙栧姵淇濇暟閲� 4-瓒呮椂鏈鍙栧姵淇濇暟閲�")
+ @Schema(description = "1-宸查鍙栧姵淇濇暟閲� 2-鏈鍙栧姵淇濇暟閲� 3-瓒呮椂宸查鍙栧姵淇濇暟閲� 4-瓒呮椂鏈鍙栧姵淇濇暟閲�")
private Integer status;
@TableField(exist = false)
@@ -36,7 +35,7 @@
/**
* 閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Schema(description = "閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String deptName;
@@ -44,20 +43,20 @@
/**
* 鍔充繚鍗曞彿
*/
- @ApiModelProperty("鍔充繚鍗曞彿")
+ @Schema(description = "鍔充繚鍗曞彿")
@Excel(name = "鍔充繚鍗曞彿")
private String orderNo;
/**
* 鍛樺伐id
*/
- @ApiModelProperty("鍛樺伐id")
+ @Schema(description = "鍛樺伐id")
private Long staffId;
/**
* 鍛樺伐鍚嶇О
*/
- @ApiModelProperty("鍛樺伐鍚嶇О")
+ @Schema(description = "鍛樺伐鍚嶇О")
@Excel(name = "鍛樺伐鍚嶇О")
@TableField(exist = false)
private String staffName;
@@ -65,7 +64,7 @@
/**
* 鍛樺伐缂栧彿
*/
- @ApiModelProperty("鍛樺伐缂栧彿")
+ @Schema(description = "鍛樺伐缂栧彿")
@Excel(name = "鍛樺伐缂栧彿")
@TableField(exist = false)
private String staffNo;
@@ -73,13 +72,13 @@
/**
* 鍔充繚绫诲瀷-瀛楀吀
*/
- @ApiModelProperty("鍔充繚绫诲瀷-瀛楀吀")
+ @Schema(description = "鍔充繚绫诲瀷-瀛楀吀")
private String dictType;
/**
* 鍔充繚绫诲瀷
*/
- @ApiModelProperty("鍔充繚绫诲瀷")
+ @Schema(description = "鍔充繚绫诲瀷")
@Excel(name = "鍔充繚绫诲瀷")
@TableField(exist = false)
private String dictTypeName;
@@ -87,13 +86,13 @@
/**
* 闃插叿鍚嶇О-瀛楀吀
*/
- @ApiModelProperty("闃插叿鍚嶇О-瀛楀吀")
+ @Schema(description = "闃插叿鍚嶇О-瀛楀吀")
private String dictId;
/**
* 闃插叿鍚嶇О
*/
- @ApiModelProperty("闃插叿鍚嶇О")
+ @Schema(description = "闃插叿鍚嶇О")
@Excel(name = "闃插叿鍚嶇О")
@TableField(exist = false)
private String dictName;
@@ -101,14 +100,14 @@
/**
* 棰嗙敤鏁伴噺
*/
- @ApiModelProperty("棰嗙敤鏁伴噺")
+ @Schema(description = "棰嗙敤鏁伴噺")
@Excel(name = "棰嗙敤鏁伴噺")
private Long num;
/**
* 杩涘巶鏃ユ湡
*/
- @ApiModelProperty("杩涘巶鏃ユ湡")
+ @Schema(description = "杩涘巶鏃ユ湡")
@Excel(name = "杩涘巶鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -117,7 +116,7 @@
/**
* 鍙戞斁鏃ユ湡
*/
- @ApiModelProperty("鍙戞斁鏃ユ湡")
+ @Schema(description = "鍙戞斁鏃ユ湡")
@Excel(name = "鍙戞斁鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -126,7 +125,7 @@
/**
* 棰嗙敤鏃ユ湡
*/
- @ApiModelProperty("棰嗙敤鏃ユ湡")
+ @Schema(description = "棰嗙敤鏃ユ湡")
@Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
index f5c4428..e092741 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
@@ -14,8 +14,8 @@
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -30,7 +30,7 @@
* @date : 2025/8/5 9:27
*/
@RestController
-@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处")
+@Tag(name = "璁￠噺鍣ㄥ叿鍙拌处")
@RequestMapping("/measuringInstrumentLedger")
@AllArgsConstructor
public class MeasuringInstrumentLedgerController extends BaseController {
@@ -41,7 +41,7 @@
@GetMapping("/listPage")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
IPage<MeasuringInstrumentLedger> listPage = measuringInstrumentLedgerService.listPage(page, measuringInstrumentLedger);
@@ -50,7 +50,7 @@
@PostMapping("/add")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鏂板")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鏂板")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鏂板", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
@@ -62,7 +62,7 @@
}
@PostMapping("/update")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-淇敼")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
@@ -79,7 +79,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -100,7 +100,7 @@
}
@PostMapping("/verifying")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
@@ -113,7 +113,7 @@
*/
@Log(title = "瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处")
+ @Operation(summary = "瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处")
public void export(HttpServletResponse response) {
measuringInstrumentLedgerService.export( response);
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 511832e..370d41d 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -9,8 +9,8 @@
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService;
import io.jsonwebtoken.lang.Collections;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +25,7 @@
* @date : 2025/8/5 9:28
*/
@RestController
-@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
+@Tag(name = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
@RequestMapping("/measuringInstrumentLedgerRecord")
@AllArgsConstructor
public class MeasuringInstrumentLedgerRecordController extends BaseController {
@@ -34,7 +34,7 @@
@GetMapping("/listPage")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
IPage<MeasuringInstrumentLedgerRecord> listPage = measuringInstrumentLedgerRecordService.listPage(page, measuringInstrumentLedgerRecord);
@@ -42,7 +42,7 @@
}
@PostMapping("/update")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
@@ -54,7 +54,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
@@ -64,7 +64,7 @@
/**
* 瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处
*/
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
index 269b136..5a328c1 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
@@ -9,8 +9,8 @@
import com.ruoyi.measuringinstrumentledger.dto.SparePartsDto;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,41 +19,41 @@
@RestController
@RequestMapping("/spareParts")
-@Api(tags = "澶囦欢鍒嗙被鎺ュ彛")
+@Tag(name = "澶囦欢鍒嗙被鎺ュ彛")
@AllArgsConstructor
public class SparePartsController {
private SparePartsService sparePartsService;
@GetMapping("/getTree")
- @ApiOperation("澶囦欢鍒嗙被-鏍戠粨鏋�")
+ @Operation(summary = "澶囦欢鍒嗙被-鏍戠粨鏋�")
public AjaxResult getTree(){
List<SparePartsDto> tree = sparePartsService.getTree();
return AjaxResult.success(tree);
}
@GetMapping("/listPage")
- @ApiOperation("澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
+ @Operation(summary = "澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SpareParts spareParts){
IPage<SparePartsDto> listPage = sparePartsService.listPage(page, spareParts);
return AjaxResult.success(listPage);
}
// @GetMapping("/list")
-// @ApiOperation("澶囦欢鍒嗙被-鏌ヨ鎵�鏈�")
+// @Operation(summary = "澶囦欢鍒嗙被-鏌ヨ鎵�鏈�")
// public AjaxResult list(){
// return AjaxResult.success(sparePartsService.list());
// }
@PostMapping("/add")
- @ApiOperation("澶囦欢鍒嗙被-娣诲姞")
+ @Operation(summary = "澶囦欢鍒嗙被-娣诲姞")
@Log(title = "澶囦欢鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody SpareParts spareParts){
return AjaxResult.success(sparePartsService.save(spareParts));
}
@PostMapping("/update")
- @ApiOperation("澶囦欢鍒嗙被-鏇存柊")
+ @Operation(summary = "澶囦欢鍒嗙被-鏇存柊")
@Log(title = "澶囦欢鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody SpareParts spareParts){
return AjaxResult.success(sparePartsService.updateById(spareParts));
}
@DeleteMapping("/delete/{id}")
- @ApiOperation("澶囦欢鍒嗙被-鍒犻櫎")
+ @Operation(summary = "澶囦欢鍒嗙被-鍒犻櫎")
@Log(title = "澶囦欢鍒嗙被-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@PathVariable Long id){
return AjaxResult.success(sparePartsService.removeById(id));
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
index 0ccf60e..26195a4 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsRequisitionRecordDto;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,13 +22,13 @@
*/
@RestController
@RequestMapping("/sparePartsRequisitionRecord")
-@Api(tags = "澶囦欢棰嗙敤璁板綍鎺ュ彛")
+@Tag(name = "澶囦欢棰嗙敤璁板綍鎺ュ彛")
@AllArgsConstructor
public class SparePartsRequisitionRecordController {
private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
@GetMapping("/listPage")
- @ApiOperation("澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
+ @Operation(summary = "澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SparePartsRequisitionRecordDto sparePartsRequisitionRecordDto){
IPage<SparePartsRequisitionRecordDto> listPage = sparePartsRequisitionRecordService.listPage(page, sparePartsRequisitionRecordDto);
return AjaxResult.success(listPage);
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java b/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java
index 2da314d..648db49 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.measuringinstrumentledger.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,30 +13,30 @@
* @date : 2025/8/5 9:50
*/
@Data
-@ApiModel
+@Schema
public class MeasuringInstrumentLedgerDto {
- @ApiModelProperty("ID")
+ @Schema(description = "ID")
private Long id;
- @ApiModelProperty("闄勪欢id")
+ @Schema(description = "闄勪欢id")
private List<String> tempFileIds;
- @ApiModelProperty("妫�瀹氭棩鏈�")
+ @Schema(description = "妫�瀹氭棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
private Date recordDate;
- @ApiModelProperty("褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
private Date entryDate;
- @ApiModelProperty("鏈夋晥鏈�")
+ @Schema(description = "鏈夋晥鏈�")
private Integer valid;
- @ApiModelProperty("妫�瀹氫汉")
+ @Schema(description = "妫�瀹氫汉")
private Long userId;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
index 7523853..cd1a2d5 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,55 +18,55 @@
*/
@Data
@TableName("measuring_instrument_ledger")
-@ApiModel
+@Schema
public class MeasuringInstrumentLedger {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("闄勪欢id")
+ @Schema(description = "闄勪欢id")
@TableField(exist = false)
private List<String> tempFileIds;
@TableField(exist = false)
- @ApiModelProperty("闄勪欢鍒楄〃")
+ @Schema(description = "闄勪欢鍒楄〃")
private List<CommonFile> commonFiles;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("褰曞叆浜篿d")
+ @Schema(description = "褰曞叆浜篿d")
private Long userId;
- @ApiModelProperty("褰曞叆浜哄悕绉�")
+ @Schema(description = "褰曞叆浜哄悕绉�")
@Excel(name = "褰曞叆浜哄悕绉�")
private String userName;
/**
* 璁￠噺鍣ㄥ叿缂栧彿
*/
- @ApiModelProperty("璁￠噺鍣ㄥ叿缂栧彿")
+ @Schema(description = "璁￠噺鍣ㄥ叿缂栧彿")
@Excel(name = "璁￠噺鍣ㄥ叿缂栧彿")
private String code;
/**
* 璁￠噺鍣ㄥ叿鍚嶇О
*/
- @ApiModelProperty("璁￠噺鍣ㄥ叿鍚嶇О")
+ @Schema(description = "璁￠噺鍣ㄥ叿鍚嶇О")
@Excel(name = "璁￠噺鍣ㄥ叿鍚嶇О")
private String name;
/**
* 瑙勬牸鍨嬪彿
*/
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
/**
* 鏈�杩戜竴娆℃瀹氭棩鏈�
*/
- @ApiModelProperty("鏈�杩戜竴娆℃瀹氭棩鏈�")
+ @Schema(description = "鏈�杩戜竴娆℃瀹氭棩鏈�")
@Excel(name = "鏈�杩戜竴娆℃瀹氭棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -77,14 +76,14 @@
/**
* 妫�瀹氭湁鏁堟湡
*/
- @ApiModelProperty("妫�瀹氭湁鏁堟湡")
+ @Schema(description = "妫�瀹氭湁鏁堟湡")
@Excel(name = "妫�瀹氭湁鏁堟湡")
private Integer valid;
/**
* 棰勮涓嬫妫�瀹氭棩鏈�
*/
- @ApiModelProperty("棰勮涓嬫妫�瀹氭棩鏈�")
+ @Schema(description = "棰勮涓嬫妫�瀹氭棩鏈�")
@Excel(name = "棰勮涓嬫妫�瀹氭棩鏈�" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -93,7 +92,7 @@
/**
* 褰曞叆鏃ユ湡
*/
- @ApiModelProperty("褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@Excel(name = "褰曞叆鏃ユ湡" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -103,7 +102,7 @@
/**
* 鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�
*/
- @ApiModelProperty("鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
+ @Schema(description = "鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
@Excel(name = "鐘舵��", readConverterExp = "1=鏈夋晥,2=閫炬湡")
private Integer status;
@@ -138,14 +137,14 @@
private Long tenantId;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("閮ㄩ棬id")
+ @Schema(description = "閮ㄩ棬id")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("瀹夎浣嶇疆")
+ @Schema(description = "瀹夎浣嶇疆")
private String instationLocation;
private String cycle;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
index d69b57a..8ca16d8 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,58 +18,58 @@
*/
@Data
@TableName("measuring_instrument_ledger_record")
-@ApiModel
+@Schema
public class MeasuringInstrumentLedgerRecord {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("璁￠噺鍣ㄥ叿缂栧彿")
+ @Schema(description = "璁￠噺鍣ㄥ叿缂栧彿")
@TableField(exist = false)
@Excel(name = "璁￠噺鍣ㄥ叿缂栧彿")
private String code;
- @ApiModelProperty("鍚嶇О")
+ @Schema(description = "鍚嶇О")
@TableField(exist = false)
@Excel(name = "鍚嶇О")
private String name;
- @ApiModelProperty("璁￠噺鍣ㄥ叿鍚嶇О")
+ @Schema(description = "璁￠噺鍣ㄥ叿鍚嶇О")
@TableField(exist = false)
@Excel(name = "璁￠噺鍣ㄥ叿鍚嶇О")
private String model;
- @ApiModelProperty("闄勪欢id")
+ @Schema(description = "闄勪欢id")
@TableField(exist = false)
private List<String> tempFileIds;
@TableField(exist = false)
- @ApiModelProperty("闄勪欢鍒楄〃")
+ @Schema(description = "闄勪欢鍒楄〃")
private List<CommonFile> commonFiles;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("璁￠噺鍣ㄥ叿鍙拌处id")
+ @Schema(description = "璁￠噺鍣ㄥ叿鍙拌处id")
private Long measuringInstrumentLedgerId;
- @ApiModelProperty("妫�瀹氫汉id")
+ @Schema(description = "妫�瀹氫汉id")
private Long userId;
- @ApiModelProperty("妫�瀹氫汉鍚嶇О")
+ @Schema(description = "妫�瀹氫汉鍚嶇О")
@Excel(name = "妫�瀹氫汉鍚嶇О")
private String userName;
/**
* 妫�瀹氭棩鏈�
*/
- @ApiModelProperty("妫�瀹氭棩鏈�")
+ @Schema(description = "妫�瀹氭棩鏈�")
@Excel(name = "妫�瀹氭棩鏈�" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date recordDate;
- @ApiModelProperty("褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "褰曞叆鏃ユ湡" , width = 30, dateFormat = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
@@ -79,14 +78,14 @@
/**
* 鏈夋晥鏈燂紙鍗曚綅澶╋級
*/
- @ApiModelProperty("鏈夋晥鏈燂紙鍗曚綅澶╋級")
+ @Schema(description = "鏈夋晥鏈燂紙鍗曚綅澶╋級")
private Integer valid;
/**
* 鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�
*/
- @ApiModelProperty("鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
+ @Schema(description = "鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
private Integer status;
/**
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java
index b7822d1..13a9229 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -53,27 +53,27 @@
* 澶囦欢鍒嗙被鎻忚堪
*/
private String description;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
index 931fe7f..672812b 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -22,7 +21,7 @@
@Getter
@Setter
@TableName("spare_parts_requisition_record")
-@ApiModel(value = "SparePartsRequisitionRecord瀵硅薄", description = "")
+@Schema(name = "SparePartsRequisitionRecord瀵硅薄", description = "")
public class SparePartsRequisitionRecord implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,36 +29,36 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鏉ユ簮绫诲瀷(0 缁翠慨 1 淇濆吇)")
+ @Schema(description = "鏉ユ簮绫诲瀷(0 缁翠慨 1 淇濆吇)")
private Integer sourceType;
- @ApiModelProperty("鏉ユ簮id")
+ @Schema(description = "鏉ユ簮id")
private Long sourceId;
- @ApiModelProperty("璁惧id")
+ @Schema(description = "璁惧id")
private Long deviceLedgerId;
- @ApiModelProperty("澶囦欢id")
+ @Schema(description = "澶囦欢id")
private Long sparePartsId;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private Integer quantity;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
index 67cbcaf..b7ecc7a 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectController.java
@@ -6,8 +6,8 @@
import com.ruoyi.oA.dto.OaProjectDto;
import com.ruoyi.oA.pojo.OaProject;
import com.ruoyi.oA.service.OaProjectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
@@ -16,20 +16,20 @@
import java.util.HashMap;
import java.util.List;
-@Api(tags = "oA椤圭洰绠＄悊")
+@Tag(name = "oA椤圭洰绠＄悊")
@RestController
@AllArgsConstructor
@RequestMapping("/oA/project")
public class OaProjectController {
private final OaProjectService oaProjectService;
- @ApiOperation("鑾峰彇椤圭洰鍒楄〃")
+ @Operation(summary = "鑾峰彇椤圭洰鍒楄〃")
@GetMapping("/listPage")
public AjaxResult listPage(Page page, OaProjectDto oaProjectDto) {
IPage<OaProjectDto> listPage = oaProjectService.listPage(page, oaProjectDto);
return AjaxResult.success(listPage);
}
- @ApiOperation("鑾峰彇椤圭洰鍒楄〃璇︽儏")
+ @Operation(summary = "鑾峰彇椤圭洰鍒楄〃璇︽儏")
@GetMapping("/getList")
public AjaxResult getList(Page page, OaProjectDto oaProjectDto) {
IPage<OaProjectDto> listPage = oaProjectService.listPage(page, oaProjectDto);
@@ -39,31 +39,31 @@
});
return AjaxResult.success(Map);
}
- @ApiOperation("澧炴坊椤圭洰")
+ @Operation(summary = "澧炴坊椤圭洰")
@PostMapping("/add")
public AjaxResult add(@RequestBody OaProject oaProject) {
boolean save = oaProjectService.save(oaProject);
return AjaxResult.success(save);
}
- @ApiOperation("鍒犻櫎椤圭洰")
+ @Operation(summary = "鍒犻櫎椤圭洰")
@DeleteMapping("/delete/{id}")
public AjaxResult delete(@PathVariable Long id) {
boolean remove = oaProjectService.deleteById(id);
return AjaxResult.success(remove);
}
- @ApiOperation("鏇存柊椤圭洰")
+ @Operation(summary = "鏇存柊椤圭洰")
@PostMapping("/update")
public AjaxResult update(@RequestBody OaProject oaProject) {
boolean update = oaProjectService.updateById(oaProject);
return AjaxResult.success(update);
}
-// @ApiOperation("鏍规嵁ID鑾峰彇椤圭洰璇︽儏")
+// @Operation(summary = "鏍规嵁ID鑾峰彇椤圭洰璇︽儏")
// @GetMapping("/getById")
// public AjaxResult getById(Long id) {
// OaProject oaProject = oaProjectService.getById(id);
// return AjaxResult.success(oaProject);
// }
- @ApiOperation("瀵煎嚭鎵�閫夐」鐩�")
+ @Operation(summary = "瀵煎嚭鎵�閫夐」鐩�")
@PostMapping("/export/{ids}")
public void export(HttpServletResponse response, @PathVariable("ids") List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java
index 0d83dd5..a4a05bb 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseController.java
@@ -3,37 +3,37 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.oA.pojo.OaProjectPhase;
import com.ruoyi.oA.service.OaProjectPhaseService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-@Api(tags = "oA椤圭洰闃舵绠＄悊")
+@Tag(name = "oA椤圭洰闃舵绠＄悊")
@RestController
@RequestMapping("/oA/projectPhase")
@AllArgsConstructor
public class OaProjectPhaseController {
private final OaProjectPhaseService oaProjectPhaseService;
- @ApiOperation("鏂板椤圭洰闃舵")
+ @Operation(summary = "鏂板椤圭洰闃舵")
@PostMapping("/add")
public AjaxResult add(@RequestBody OaProjectPhase oaProjectPhase) {
return AjaxResult.success(oaProjectPhaseService.save(oaProjectPhase));
}
- @ApiOperation("鍒犻櫎椤圭洰闃舵")
+ @Operation(summary = "鍒犻櫎椤圭洰闃舵")
@DeleteMapping("/delete/{phaseId}")
public AjaxResult delete(@PathVariable Integer phaseId) {
return AjaxResult.success(oaProjectPhaseService.deleteById(phaseId));
}
- @ApiOperation("鏇存柊椤圭洰闃舵")
+ @Operation(summary = "鏇存柊椤圭洰闃舵")
@PostMapping("/update")
public AjaxResult update(@RequestBody OaProjectPhase oaProjectPhase) {
return AjaxResult.success(oaProjectPhaseService.updateById(oaProjectPhase));
}
- @ApiOperation("鏍规嵁椤圭洰id鏌ヨ椤圭洰闃舵鍒楄〃")
+ @Operation(summary = "鏍规嵁椤圭洰id鏌ヨ椤圭洰闃舵鍒楄〃")
@GetMapping("/listByProjectId/{projectId}")
public AjaxResult listByProjectId(@PathVariable Integer projectId) {
return AjaxResult.success(oaProjectPhaseService.listByProjectId(projectId));
diff --git a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java
index 9d8caee..91a846e 100644
--- a/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java
+++ b/src/main/java/com/ruoyi/oA/controller/OaProjectPhaseTaskController.java
@@ -3,37 +3,37 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.oA.pojo.OaProjectPhaseTask;
import com.ruoyi.oA.service.OaProjectPhaseTaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-@Api(tags = "oA椤圭洰闃舵浠诲姟绠＄悊")
+@Tag(name = "oA椤圭洰闃舵浠诲姟绠＄悊")
@RestController
@RequestMapping("/oA/projectPhaseTask")
@AllArgsConstructor
public class OaProjectPhaseTaskController {
private final OaProjectPhaseTaskService oaProjectPhaseTaskService;
- @ApiOperation("鏂板椤圭洰闃舵浠诲姟")
+ @Operation(summary = "鏂板椤圭洰闃舵浠诲姟")
@PostMapping("/add")
public AjaxResult add(@RequestBody OaProjectPhaseTask oaProjectPhaseTask) {
return AjaxResult.success(oaProjectPhaseTaskService.save(oaProjectPhaseTask));
}
- @ApiOperation("鏍规嵁椤圭洰闃舵id鏌ヨ椤圭洰闃舵浠诲姟鍒楄〃")
+ @Operation(summary = "鏍规嵁椤圭洰闃舵id鏌ヨ椤圭洰闃舵浠诲姟鍒楄〃")
@GetMapping("/listByPhaseId/{phaseId}")
public AjaxResult listByPhaseId(@PathVariable Integer phaseId) {
return AjaxResult.success(oaProjectPhaseTaskService.listByPhaseId(phaseId));
}
- @ApiOperation("鍒犻櫎椤圭洰闃舵浠诲姟")
+ @Operation(summary = "鍒犻櫎椤圭洰闃舵浠诲姟")
@DeleteMapping("/delete/{taskId}")
public AjaxResult delete(@PathVariable Integer taskId) {
return AjaxResult.success(oaProjectPhaseTaskService.removeById(taskId));
}
- @ApiOperation("鏇存柊椤圭洰闃舵浠诲姟")
+ @Operation(summary = "鏇存柊椤圭洰闃舵浠诲姟")
@PostMapping("/update")
public AjaxResult update(@RequestBody OaProjectPhaseTask oaProjectPhaseTask) {
return AjaxResult.success(oaProjectPhaseTaskService.updateById(oaProjectPhaseTask));
diff --git a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
index 61912898..3588d6c 100644
--- a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
+++ b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
@@ -10,8 +10,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +29,7 @@
* @date : 2025/9/4 14:16
*/
@RestController
-@Api(tags = "鍔炲叕鐗╄祫")
+@Tag(name = "鍔炲叕鐗╄祫")
@RequestMapping("/officeSupplies")
@AllArgsConstructor
public class OfficeSuppliesController extends BaseController {
@@ -37,13 +37,13 @@
private OfficeSuppliesService officeSuppliesService;
@GetMapping("/listPage")
- @ApiOperation("鍔炲叕鐗╄祫-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍔炲叕鐗╄祫-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
return officeSuppliesService.listPage(page, officeSupplies);
}
@PostMapping("/add")
- @ApiOperation("鍔炲叕鐗╄祫-娣诲姞")
+ @Operation(summary = "鍔炲叕鐗╄祫-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody OfficeSupplies officeSupplies) {
// 鎸夌収褰撳墠鏃堕棿yyyyMMdd + 褰撳ぉ鏂板鏁伴噺 + 1鐢熸垚缂栧彿
@@ -59,14 +59,14 @@
}
@PostMapping("/update")
- @ApiOperation("鍔炲叕鐗╄祫-淇敼")
+ @Operation(summary = "鍔炲叕鐗╄祫-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody OfficeSupplies officeSupplies) {
return officeSuppliesService.updateById(officeSupplies) ? success() : error();
}
@DeleteMapping("/delete")
- @ApiOperation("鍔炲叕鐗╄祫-鍒犻櫎")
+ @Operation(summary = "鍔炲叕鐗╄祫-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -78,7 +78,7 @@
*/
@Log(title = "瀵煎嚭鍔炲叕鐗╄祫", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鍔炲叕鐗╄祫")
+ @Operation(summary = "瀵煎嚭鍔炲叕鐗╄祫")
public void export(HttpServletResponse response) {
ExcelUtil<OfficeSupplies> util = new ExcelUtil<OfficeSupplies>(OfficeSupplies.class);
List<OfficeSupplies> list = officeSuppliesService.list();
diff --git a/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java b/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
index 0237194..7a1f88c 100644
--- a/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
+++ b/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +17,7 @@
* @date : 2025/9/4 14:02
*/
@Data
-@ApiModel
+@Schema
@TableName("office_supplies")
public class OfficeSupplies {
@@ -27,49 +26,49 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("缂栧彿")
+ @Schema(description = "缂栧彿")
@Excel(name = "缂栧彿")
private String code;
- @ApiModelProperty("鐗╁搧鍚嶇О")
+ @Schema(description = "鐗╁搧鍚嶇О")
private String itemName;
- @ApiModelProperty("鐢宠浜�")
+ @Schema(description = "鐢宠浜�")
@Excel(name = "鐢宠浜�")
private String applicant;
/**
* 閮ㄩ棬
*/
- @ApiModelProperty("閮ㄩ棬")
+ @Schema(description = "閮ㄩ棬")
@Excel(name = "閮ㄩ棬")
private String dept;
/**
* 鐗╄祫绫诲瀷锛�1-鍏朵粬 2-娓呮磥鐢ㄥ搧 3-鐢靛瓙鐢ㄥ搧 4-鐢靛瓙璁惧锛�
*/
- @ApiModelProperty("鐗╄祫绫诲瀷锛�1-鍏朵粬 2-娓呮磥鐢ㄥ搧 3-鐢靛瓙鐢ㄥ搧 4-鐢靛瓙璁惧锛�")
+ @Schema(description = "鐗╄祫绫诲瀷锛�1-鍏朵粬 2-娓呮磥鐢ㄥ搧 3-鐢靛瓙鐢ㄥ搧 4-鐢靛瓙璁惧锛�")
@Excel(name = "鐗╄祫绫诲瀷", readConverterExp = "1=鍏朵粬,2=娓呮磥鐢ㄥ搧,3=鐢靛瓙鐢ㄥ搧,4=鐢靛瓙璁惧")
private Integer materialType;
/**
* 鐢宠鏁伴噺
*/
- @ApiModelProperty("鐢宠鏁伴噺")
+ @Schema(description = "鐢宠鏁伴噺")
@Excel(name = "鐢宠鏁伴噺")
private Integer applyNum;
/**
* 瀹℃壒鎰忚
*/
- @ApiModelProperty("瀹℃壒鎰忚")
+ @Schema(description = "瀹℃壒鎰忚")
// @Excel(name = "瀹℃壒鎰忚")
private String approvalOpinions;
/**
* 鐢宠鍘熷洜
*/
- @ApiModelProperty("鐢宠鍘熷洜")
+ @Schema(description = "鐢宠鍘熷洜")
@Excel(name = "鐢宠鍘熷洜")
private String reason;
@@ -77,21 +76,21 @@
/**
* 绱ф�ョ▼搴︼紙1-鏅�� 2-绱ф�� 3-闈炲父绱ф�ワ級
*/
- @ApiModelProperty("绱ф�ョ▼搴︼紙1-鏅�� 2-绱ф�� 3-闈炲父绱ф�ワ級")
+ @Schema(description = "绱ф�ョ▼搴︼紙1-鏅�� 2-绱ф�� 3-闈炲父绱ф�ワ級")
// @Excel(name = "绱ф�ョ▼搴�", readConverterExp = "1=鏅��,2=绱ф��,3=闈炲父绱ф��")
private Integer urgency;
/**
* 鐘舵�侊紙1-寰呭鎵� 2-宸叉嫆缁� 3-宸查�氳繃 4-宸插彂鏀撅級
*/
- @ApiModelProperty("鐘舵�侊紙1-寰呭鎵� 2-宸叉嫆缁� 3-宸查�氳繃 4-宸插彂鏀撅級")
+ @Schema(description = "鐘舵�侊紙1-寰呭鎵� 2-宸叉嫆缁� 3-宸查�氳繃 4-宸插彂鏀撅級")
@Excel(name = "鐘舵��", readConverterExp = "1=寰呭鎵�,2=宸叉嫆缁�,3=宸查�氳繃,4=宸插彂鏀�")
private Integer status;
/**
* 鐢宠鏃堕棿
*/
- @ApiModelProperty("鐢宠鏃堕棿")
+ @Schema(description = "鐢宠鏃堕棿")
@Excel(name = "鐢宠鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -101,14 +100,14 @@
/**
* 瀹℃壒浜�
*/
- @ApiModelProperty("瀹℃壒浜�")
+ @Schema(description = "瀹℃壒浜�")
@Excel(name = "瀹℃壒浜�")
private String approval;
/**
* 瀹℃壒鏃堕棿
*/
- @ApiModelProperty("瀹℃壒鏃堕棿")
+ @Schema(description = "瀹℃壒鏃堕棿")
@Excel(name = "瀹℃壒鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -117,13 +116,13 @@
/**
* 鍙戞斁鏃堕棿
*/
- @ApiModelProperty("鍙戞斁鏃堕棿")
+ @Schema(description = "鍙戞斁鏃堕棿")
@Excel(name = "鍙戞斁鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date issueTime;
- @ApiModelProperty("鍙戞斁浜�")
+ @Schema(description = "鍙戞斁浜�")
// @Excel(name = "鍙戞斁浜�")
private String issueUser;
diff --git a/src/main/java/com/ruoyi/other/controller/PdaVersionController.java b/src/main/java/com/ruoyi/other/controller/PdaVersionController.java
index 831da33..0b7d2c2 100644
--- a/src/main/java/com/ruoyi/other/controller/PdaVersionController.java
+++ b/src/main/java/com/ruoyi/other/controller/PdaVersionController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.other.pojo.PdaVersion;
import com.ruoyi.other.service.PdaVersionService;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -16,13 +16,13 @@
private PdaVersionService pdaVersionService;
- @ApiOperation("鏌ヨ鎵�鏈夌増鏈�")
+ @Operation(summary = "鏌ヨ鎵�鏈夌増鏈�")
@GetMapping("/getAllVersion")
public R getAllVersion(Page<PdaVersion> page, PdaVersion pdaVersion) {
return R.ok(pdaVersionService.getAllVersion(page, pdaVersion));
}
- @ApiOperation("涓婁紶apk")
+ @Operation(summary = "涓婁紶apk")
@PostMapping("/uploadApk")
public R uploadApk(@RequestParam("file") MultipartFile file, String name, String version) {
return R.ok(pdaVersionService.uploadApk(file, name, version));
diff --git a/src/main/java/com/ruoyi/other/pojo/PdaVersion.java b/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
index d772071..d01b916 100644
--- a/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
+++ b/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,41 +13,41 @@
@Data
@TableName("pda_version")
-@ApiModel(value = "PdaVersion", description = "PDA鐗堟湰淇℃伅琛�")
+@Schema(name = "PdaVersion", description = "PDA鐗堟湰淇℃伅琛�")
public class PdaVersion implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍚嶇О")
+ @Schema(description = "鍚嶇О")
private String name;
- @ApiModelProperty("鐗堟湰鍙�")
+ @Schema(description = "鐗堟湰鍙�")
private String version;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/other/pojo/TempFile.java b/src/main/java/com/ruoyi/other/pojo/TempFile.java
index 4e634cc..11aa897 100644
--- a/src/main/java/com/ruoyi/other/pojo/TempFile.java
+++ b/src/main/java/com/ruoyi/other/pojo/TempFile.java
@@ -1,6 +1,6 @@
package com.ruoyi.other.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,7 +22,7 @@
private LocalDateTime expireTime; // 杩囨湡鏃堕棿
private Integer type; // 鍏宠仈琛ㄧ被鍨�
private Long fileSize; // 鏂囦欢澶у皬
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
index f0c8310..0a2919d 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.InboundManagement;
import com.ruoyi.procurementrecord.service.InboundManagementService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +21,7 @@
* @date : 2025/9/16 16:38
*/
@RestController
-@Api(tags = "鍒拌揣绠＄悊")
+@Tag(name = "鍒拌揣绠＄悊")
@RequestMapping("/inboundManagement")
@AllArgsConstructor
public class InboundManagementController extends BaseController {
@@ -29,14 +29,14 @@
private InboundManagementService inboundManagementService;
@GetMapping("/listPage")
- @ApiOperation("鍒拌揣绠＄悊-鏌ヨ")
+ @Operation(summary = "鍒拌揣绠＄悊-鏌ヨ")
public AjaxResult listPage(Page page, InboundManagement inboundManagement) {
IPage<InboundManagement> result = inboundManagementService.listPage(page, inboundManagement);
return AjaxResult.success(result);
}
@PostMapping("/add")
- @ApiOperation("鍒拌揣绠＄悊-娣诲姞")
+ @Operation(summary = "鍒拌揣绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody InboundManagement inboundManagement) {
inboundManagement.setArrivalTime(new Date());
@@ -45,7 +45,7 @@
}
@PostMapping("/update")
- @ApiOperation("鍒拌揣绠＄悊-淇敼")
+ @Operation(summary = "鍒拌揣绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody InboundManagement inboundManagement) {
boolean result = inboundManagementService.updateById(inboundManagement);
@@ -53,7 +53,7 @@
}
@DeleteMapping("/del")
- @ApiOperation("鍒拌揣绠＄悊-鍒犻櫎")
+ @Operation(summary = "鍒拌揣绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult del(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
index f63d358..c594994 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
@@ -10,8 +10,8 @@
import com.ruoyi.procurementrecord.mapper.ProcurementExceptionRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementExceptionRecord;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +25,7 @@
* @date : 2025/7/7 14:32
*/
@RestController
-@Api(tags = "閲囪喘寮傚父璁板綍")
+@Tag(name = "閲囪喘寮傚父璁板綍")
@RequestMapping("/procurementExceptionRecord")
@AllArgsConstructor
public class ProcurementExceptionRecordController extends BaseController {
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
index f8d7b01..1d442a9 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
@@ -6,8 +6,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.ProcurementPlan;
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,7 @@
* @date : 2025/9/18 16:13
*/
@RestController
-@Api(tags = "閲囪喘璁″垝")
+@Tag(name = "閲囪喘璁″垝")
@RequestMapping("/procurementPlan")
@AllArgsConstructor
public class ProcurementPlanController extends BaseController {
@@ -27,28 +27,28 @@
private ProcurementPlanService procurementPlanService;
@RequestMapping("/listPage")
- @ApiOperation("閲囪喘璁″垝-鏌ヨ")
+ @Operation(summary = "閲囪喘璁″垝-鏌ヨ")
public AjaxResult listPage(Page page, ProcurementPlan procurementPlan){
IPage<ProcurementPlan> result = procurementPlanService.listPage(page, procurementPlan);
return AjaxResult.success(result);
}
@PostMapping("/add")
- @ApiOperation("閲囪喘璁″垝-娣诲姞")
+ @Operation(summary = "閲囪喘璁″垝-娣诲姞")
public AjaxResult add(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.save(procurementPlan);
return result ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
- @ApiOperation("閲囪喘璁″垝-淇敼")
+ @Operation(summary = "閲囪喘璁″垝-淇敼")
public AjaxResult update(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.updateById(procurementPlan);
return result ? AjaxResult.success() : AjaxResult.error();
}
@DeleteMapping("/del")
- @ApiOperation("閲囪喘璁″垝-鍒犻櫎")
+ @Operation(summary = "閲囪喘璁″垝-鍒犻櫎")
public AjaxResult del(@RequestBody List<Long> ids){
boolean result = procurementPlanService.removeByIds(ids);
return result ? AjaxResult.success() : AjaxResult.error();
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
index 4cfa06d..678446c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
@@ -6,8 +6,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement;
import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +20,7 @@
* @date : 2025/9/17 15:08
*/
@RestController
-@Api(tags = "閲囪喘浠锋牸绠＄悊")
+@Tag(name = "閲囪喘浠锋牸绠＄悊")
@RequestMapping("/procurementPriceManagement")
@AllArgsConstructor
public class ProcurementPriceManagementController extends BaseController {
@@ -28,14 +28,14 @@
private ProcurementPriceManagementService procurementPriceManagementService;
@GetMapping("/listPage")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-鏌ヨ")
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-鏌ヨ")
public AjaxResult listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
IPage<ProcurementPriceManagement> result = procurementPriceManagementService.listPage(page, procurementPriceManagement);
return AjaxResult.success(result);
}
@PostMapping("/add")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-娣诲姞")
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.save(procurementPriceManagement);
@@ -43,7 +43,7 @@
}
@PostMapping("/update")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-淇敼")
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.updateById(procurementPriceManagement);
@@ -51,7 +51,7 @@
}
@DeleteMapping("/del")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-鍒犻櫎")
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids){
if (ids == null || ids.isEmpty()) {
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index a22c5ed..e567eea 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -12,8 +12,8 @@
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@
* @date : 2025/7/7 14:32
*/
@RestController
-@Api(tags = "閲囪喘鍏ュ簱")
+@Tag(name = "閲囪喘鍏ュ簱")
@RequestMapping("/stockin")
@AllArgsConstructor
public class ProcurementRecordController extends BaseController {
@@ -44,7 +44,7 @@
* @return
*/
@GetMapping("/getProcurementAmount")
- @ApiOperation(value = "閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺")
+ @Operation(summary = "閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺")
public AjaxResult getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
return AjaxResult.success(procurementRecordService.getProcurementAmount(salesProductId));
}
@@ -117,21 +117,21 @@
@GetMapping("/listPage")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱鏌ヨ")
+ @Operation(summary = "鍏ュ簱鏌ヨ")
public AjaxResult listPage(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPage(page, procurementDto);
return AjaxResult.success(result);
}
@GetMapping("/listReport")
- @ApiOperation(value = "鏌ヨ搴撳瓨鍥捐〃鏁版嵁")
+ @Operation(summary = "鏌ヨ搴撳瓨鍥捐〃鏁版嵁")
public AjaxResult listReport() {
return AjaxResult.success(procurementRecordService.getReportList());
}
@GetMapping("/listPageByProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱鏌ヨ")
+ @Operation(summary = "鍏ュ簱鏌ヨ")
public AjaxResult listPageByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProduction(page, procurementDto);
return AjaxResult.success(result);
@@ -139,7 +139,7 @@
@GetMapping("/listPageByProductProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鐢熶骇鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱鏌ヨ")
+ @Operation(summary = "鍏ュ簱鏌ヨ")
public AjaxResult listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProductProduction(page, procurementDto);
return AjaxResult.success(result);
@@ -147,7 +147,7 @@
@GetMapping("/listPageByCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱鏌ヨ")
+ @Operation(summary = "鍏ュ簱鏌ヨ")
public AjaxResult listPageByCustom(Page page, CustomStorage customStorage) {
IPage<CustomStorage> result = procurementRecordService.listPageByCustom(page, customStorage);
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 1f4a5f4..f024bfe 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
@@ -12,7 +12,7 @@
import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@
* @date : 2025/7/8 13:30
*/
@RestController
-@Api(tags = "閲囪喘鍑哄簱")
+@Tag(name = "閲囪喘鍑哄簱")
@RequestMapping("/stockmanagement")
@AllArgsConstructor
public class ProcurementRecordOutController extends BaseController {
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
index 1871cca..22882f4 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
@@ -15,8 +15,8 @@
import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
import com.ruoyi.procurementrecord.service.impl.ReturnSaleProductServiceImpl;
import com.ruoyi.sales.dto.SalesLedgerDto;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +29,7 @@
* @date : 2025/9/17 10:34
*/
@RestController
-@Api(tags = "閿�鍞��璐�")
+@Tag(name = "閿�鍞��璐�")
@AllArgsConstructor
@RequestMapping("/returnManagement")
public class ReturnManagementController extends BaseController {
@@ -38,28 +38,28 @@
private ReturnSaleProductService returnSaleProductService;
@GetMapping("/listPage")
- @ApiOperation("閿�鍞��璐�-鏌ヨ")
+ @Operation(summary = "閿�鍞��璐�-鏌ヨ")
public AjaxResult listPage(Page page, ReturnManagementDto returnManagement) {
IPage<ReturnManagementDto> result = returnManagementService.listPage(page, returnManagement);
return AjaxResult.success(result);
}
@PostMapping("/add")
- @ApiOperation("閿�鍞��璐�-娣诲姞")
+ @Operation(summary = "閿�鍞��璐�-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody ReturnManagementDto returnManagementDto) {
return returnManagementService.addReturnManagementDto(returnManagementDto) ? success() : error();
}
@PostMapping("/update")
- @ApiOperation("閿�鍞��璐�-淇敼")
+ @Operation(summary = "閿�鍞��璐�-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody ReturnManagementDto returnManagementDto) {
return returnManagementService.updateReturnManagementDto(returnManagementDto) ? success() : error();
}
- @ApiOperation("閿�鍞��璐�-澶勭悊閫�璐у崟")
+ @Operation(summary = "閿�鍞��璐�-澶勭悊閫�璐у崟")
@GetMapping("/handle")
@Transactional(rollbackFor = Exception.class)
public AjaxResult handle(Long returnManagementId) {
@@ -68,7 +68,7 @@
@DeleteMapping("/del")
- @ApiOperation("閿�鍞��璐�-鍒犻櫎")
+ @Operation(summary = "閿�鍞��璐�-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult del(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -80,14 +80,14 @@
}
@GetMapping("/getById")
- @ApiOperation("閿�鍞��璐�-鏍规嵁id鏌ヨ")
+ @Operation(summary = "閿�鍞��璐�-鏍规嵁id鏌ヨ")
public AjaxResult getById(Long returnManagementId) {
ReturnManagementDto returnManagementDto = returnManagementService.getReturnManagementDtoById(returnManagementId);
return success(returnManagementDto);
}
@GetMapping("/getByShippingId")
- @ApiOperation("閿�鍞��璐�-鏍规嵁鍑哄簱鍗曟煡璇㈤攢鍞鍗曚互鍙婁骇鍝佷俊鎭�")
+ @Operation(summary = "閿�鍞��璐�-鏍规嵁鍑哄簱鍗曟煡璇㈤攢鍞鍗曚互鍙婁骇鍝佷俊鎭�")
public AjaxResult getByShippingId(Long shippingId) {
SalesLedgerDto salesLedgerDto = returnManagementService.getReturnManagementDtoByShippingIdId(shippingId);
return success(salesLedgerDto);
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 1d06eb6..57c2dbb 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -65,14 +65,14 @@
/**
* 鍏ュ簱鍗曚环
*/
- @ApiModelProperty(value = "鍏ュ簱鍗曚环")
+ @Schema(description = "鍏ュ簱鍗曚环")
@Excel(name = "鍏ュ簱鍗曚环")
private BigDecimal unitPrice;
/**
* 鍏ュ簱鎬讳环
*/
- @ApiModelProperty(value = "鍏ュ簱鎬讳环")
+ @Schema(description = "鍏ュ簱鎬讳环")
@Excel(name = "鍏ュ簱鎬讳环")
private BigDecimal totalPrice;
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index 67f9d03..9173ce3 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -60,14 +60,14 @@
/**
* 鍏ュ簱鍗曚环
*/
- @ApiModelProperty(value = "鍏ュ簱鍗曚环")
+ @Schema(description = "鍏ュ簱鍗曚环")
@Excel(name = "鍏ュ簱鍗曚环")
private BigDecimal unitPrice;
/**
* 鍏ュ簱鎬讳环
*/
- @ApiModelProperty(value = "鍏ュ簱鎬讳环")
+ @Schema(description = "鍏ュ簱鎬讳环")
@Excel(name = "鍏ュ簱鎬讳环")
private BigDecimal totalPrice;
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
index 74b90c9..b69f241 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
@@ -7,8 +7,7 @@
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -23,26 +22,26 @@
public class ReturnManagementDto extends ReturnManagement {
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(value = "閿�鍞崟鍙�")
+ @Schema(description = "閿�鍞崟鍙�")
private String salesContractNo;
- @ApiModelProperty(value = "涓氬姟鍛�")
+ @Schema(description = "涓氬姟鍛�")
private String salesman;
- @ApiModelProperty("鍏宠仈鍑哄簱鍗曞彿")
+ @Schema(description = "鍏宠仈鍑哄簱鍗曞彿")
private String shippingNo;
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Schema(description = "椤圭洰鍚嶇О")
private String projectName;
- @ApiModelProperty(value = "閿�鍞彴璐d")
+ @Schema(description = "閿�鍞彴璐d")
private Long salesLedgerId;
- @ApiModelProperty(value = "閿�鍞骇鍝佸璞℃暟缁�")
+ @Schema(description = "閿�鍞骇鍝佸璞℃暟缁�")
private List<ReturnSaleProductDto> returnSaleProducts;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java
index 4cd2b0a..8936810 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -17,7 +16,7 @@
*/
@Data
@TableName("inbound_management")
-@ApiModel
+@Schema
public class InboundManagement {
private static final long serialVersionUID = 1L;
@@ -27,46 +26,46 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁㈠崟鍙�")
+ @Schema(description = "璁㈠崟鍙�")
private String orderNo;
- @ApiModelProperty(value = "鍒拌揣鍗曞彿")
+ @Schema(description = "鍒拌揣鍗曞彿")
private String arrivalNo;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @ApiModelProperty(value = "鍒拌揣鐘舵��")
+ @Schema(description = "鍒拌揣鐘舵��")
private String status;
- @ApiModelProperty(value = "鍒拌揣鏃堕棿")
+ @Schema(description = "鍒拌揣鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arrivalTime;
- @ApiModelProperty(value = "鍒拌揣鏁伴噺")
+ @Schema(description = "鍒拌揣鏁伴噺")
private String arrivalQuantity;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java
index 7a39af7..9c62016 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java
@@ -1,6 +1,6 @@
package com.ruoyi.procurementrecord.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Builder;
import lombok.Data;
@@ -52,7 +52,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java
index 1508e19..e96412b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,7 +15,7 @@
*/
@Data
@TableName("procurement_plan")
-@ApiModel
+@Schema
public class ProcurementPlan {
private static final long serialVersionUID = 1L;
@@ -26,79 +25,79 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "缂栫爜")
+ @Schema(description = "缂栫爜")
@Excel(name = "缂栫爜")
private String code;
- @ApiModelProperty(value = "鍚嶇О")
+ @Schema(description = "鍚嶇О")
@Excel(name = "鍚嶇О")
private String planName;
- @ApiModelProperty(value = "鎻忚堪")
+ @Schema(description = "鎻忚堪")
@Excel(name = "鎻忚堪")
private String description;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��", readConverterExp = "disabled=绂佺敤,active=鍚敤")
private String status;
- @ApiModelProperty(value = "鏄惁绯荤粺棰勭疆")
+ @Schema(description = "鏄惁绯荤粺棰勭疆")
private Boolean isSystemPreset;
- @ApiModelProperty(value = "鑰冭檻鐜版湁搴撳瓨")
+ @Schema(description = "鑰冭檻鐜版湁搴撳瓨")
private Boolean considerExistingStock;
- @ApiModelProperty(value = "浠撳簱杩愯MRP鐨勬帶鍒�")
+ @Schema(description = "浠撳簱杩愯MRP鐨勬帶鍒�")
private Boolean warehouseControl;
- @ApiModelProperty(value = "璁＄畻鎬婚渶姹�")
+ @Schema(description = "璁＄畻鎬婚渶姹�")
private Boolean calculateTotalDemand;
- @ApiModelProperty(value = "鑰冭檻瀹夊叏搴撳瓨")
+ @Schema(description = "鑰冭檻瀹夊叏搴撳瓨")
private Boolean considerSafetyStock;
- @ApiModelProperty(value = "鑰冭檻閿佸簱")
+ @Schema(description = "鑰冭檻閿佸簱")
private Boolean considerLockedStock;
- @ApiModelProperty(value = "涓嶈�冭檻鐗╂枡杈呭姪灞炴��")
+ @Schema(description = "涓嶈�冭檻鐗╂枡杈呭姪灞炴��")
private Boolean notConsiderMaterialAux;
- @ApiModelProperty(value = "璐熷簱瀛樹綔涓洪渶姹�")
+ @Schema(description = "璐熷簱瀛樹綔涓洪渶姹�")
private Boolean negativeStockAsDemand;
- @ApiModelProperty(value = "鐗╂枡")
+ @Schema(description = "鐗╂枡")
private Boolean summaryMaterial;
- @ApiModelProperty(value = "杈呭姪灞炴��")
+ @Schema(description = "杈呭姪灞炴��")
private Boolean summaryAuxAttributes;
- @ApiModelProperty(value = "闇�姹傛棩鏈�")
+ @Schema(description = "闇�姹傛棩鏈�")
private Boolean summaryDemandDate;
- @ApiModelProperty(value = "璁＄畻鍏紡")
+ @Schema(description = "璁＄畻鍏紡")
@Excel(name = "璁＄畻鍏紡")
private String formula;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鏈�鍚庤绠楁椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
index 1beae12..cad1b29 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -17,7 +16,7 @@
*/
@Data
@TableName("procurement_price_management")
-@ApiModel
+@Schema
public class ProcurementPriceManagement {
private static final long serialVersionUID = 1L;
@@ -27,95 +26,95 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ @Schema(description = "鍟嗗搧鍚嶇О")
@Excel(name = "鍟嗗搧鍚嶇О")
private String productName;
- @ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ @Schema(description = "鍟嗗搧缂栫爜")
@Excel(name = "鍟嗗搧缂栫爜")
private String productCode;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
@Excel(name = "瑙勬牸鍨嬪彿")
private String specification;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @ApiModelProperty(value = "鍩虹浠锋牸")
+ @Schema(description = "鍩虹浠锋牸")
@Excel(name = "鍩虹浠锋牸")
private String basePrice;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
@TableField(exist = false)
@Excel(name = "鐘舵��")
private String status;
- @ApiModelProperty(value = "鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty(value = "鎶樻墸绫诲瀷")
+ @Schema(description = "鎶樻墸绫诲瀷")
@Excel(name = "鎶樻墸绫诲瀷", readConverterExp = "=鏃犳姌鎵�,percentage=鐧惧垎姣旀姌鎵�,fixed=鍥哄畾閲戦")
private String discountType;
- @ApiModelProperty(value = "鎶樻墸鍊�")
+ @Schema(description = "鎶樻墸鍊�")
@Excel(name = "鎶樻墸鍊�")
private String discountValue;
- @ApiModelProperty(value = "鎶樻墸鏈夋晥鏈�")
+ @Schema(description = "鎶樻墸鏈夋晥鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date discountEndTime;
- @ApiModelProperty(value = "鏈�浣庝环鏍�")
+ @Schema(description = "鏈�浣庝环鏍�")
@Excel(name = "鏈�浣庝环鏍�")
private String minPrice;
- @ApiModelProperty(value = "鏈�楂樹环鏍�")
+ @Schema(description = "鏈�楂樹环鏍�")
@Excel(name = "鏈�楂樹环鏍�")
private String maxPrice;
- @ApiModelProperty(value = "棰勮闃堝��(%)")
+ @Schema(description = "棰勮闃堝��(%)")
private String warningThreshold;
- @ApiModelProperty(value = "鐢熸晥鏃堕棿")
+ @Schema(description = "鐢熸晥鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鐢熸晥鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date effectiveTime;
- @ApiModelProperty(value = "澶辨晥鏃堕棿")
+ @Schema(description = "澶辨晥鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date expireTime;
- @ApiModelProperty(value = "璋冧环鍘熷洜")
+ @Schema(description = "璋冧环鍘熷洜")
private String reason;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
index a0af810..f5d8c79 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -17,7 +16,7 @@
*/
@Data
@TableName("return_management")
-@ApiModel
+@Schema
public class ReturnManagement {
private static final long serialVersionUID = 1L;
@@ -27,51 +26,51 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "閫�璐у崟鍙�")
+ @Schema(description = "閫�璐у崟鍙�")
private String returnNo;
- @ApiModelProperty("瀹㈡埛id")
+ @Schema(description = "瀹㈡埛id")
private Long customerId;
- @ApiModelProperty("鍏宠仈鍑哄簱鍗曞彿Id")
+ @Schema(description = "鍏宠仈鍑哄簱鍗曞彿Id")
private Long shippingId;
- @ApiModelProperty("椤圭洰id")
+ @Schema(description = "椤圭洰id")
private Long projectId;
- @ApiModelProperty("椤圭洰闃舵")
+ @Schema(description = "椤圭洰闃舵")
private String projectStage;
- @ApiModelProperty("鍒跺崟浜�")
+ @Schema(description = "鍒跺崟浜�")
private String maker;
- @ApiModelProperty("閫�璐у師鍥�")
+ @Schema(description = "閫�璐у師鍥�")
private String returnReason;
- @ApiModelProperty("閫�娆炬�婚")
+ @Schema(description = "閫�娆炬�婚")
private BigDecimal refundAmount;
- @ApiModelProperty("鍒跺崟鏃堕棿")
+ @Schema(description = "鍒跺崟鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime makeTime;
- @ApiModelProperty("缁撶畻浜�")
+ @Schema(description = "缁撶畻浜�")
private String settler;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
index b01cbad..6d267b7 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,42 +22,42 @@
@Getter
@Setter
@TableName("return_sale_product")
-@ApiModel(value = "ReturnSaleProduct瀵硅薄", description = "閫�璐т骇鍝佽〃")
+@Schema(name = "ReturnSaleProduct瀵硅薄", description = "閫�璐т骇鍝佽〃")
public class ReturnSaleProduct implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("涓婚敭id")
+ @Schema(description = "涓婚敭id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閫�璐у崟id")
+ @Schema(description = "閫�璐у崟id")
private Long returnManagementId;
- @ApiModelProperty("閫�璐т骇鍝乮d")
+ @Schema(description = "閫�璐т骇鍝乮d")
private Long returnSaleLedgerProductId;
- @ApiModelProperty("閫�璐т骇鍝佹暟閲�")
+ @Schema(description = "閫�璐т骇鍝佹暟閲�")
private BigDecimal num;
- @ApiModelProperty("閫�璐т骇鍝佸崟浠�")
+ @Schema(description = "閫�璐т骇鍝佸崟浠�")
private BigDecimal price;
- @ApiModelProperty("閫�璐т骇鍝侀噾棰�")
+ @Schema(description = "閫�璐т骇鍝侀噾棰�")
private BigDecimal amount;
- @ApiModelProperty("閫�璐х姸鎬� 0 鏈��鍥� 1宸查��璐�")
+ @Schema(description = "閫�璐х姸鎬� 0 鏈��鍥� 1宸查��璐�")
private Integer status;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鏄惁鏈夎川閲忛棶棰�(1-鏄� 2-鍚�)")
+ @Schema(description = "鏄惁鏈夎川閲忛棶棰�(1-鏄� 2-鍚�)")
private Integer isQuality;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/production/bean/dto/BomImportDto.java b/src/main/java/com/ruoyi/production/bean/dto/BomImportDto.java
index 10ae162..11393f3 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/BomImportDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/BomImportDto.java
@@ -1,38 +1,38 @@
package com.ruoyi.production.bean.dto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class BomImportDto {
- @ApiModelProperty("鐖朵骇鍝佸悕绉�")
+ @Schema(description = "鐖朵骇鍝佸悕绉�")
@Excel(name = "鐖朵骇鍝佸悕绉�")
private String parentName;
- @ApiModelProperty("鐖朵骇鍝佽鏍�")
+ @Schema(description = "鐖朵骇鍝佽鏍�")
@Excel(name = "鐖朵骇鍝佽鏍�")
private String parentSpec;
- @ApiModelProperty("瀛愪骇鍝佸悕绉�")
+ @Schema(description = "瀛愪骇鍝佸悕绉�")
@Excel(name = "瀛愪骇鍝佸悕绉�")
private String childName;
- @ApiModelProperty("瀛愪骇鍝佽鏍�")
+ @Schema(description = "瀛愪骇鍝佽鏍�")
@Excel(name = "瀛愪骇鍝佽鏍�")
private String childSpec;
- @ApiModelProperty("鍗曚綅鐢ㄩ噺")
+ @Schema(description = "鍗曚綅鐢ㄩ噺")
@Excel(name = "鍗曚綅鐢ㄩ噺")
private BigDecimal unitQty;
- @ApiModelProperty("宸ュ簭")
+ @Schema(description = "宸ュ簭")
@Excel(name = "宸ュ簭")
private String process;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remark;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java
index 9c0cdcf..85f28d1 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java
@@ -1,6 +1,6 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,26 +8,26 @@
@Data
public class ProductStructureDto {
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
private Long id;
- @ApiModelProperty("BOM涓婚敭ID")
+ @Schema(description = "BOM涓婚敭ID")
private Long bomId;
- @ApiModelProperty("鐖剁骇ID")
+ @Schema(description = "鐖剁骇ID")
private Long parentId;
- @ApiModelProperty("浜у搧鍨嬪彿ID")
+ @Schema(description = "浜у搧鍨嬪彿ID")
private Long productModelId;
- @ApiModelProperty("鍗曚綅鐢ㄩ噺")
+ @Schema(description = "鍗曚綅鐢ㄩ噺")
private BigDecimal unitQuantity;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("宸ュ簭ID")
+ @Schema(description = "宸ュ簭ID")
private Long processId;
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String processName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
- @ApiModelProperty("瀛愯妭鐐�")
+ @Schema(description = "瀛愯妭鐐�")
private List<ProductStructureDto> children;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionOrderRoutingOperationParamSyncDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionOrderRoutingOperationParamSyncDto.java
index 03bc0d0..0afb65e 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionOrderRoutingOperationParamSyncDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionOrderRoutingOperationParamSyncDto.java
@@ -1,14 +1,14 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class ProductionOrderRoutingOperationParamSyncDto {
- @ApiModelProperty("鐢熶骇璁㈠崟宸ュ簭鍙傛暟ID")
+ @Schema(description = "鐢熶骇璁㈠崟宸ュ簭鍙傛暟ID")
private Long productionOrderRoutingOperationId;
- @ApiModelProperty("鏄惁鏇挎崲宸叉湁鍙傛暟")
+ @Schema(description = "鏄惁鏇挎崲宸叉湁鍙傛暟")
private Boolean replaceExisting;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
index 5e0074f..b7adae6 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductionPlan;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,35 +19,35 @@
/**
* 鐗╂枡缂栫爜
*/
- @ApiModelProperty("鐗╂枡缂栫爜")
+ @Schema(description = "鐗╂枡缂栫爜")
@Excel(name = "鐗╂枡缂栫爜")
private String materialCode;
/**
* 浜у搧鍚嶇О
*/
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
/**
* 浜у搧瑙勬牸
*/
- @ApiModelProperty("浜у搧瑙勬牸")
+ @Schema(description = "浜у搧瑙勬牸")
@Excel(name = "浜у搧瑙勬牸")
private String model;
- @ApiModelProperty("浜у搧鍗曚綅")
+ @Schema(description = "浜у搧鍗曚綅")
@Excel(name = "浜у搧鍗曚綅")
private String unit;
- @ApiModelProperty(value = "鐢熶骇璁″垝id闆嗗悎")
+ @Schema(description = "鐢熶骇璁″垝id闆嗗悎")
private List<Long> ids;
- @ApiModelProperty(value = "涓嬪彂鏁伴噺")
+ @Schema(description = "涓嬪彂鏁伴噺")
private BigDecimal totalAssignedQuantity;
- @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
@@ -55,13 +55,13 @@
/**
* 鍏宠仈鐗╂枡淇℃伅琛�
*/
- @ApiModelProperty("鍏宠仈鐗╂枡淇℃伅琛↖D")
+ @Schema(description = "鍏宠仈鐗╂枡淇℃伅琛↖D")
private Long productMaterialId;
/**
* 寮哄害
*/
- @ApiModelProperty("寮哄害")
+ @Schema(description = "寮哄害")
@Excel(name = "寮哄害")
private String strength;
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
index d531eac..a6aa0ce 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
@@ -2,8 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -19,82 +18,82 @@
* @since 2026/03/11 11:28
*/
@Data
-@ApiModel("閿�鍞敓浜ч渶姹� Excel瀵煎叆瀵煎嚭DTO")
+@Schema(name = "閿�鍞敓浜ч渶姹� Excel瀵煎叆瀵煎嚭DTO")
public class ProductionPlanImportDto {
/**
* 鐢宠鍗曠紪鍙�
*/
- @ApiModelProperty("鐢宠鍗曠紪鍙�")
+ @Schema(description = "鐢宠鍗曠紪鍙�")
@Excel(name = "鐢宠鍗曠紪鍙�")
private String applyNo;
/**
* 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
/**
* 鐗╂枡缂栫爜
*/
- @ApiModelProperty("鐗╂枡缂栫爜")
+ @Schema(description = "鐗╂枡缂栫爜")
@Excel(name = "鐗╂枡缂栫爜")
private String materialCode;
/**
* 浜у搧鍚嶇О
*/
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
/**
* 浜у搧瑙勬牸
*/
- @ApiModelProperty("浜у搧瑙勬牸")
+ @Schema(description = "浜у搧瑙勬牸")
@Excel(name = "浜у搧瑙勬牸")
private String productSpec;
/**
* 闀�
*/
- @ApiModelProperty("闀�")
+ @Schema(description = "闀�")
@Excel(name = "闀�(mm)")
private Integer length;
/**
* 瀹�
*/
- @ApiModelProperty("瀹�")
+ @Schema(description = "瀹�")
@Excel(name = "瀹�(mm)")
private Integer width;
/**
* 楂�
*/
- @ApiModelProperty("楂�")
+ @Schema(description = "楂�")
@Excel(name = "楂�(mm)")
private Integer height;
/**
* 鍧楁暟
*/
- @ApiModelProperty("鍧楁暟")
+ @Schema(description = "鍧楁暟")
@Excel(name = "鍧楁暟")
private Integer quantity;
/**
* 鏂规暟
*/
- @ApiModelProperty("鏂规暟")
+ @Schema(description = "鏂规暟")
@Excel(name = "鏂规暟")
private BigDecimal volume;
/**
* 寮哄害
*/
- @ApiModelProperty("寮哄害")
+ @Schema(description = "寮哄害")
@Excel(name = "寮哄害")
private String strength;
@@ -102,7 +101,7 @@
* 寮�濮嬫棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Schema(description = "寮�濮嬫棩鏈�")
@Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd")
private Date startDate;
@@ -110,68 +109,68 @@
* 缁撴潫鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @ApiModelProperty("缁撴潫鏃ユ湡")
+ @Schema(description = "缁撴潫鏃ユ湡")
@Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd")
private Date endDate;
/**
* 鎻愪氦浜�
*/
- @ApiModelProperty("鎻愪氦浜�")
+ @Schema(description = "鎻愪氦浜�")
@Excel(name = "鎻愪氦浜�")
private String submitter;
/**
* 鎻愪氦浜虹粍缁�
*/
- @ApiModelProperty("鎻愪氦浜虹粍缁�")
+ @Schema(description = "鎻愪氦浜虹粍缁�")
@Excel(name = "鎻愪氦浜虹粍缁�")
private String submitOrg;
/**
* 澶囨敞1
*/
- @ApiModelProperty("澶囨敞1")
+ @Schema(description = "澶囨敞1")
@Excel(name = "澶囨敞1")
private String remarkOne;
/**
* 澶囨敞2
*/
- @ApiModelProperty("澶囨敞2")
+ @Schema(description = "澶囨敞2")
@Excel(name = "澶囨敞2")
private String remarkTwo;
/**
* 鍒涘缓浜�
*/
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@Excel(name = "鍒涘缓浜�", type = Excel.Type.EXPORT)
private String creatorName;
/**
* 淇敼浜�
*/
- @ApiModelProperty("淇敼浜�")
+ @Schema(description = "淇敼浜�")
@Excel(name = "淇敼浜�", type = Excel.Type.EXPORT)
private String modifierName;
/**
* 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
*/
- @ApiModelProperty("鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
+ @Schema(description = "鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
private Integer dataSyncType;
/**
* 鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板
*/
- @ApiModelProperty("鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
+ @Schema(description = "鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
private Integer dataSourceType;
/**
* 涓嬪彂鏁伴噺
*/
- @ApiModelProperty("涓嬪彂鏁伴噺")
+ @Schema(description = "涓嬪彂鏁伴噺")
@Excel(name = "涓嬪彂鏁伴噺", type = Excel.Type.EXPORT)
private BigDecimal assignedQuantity;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanSummaryDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanSummaryDto.java
index b862476..8f7ea6e 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanSummaryDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanSummaryDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -12,61 +11,61 @@
* </br>
*/
@Data
-@ApiModel("鐢熶骇闇�姹備骇鍝佹眹鎬�")
+@Schema(name = "鐢熶骇闇�姹備骇鍝佹眹鎬�")
public class ProductionPlanSummaryDto {
/**
* 鐗╂枡缂栫爜
*/
- @ApiModelProperty("鐗╂枡缂栫爜")
+ @Schema(description = "鐗╂枡缂栫爜")
private String materialCode;
/**
* 浜у搧鍚嶇О
*/
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
/**
* 浜у搧瑙勬牸
*/
- @ApiModelProperty("浜у搧瑙勬牸")
+ @Schema(description = "浜у搧瑙勬牸")
private String model;
/**
* 浜у搧闀垮害
*/
- @ApiModelProperty("浜у搧闀垮害")
+ @Schema(description = "浜у搧闀垮害")
private Integer length;
/**
* 浜у搧瀹藉害
*/
- @ApiModelProperty("浜у搧瀹藉害")
+ @Schema(description = "浜у搧瀹藉害")
private Integer width;
/**
* 浜у搧楂樺害
*/
- @ApiModelProperty("浜у搧楂樺害")
+ @Schema(description = "浜у搧楂樺害")
private Integer height;
/**
* 姹囨�诲潡鏁�
*/
- @ApiModelProperty("姹囨�诲潡鏁�")
+ @Schema(description = "姹囨�诲潡鏁�")
private Integer quantity;
/**
* 姹囨�绘柟鏁�
*/
- @ApiModelProperty("姹囨�绘柟鏁�")
+ @Schema(description = "姹囨�绘柟鏁�")
private BigDecimal volume;
/**
* 鍩烘湰鍗曚綅
*/
- @ApiModelProperty("鍩烘湰鍗曚綅")
+ @Schema(description = "鍩烘湰鍗曚綅")
private String unit;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductInputDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductInputDto.java
index 0ca0a25..0a2a139 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductInputDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductInputDto.java
@@ -1,6 +1,6 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,37 +8,37 @@
@Data
public class ProductionProductInputDto {
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
private Long id;
- @ApiModelProperty("浜у搧涓昏〃ID")
+ @Schema(description = "浜у搧涓昏〃ID")
private Long productMainId;
- @ApiModelProperty("鐢熶骇浜у搧涓昏〃ID")
+ @Schema(description = "鐢熶骇浜у搧涓昏〃ID")
private Long productionProductMainId;
- @ApiModelProperty("浜у搧鍨嬪彿ID")
+ @Schema(description = "浜у搧鍨嬪彿ID")
private Long productModelId;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鎶曞叆鏁伴噺")
+ @Schema(description = "鎶曞叆鏁伴噺")
private BigDecimal inputQuantity;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
private Long tenantId;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
private Integer updateUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
private Long deptId;
- @ApiModelProperty("浜у搧缂栧彿")
+ @Schema(description = "浜у搧缂栧彿")
private String productNo;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
index 26ef072..e5754bf 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -1,6 +1,6 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -9,59 +9,59 @@
@Data
public class ProductionProductMainDto {
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
private Long id;
- @ApiModelProperty("浜у搧缂栧彿")
+ @Schema(description = "浜у搧缂栧彿")
private String productNo;
- @ApiModelProperty("鐢ㄦ埛ID")
+ @Schema(description = "鐢ㄦ埛ID")
private Long userId;
- @ApiModelProperty("鐢ㄦ埛鍚嶇О")
+ @Schema(description = "鐢ㄦ埛鍚嶇О")
private String userName;
- @ApiModelProperty("浜у搧宸ヨ壓璺嚎鏄庣粏ID")
+ @Schema(description = "浜у搧宸ヨ壓璺嚎鏄庣粏ID")
private Long productProcessRouteItemId;
- @ApiModelProperty("宸ュ崟ID")
+ @Schema(description = "宸ュ崟ID")
private Long workOrderId;
- @ApiModelProperty("鐢熶骇宸ュ簭浠诲姟ID")
+ @Schema(description = "鐢熶骇宸ュ簭浠诲姟ID")
private Long productionOperationTaskId;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
private Long tenantId;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
private Integer updateUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
private Long deptId;
- @ApiModelProperty("宸ュ崟缂栧彿")
+ @Schema(description = "宸ュ崟缂栧彿")
private String workOrderNo;
- @ApiModelProperty("宸ュ崟鐘舵��")
+ @Schema(description = "宸ュ崟鐘舵��")
private String workOrderStatus;
- @ApiModelProperty("鏄电О")
+ @Schema(description = "鏄电О")
private String nickName;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鎶ュ簾鏁伴噺")
+ @Schema(description = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("浜у搧鍨嬪彿鍚嶇О")
+ @Schema(description = "浜у搧鍨嬪彿鍚嶇О")
private String productModelName;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("閿�鍞悎鍚岀紪鍙�")
+ @Schema(description = "閿�鍞悎鍚岀紪鍙�")
private String salesContractNo;
- @ApiModelProperty("鎺掍骇鏃ユ湡")
+ @Schema(description = "鎺掍骇鏃ユ湡")
private LocalDate schedulingDate;
- @ApiModelProperty("鎺掍骇浜哄憳鍚嶇О")
+ @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
private String schedulingUserName;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("宸ュ簭")
+ @Schema(description = "宸ュ簭")
private String process;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductOutputDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductOutputDto.java
index 1e2cbb2..73acbe4 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductOutputDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductOutputDto.java
@@ -1,6 +1,6 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,33 +8,33 @@
@Data
public class ProductionProductOutputDto {
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
private Long id;
- @ApiModelProperty("浜у搧涓昏〃ID")
+ @Schema(description = "浜у搧涓昏〃ID")
private Long productMainId;
- @ApiModelProperty("鐢熶骇浜у搧涓昏〃ID")
+ @Schema(description = "鐢熶骇浜у搧涓昏〃ID")
private Long productionProductMainId;
- @ApiModelProperty("浜у搧鍨嬪彿ID")
+ @Schema(description = "浜у搧鍨嬪彿ID")
private Long productModelId;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鎶ュ簾鏁伴噺")
+ @Schema(description = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
private Long tenantId;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
private Integer updateUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
private Long deptId;
- @ApiModelProperty("浜у搧缂栧彿")
+ @Schema(description = "浜у搧缂栧彿")
private String productNo;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/bean/dto/SalesLedgerProductionAccountingDto.java
index 366c61e..9b2054e 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/SalesLedgerProductionAccountingDto.java
@@ -1,20 +1,20 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@Data
public class SalesLedgerProductionAccountingDto {
- @ApiModelProperty("鐢ㄦ埛ID")
+ @Schema(description = "鐢ㄦ埛ID")
private Long userId;
- @ApiModelProperty("鐢ㄦ埛鍚嶇О")
+ @Schema(description = "鐢ㄦ埛鍚嶇О")
private String userName;
- @ApiModelProperty("宸ュ簭")
+ @Schema(description = "宸ュ簭")
private String process;
- @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Schema(description = "寮�濮嬫棩鏈�")
private LocalDate startDate;
- @ApiModelProperty("缁撴潫鏃ユ湡")
+ @Schema(description = "缁撴潫鏃ユ湡")
private LocalDate endDate;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/UserAccountDto.java b/src/main/java/com/ruoyi/production/bean/dto/UserAccountDto.java
index b991e8f..6e371fe 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/UserAccountDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/UserAccountDto.java
@@ -1,14 +1,14 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class UserAccountDto {
- @ApiModelProperty("閲戦")
+ @Schema(description = "閲戦")
private BigDecimal account = BigDecimal.ZERO;
- @ApiModelProperty("璐︽埛浣欓")
+ @Schema(description = "璐︽埛浣欓")
private BigDecimal accountBalance = BigDecimal.ZERO;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/UserProductionAccountingDto.java b/src/main/java/com/ruoyi/production/bean/dto/UserProductionAccountingDto.java
index ca86abf..aafe767 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/UserProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/UserProductionAccountingDto.java
@@ -1,12 +1,12 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class UserProductionAccountingDto {
- @ApiModelProperty("鐢ㄦ埛ID")
+ @Schema(description = "鐢ㄦ埛ID")
private Long userId;
- @ApiModelProperty("鏃ユ湡")
+ @Schema(description = "鏃ユ湡")
private String date;
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
index f03f46b..52a4357 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
@@ -6,8 +6,8 @@
import com.ruoyi.production.bean.vo.ProductionOperationTaskVo;
import com.ruoyi.production.pojo.ProductionOperationTask;
import com.ruoyi.production.service.ProductionOperationTaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,44 +22,44 @@
@RestController
@RequestMapping("/productionOperationTask")
-@Api(tags = "鐢熶骇宸ュ崟")
+@Tag(name = "鐢熶骇宸ュ崟")
@RequiredArgsConstructor
public class ProductionOperationTaskController {
private final ProductionOperationTaskService productionOperationTaskService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
return R.ok(productionOperationTaskService.pageProductionOperationTask(page, dto));
}
@GetMapping("/list")
- @ApiOperation("宸ュ崟鍒楄〃")
+ @Operation(summary = "宸ュ崟鍒楄〃")
public R<List<ProductionOperationTaskVo>> list(ProductionOperationTaskDto dto) {
return R.ok(productionOperationTaskService.listProductionOperationTask(dto));
}
@GetMapping("/{id}")
- @ApiOperation("宸ュ崟璇︽儏")
+ @Operation(summary = "宸ュ崟璇︽儏")
public R<ProductionOperationTaskVo> getInfo(@PathVariable("id") Long id) {
return R.ok(productionOperationTaskService.getProductionOperationTaskInfo(id));
}
@PostMapping
- @ApiOperation("鏂板宸ュ崟")
+ @Operation(summary = "鏂板宸ュ崟")
public R<Boolean> add(@RequestBody ProductionOperationTask productionOperationTask) {
return R.ok(productionOperationTaskService.saveProductionOperationTask(productionOperationTask));
}
@PutMapping
- @ApiOperation("淇敼宸ュ崟")
+ @Operation(summary = "淇敼宸ュ崟")
public R<Boolean> edit(@RequestBody ProductionOperationTask productionOperationTask) {
return R.ok(productionOperationTaskService.saveProductionOperationTask(productionOperationTask));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎宸ュ崟")
+ @Operation(summary = "鍒犻櫎宸ュ崟")
public R<Boolean> remove(@RequestBody List<Long> ids) {
return R.ok(productionOperationTaskService.removeProductionOperationTask(ids));
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index 9558c8d..32d48f2 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -6,8 +6,8 @@
import com.ruoyi.production.bean.vo.ProductionOrderVo;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.service.ProductionOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,50 +22,50 @@
@RestController
@RequestMapping("/productionOrder")
-@Api(tags = "鐢熶骇璁㈠崟")
+@Tag(name = "鐢熶骇璁㈠崟")
@RequiredArgsConstructor
public class ProductionOrderController {
private final ProductionOrderService productionOrderService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(ProductionOrderDto dto, Page<ProductionOrderDto> page) {
return R.ok(productionOrderService.pageProductionOrder(page, dto));
}
@GetMapping("/list")
- @ApiOperation("鐢熶骇璁㈠崟鍒楄〃")
+ @Operation(summary = "鐢熶骇璁㈠崟鍒楄〃")
public R<List<ProductionOrderVo>> list(ProductionOrderDto dto) {
return R.ok(productionOrderService.listProductionOrder(dto));
}
@GetMapping("/{id}")
- @ApiOperation("鐢熶骇璁㈠崟璇︽儏")
+ @Operation(summary = "鐢熶骇璁㈠崟璇︽儏")
public R<ProductionOrderVo> getInfo(@PathVariable("id") Long id) {
return R.ok(productionOrderService.getProductionOrderInfo(id));
}
@PostMapping
- @ApiOperation("鏂板鐢熶骇璁㈠崟")
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟")
public R<Boolean> add(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
@PutMapping
- @ApiOperation("淇敼鐢熶骇璁㈠崟")
+ @Operation(summary = "淇敼鐢熶骇璁㈠崟")
public R<Boolean> edit(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
@PostMapping("/syncSnapshot/{id}")
- @ApiOperation("鍚屾鐢熶骇璁㈠崟宸ヨ壓/BOM蹇収")
+ @Operation(summary = "鍚屾鐢熶骇璁㈠崟宸ヨ壓/BOM蹇収")
public R<Integer> syncSnapshot(@PathVariable("id") Long id) {
return R.ok(productionOrderService.syncProductionOrderSnapshot(id));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎鐢熶骇璁㈠崟")
+ @Operation(summary = "鍒犻櫎鐢熶骇璁㈠崟")
public R<Boolean> remove(@RequestBody List<Long> ids) {
return R.ok(productionOrderService.removeProductionOrder(ids));
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java
index cb79e85..dda1aa0 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java
@@ -4,14 +4,14 @@
import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import com.ruoyi.production.service.ProductionOrderRoutingOperationService;
import com.ruoyi.production.service.ProductionOrderRoutingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/productionOrderRouting")
-@Api(tags = "鐢熶骇璁㈠崟宸ヨ壓璺嚎")
+@Tag(name = "鐢熶骇璁㈠崟宸ヨ壓璺嚎")
@RequiredArgsConstructor
public class ProductionOrderRoutingController {
@@ -19,37 +19,37 @@
private final ProductionOrderRoutingOperationService productionOrderRoutingOperationService;
@GetMapping("list")
- @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓璺嚎瀛愯〃")
+ @Operation(summary = "鏍规嵁Id鏌ヨ宸ヨ壓璺嚎瀛愯〃")
public R list(Long orderId) {
return R.ok(productionOrderRoutingService.listItem(orderId));
}
@GetMapping("listMain")
- @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓璺嚎涓昏〃")
+ @Operation(summary = "鏍规嵁Id鏌ヨ宸ヨ壓璺嚎涓昏〃")
public R listMain(Long orderId) {
return R.ok(productionOrderRoutingService.listMain(orderId));
}
@PostMapping("/addRouteItem")
- @ApiOperation("鏂板鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
public R addRouteItem(@RequestBody ProductionOrderRoutingOperation productionOrderRoutingOperation) {
return productionOrderRoutingOperationService.addRouteItem(productionOrderRoutingOperation);
}
@PostMapping("/updateRouteItem")
- @ApiOperation("淇敼鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
+ @Operation(summary = "淇敼鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
public R updateRouteItem(@RequestBody ProductionOrderRoutingOperation productionOrderRoutingOperation) {
return R.ok(productionOrderRoutingOperationService.updateById(productionOrderRoutingOperation));
}
@DeleteMapping("/deleteRouteItem/{id}")
- @ApiOperation("鍒犻櫎鐢熶骇宸ヨ壓璺嚎")
+ @Operation(summary = "鍒犻櫎鐢熶骇宸ヨ壓璺嚎")
public R deleteRouteItem(@PathVariable("id") Long id) {
return productionOrderRoutingOperationService.deleteRouteItem(id);
}
@PostMapping("/sortRouteItem")
- @ApiOperation("鎺掑簭")
+ @Operation(summary = "鎺掑簭")
public R sortRouteItem(@RequestBody ProductionOrderRoutingOperation productionOrderRoutingOperation) {
return R.ok(productionOrderRoutingOperationService.sortRouteItem(productionOrderRoutingOperation));
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingOperationParamController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingOperationParamController.java
index f84ae83..db37dbb 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingOperationParamController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingOperationParamController.java
@@ -8,8 +8,8 @@
import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationParamVo;
import com.ruoyi.production.pojo.ProductionOrderRoutingOperationParam;
import com.ruoyi.production.service.ProductionOrderRoutingOperationParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,51 +17,51 @@
@RestController
@RequestMapping("/productionOrderRoutingOperationParam")
-@Api(tags = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+@Tag(name = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
@RequiredArgsConstructor
public class ProductionOrderRoutingOperationParamController {
private final ProductionOrderRoutingOperationParamService productionOrderRoutingOperationParamService;
@GetMapping("/page")
- @ApiOperation("鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒嗛〉鏌ヨ")
+ @Operation(summary = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒嗛〉鏌ヨ")
public R<IPage<ProductionOrderRoutingOperationParamVo>> page(Page<ProductionOrderRoutingOperationParamDto> page,
ProductionOrderRoutingOperationParamDto dto) {
return R.ok(productionOrderRoutingOperationParamService.pageProductionOrderRoutingOperationParam(page, dto));
}
@GetMapping("/list")
- @ApiOperation("鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒楄〃")
+ @Operation(summary = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒楄〃")
public R<List<ProductionOrderRoutingOperationParamVo>> list(ProductionOrderRoutingOperationParamDto dto) {
return R.ok(productionOrderRoutingOperationParamService.listProductionOrderRoutingOperationParam(dto));
}
@GetMapping("/{id}")
- @ApiOperation("鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟璇︽儏")
+ @Operation(summary = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟璇︽儏")
public R<ProductionOrderRoutingOperationParamVo> getInfo(@PathVariable("id") Long id) {
return R.ok(productionOrderRoutingOperationParamService.getProductionOrderRoutingOperationParamInfo(id));
}
@PostMapping
- @ApiOperation("鏂板鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
public R<Boolean> add(@RequestBody ProductionOrderRoutingOperationParam item) {
return R.ok(productionOrderRoutingOperationParamService.saveProductionOrderRoutingOperationParam(item));
}
@PutMapping
- @ApiOperation("淇敼鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+ @Operation(summary = "淇敼鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
public R<Boolean> edit(@RequestBody ProductionOrderRoutingOperationParam item) {
return R.ok(productionOrderRoutingOperationParamService.saveProductionOrderRoutingOperationParam(item));
}
@DeleteMapping("/{id}")
- @ApiOperation("鍒犻櫎鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+ @Operation(summary = "鍒犻櫎鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
public R<Boolean> remove(@PathVariable("id") Long id) {
return R.ok(productionOrderRoutingOperationParamService.removeProductionOrderRoutingOperationParam(id));
}
@PostMapping("/sync")
- @ApiOperation("鎸夎鍗曞伐鑹鸿矾绾垮伐搴忓悓姝ュ伐搴忓弬鏁�")
+ @Operation(summary = "鎸夎鍗曞伐鑹鸿矾绾垮伐搴忓悓姝ュ伐搴忓弬鏁�")
public R<Integer> sync(@RequestBody ProductionOrderRoutingOperationParamSyncDto syncDto) {
return R.ok(productionOrderRoutingOperationParamService.syncProductionOrderRoutingOperationParam(syncDto));
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
index b89d8b1..6190a47 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
@@ -10,8 +10,8 @@
import com.ruoyi.production.bean.dto.ProductionPlanImportDto;
import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.service.ProductionPlanService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -31,20 +31,20 @@
@RestController
@RequestMapping("/productionPlan")
@RequiredArgsConstructor
-@Api(tags = "涓荤敓浜ц鍒�")
+@Tag(name = "涓荤敓浜ц鍒�")
public class ProductionPlanController {
private final ProductionPlanService productionPlanService;
@GetMapping("/listPage")
- @ApiOperation("鑾峰彇鐢熶骇璁″垝鍒楄〃")
+ @Operation(summary = "鑾峰彇鐢熶骇璁″垝鍒楄〃")
public R<IPage<ProductionPlanVo>> productionPlanListPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
return R.ok(productionPlanService.listPage(page, productionPlanDto));
}
@PostMapping("/combine")
@Log(title = "鍚堝苟鐢熶骇璁″垝", businessType = BusinessType.INSERT)
- @ApiOperation("鍚堝苟鐢熶骇璁″垝")
+ @Operation(summary = "鍚堝苟鐢熶骇璁″垝")
public R combine(@RequestBody ProductionPlanDto productionPlanDto) {
if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return R.fail("璇烽�夋嫨瑕佷笅鍙戠殑鐢熶骇璁″垝");
@@ -58,35 +58,35 @@
@PostMapping("addProductionPlan")
@Log(title = "鍒涘缓鐢熶骇璁″垝", businessType = BusinessType.INSERT)
- @ApiOperation("鍒涘缓鐢熶骇璁″垝")
+ @Operation(summary = "鍒涘缓鐢熶骇璁″垝")
public R add(@RequestBody ProductionPlanDto productionPlanDto) {
return R.ok(productionPlanService.add(productionPlanDto));
}
@PutMapping("updateProductionPlan")
@Log(title = "鏇存柊鐢熶骇璁″垝", businessType = BusinessType.UPDATE)
- @ApiOperation("鏇存柊鐢熶骇璁″垝")
+ @Operation(summary = "鏇存柊鐢熶骇璁″垝")
public R update(@RequestBody ProductionPlanDto productionPlanDto) {
return R.ok(productionPlanService.update(productionPlanDto));
}
@DeleteMapping("deleteProductionPlan")
@Log(title = "鍒犻櫎鐢熶骇璁″垝", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎鐢熶骇璁″垝")
+ @Operation(summary = "鍒犻櫎鐢熶骇璁″垝")
public R delete(@RequestBody List<Long> ids) {
return R.ok(productionPlanService.delete(ids));
}
@PostMapping("/downloadTemplate")
@Log(title = "涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�", businessType = BusinessType.EXPORT)
- @ApiOperation("涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�")
+ @Operation(summary = "涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�")
public void importTemplate(HttpServletResponse response) {
ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
excelUtil.importTemplateExcel(response, "涓荤敓浜ц鍒掑鍏ユā鏉�");
}
@PostMapping("/import")
- @ApiOperation("涓荤敓浜ц鍒掓暟鎹鍏�")
+ @Operation(summary = "涓荤敓浜ц鍒掓暟鎹鍏�")
@Log(title = "涓荤敓浜ц鍒掓暟鎹鍏�", businessType = BusinessType.IMPORT)
public R importProdData(@RequestParam("file") MultipartFile file) {
productionPlanService.importProdData(file);
@@ -94,7 +94,7 @@
}
@PostMapping("/export")
- @ApiOperation("涓荤敓浜ц鍒掓暟鎹鍑�")
+ @Operation(summary = "涓荤敓浜ц鍒掓暟鎹鍑�")
@Log(title = "涓荤敓浜ц鍒掓暟鎹鍑�", businessType = BusinessType.EXPORT)
public void exportProdData(HttpServletResponse response, @RequestBody(required = false) List<Long> ids) {
productionPlanService.exportProdData(response, ids);
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
index 6ec91cb..c1d7b91 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionProductInputDto;
import com.ruoyi.production.service.ProductionProductInputService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -13,7 +13,7 @@
@RequestMapping("productionProductInput")
@RestController
-@Api(value = "鐢熶骇鎶曞叆")
+@Tag(name = "鐢熶骇鎶曞叆")
@AllArgsConstructor
public class ProductionProductInputController {
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 09e265a..2dc751e 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionProductMainDto;
import com.ruoyi.production.service.ProductionProductMainService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@
@RequestMapping("productionProductMain")
@RestController
-@Api(value = "鐢熶骇鎶ュ伐")
+@Tag(name = "鐢熶骇鎶ュ伐")
@AllArgsConstructor
public class ProductionProductMainController {
@@ -34,13 +34,13 @@
}
@GetMapping("/page")
- @ApiOperation("鐢熶骇鎶ュ伐鍒嗛〉鏌ヨ")
+ @Operation(summary = "鐢熶骇鎶ュ伐鍒嗛〉鏌ヨ")
public R pageProductionProductMain(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.pageProductionProductMain(page, productionProductMainDto));
}
@GetMapping("/{id}")
- @ApiOperation("鐢熶骇鎶ュ伐璇︽儏")
+ @Operation(summary = "鐢熶骇鎶ュ伐璇︽儏")
public R getInfo(@PathVariable("id") Long id) {
return R.ok(productionProductMainService.getProductionProductMainInfo(id));
}
@@ -56,25 +56,25 @@
}
@PostMapping
- @ApiOperation("鏂板鐢熶骇鎶ュ伐")
+ @Operation(summary = "鏂板鐢熶骇鎶ュ伐")
public R add(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
}
@PutMapping
- @ApiOperation("淇敼鐢熶骇鎶ュ伐")
+ @Operation(summary = "淇敼鐢熶骇鎶ュ伐")
public R edit(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
}
- @ApiOperation("鍒犻櫎鎶ュ伐")
+ @Operation(summary = "鍒犻櫎鎶ュ伐")
@DeleteMapping("/delete")
public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.removeProductMain(productionProductMainDto.getId()));
}
@DeleteMapping("/{id}")
- @ApiOperation("鍒犻櫎鐢熶骇鎶ュ伐")
+ @Operation(summary = "鍒犻櫎鐢熶骇鎶ュ伐")
public R remove(@PathVariable("id") Long id) {
return R.ok(productionProductMainService.removeProductMain(id));
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java
index 3fbb16d..2d3fe80 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductOutputController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionProductOutputDto;
import com.ruoyi.production.service.ProductionProductOutputService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,7 +12,7 @@
@RequestMapping("productionProductOutput")
@RestController
-@Api(value = "鐢熶骇浜у嚭")
+@Tag(name = "鐢熶骇浜у嚭")
@AllArgsConstructor
public class ProductionProductOutputController {
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionAccount.java b/src/main/java/com/ruoyi/production/pojo/ProductionAccount.java
index 17ea424..e205db2 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionAccount.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionAccount.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -19,59 +18,59 @@
*/
@Data
@TableName("production_account")
-@ApiModel(value = "ProductionAccount瀵硅薄", description = "鐢熶骇鏍哥畻琛�")
+@Schema(name = "ProductionAccount瀵硅薄", description = "鐢熶骇鏍哥畻琛�")
public class ProductionAccount implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭")
+ @Schema(description = "涓婚敭")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閿�鍞彴璐d")
+ @Schema(description = "閿�鍞彴璐d")
private Long salesLedgerId;
- @ApiModelProperty("閿�鍞骇鍝佽鏍糹d")
+ @Schema(description = "閿�鍞骇鍝佽鏍糹d")
private Long salesLedgerProductId;
- @ApiModelProperty("鎶ュ伐琛╥d")
+ @Schema(description = "鎶ュ伐琛╥d")
private Long productionProductMainId;
- @ApiModelProperty("鐢熶骇浜篿d")
+ @Schema(description = "鐢熶骇浜篿d")
private Long schedulingUserId;
- @ApiModelProperty("鐢熶骇浜哄悕绉�")
+ @Schema(description = "鐢熶骇浜哄悕绉�")
private String schedulingUserName;
- @ApiModelProperty("鐢熶骇鏁伴噺")
+ @Schema(description = "鐢熶骇鏁伴噺")
private BigDecimal finishedNum;
- @ApiModelProperty("宸ユ椂瀹氶")
+ @Schema(description = "宸ユ椂瀹氶")
private BigDecimal workHours;
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String technologyOperationName;
- @ApiModelProperty("鐢熶骇鏃ユ湡")
+ @Schema(description = "鐢熶骇鏃ユ湡")
private LocalDateTime schedulingDate;
- @ApiModelProperty("鍒涘缓鑰�")
+ @Schema(description = "鍒涘缓鑰�")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("淇敼鑰�")
+ @Schema(description = "淇敼鑰�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java
index e48c0e8..5ba8d22 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -20,44 +19,44 @@
*/
@Data
@TableName("production_bom_structure")
-@ApiModel(value = "ProductionBomStructure瀵硅薄", description = "鐢熶骇璁㈠崟BOM浜у搧缁撴瀯")
+@Schema(name = "ProductionBomStructure瀵硅薄", description = "鐢熶骇璁㈠崟BOM浜у搧缁撴瀯")
public class ProductionBomStructure implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐖惰妭鐐笽D")
+ @Schema(description = "鐖惰妭鐐笽D")
private Long parentId;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("鐢熶骇璁㈠崟BOMid")
+ @Schema(description = "鐢熶骇璁㈠崟BOMid")
private Long productionOrderBomId;
- @ApiModelProperty("鍗曚綅浜у嚭闇�瑕佹暟閲�")
+ @Schema(description = "鍗曚綅浜у嚭闇�瑕佹暟閲�")
private BigDecimal unitQuantity;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal demandedQuantity;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOperationMainParam.java b/src/main/java/com/ruoyi/production/pojo/ProductionOperationMainParam.java
index 87c8704..08d1807 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOperationMainParam.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOperationMainParam.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -20,77 +19,77 @@
*/
@Data
@TableName("production_operation_main_param")
-@ApiModel(value = "ProductionOperationMainParam瀵硅薄", description = "鐢熶骇宸ュ崟鎶ュ伐鍙傛暟琛�")
+@Schema(name = "ProductionOperationMainParam瀵硅薄", description = "鐢熶骇宸ュ崟鎶ュ伐鍙傛暟琛�")
public class ProductionOperationMainParam implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭鍙傛暟琛╥d")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟琛╥d")
private Long technologyRoutingOperationParamId;
- @ApiModelProperty("鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
+ @Schema(description = "鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ @Schema(description = "鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private String createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("淇敼浜�")
+ @Schema(description = "淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("鍩虹鍙傛暟ID")
+ @Schema(description = "鍩虹鍙傛暟ID")
private Long technologyParamId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("宸ュ簭鍙傛暟ID")
+ @Schema(description = "宸ュ簭鍙傛暟ID")
private Long technologyOperationParamId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭ID")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭ID")
private Long technologyRoutingOperationId;
- @ApiModelProperty("鏍囧噯鍊�")
+ @Schema(description = "鏍囧噯鍊�")
private String standardValue;
- @ApiModelProperty("杈撳叆鍊�")
+ @Schema(description = "杈撳叆鍊�")
private String value;
- @ApiModelProperty("鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟ID")
+ @Schema(description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟ID")
private String productionOrderRoutingOperationParamId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
index 99f852a..edcd62f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -20,58 +19,58 @@
*/
@Data
@TableName("production_operation_task")
-@ApiModel(value = "ProductionOperationTask瀵硅薄", description = "鐢熶骇宸ュ崟琛�")
+@Schema(name = "ProductionOperationTask瀵硅薄", description = "鐢熶骇宸ュ崟琛�")
public class ProductionOperationTask implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭琛╥d")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
private Long technologyRoutingOperationId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ュ崟缂栧彿")
+ @Schema(description = "宸ュ崟缂栧彿")
private String workOrderNo;
- @ApiModelProperty("璁″垝寮�濮嬫椂闂�")
+ @Schema(description = "璁″垝寮�濮嬫椂闂�")
private LocalDate planStartTime;
- @ApiModelProperty("璁″垝缁撴潫鏃堕棿")
+ @Schema(description = "璁″垝缁撴潫鏃堕棿")
private LocalDate planEndTime;
- @ApiModelProperty("瀹為檯寮�濮嬫椂闂�")
+ @Schema(description = "瀹為檯寮�濮嬫椂闂�")
private LocalDate actualStartTime;
- @ApiModelProperty("瀹為檯缁撴潫鏃堕棿")
+ @Schema(description = "瀹為檯缁撴潫鏃堕棿")
private LocalDate actualEndTime;
- @ApiModelProperty("鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
+ @Schema(description = "鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
private Integer status;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("璁″垝鏁伴噺")
+ @Schema(description = "璁″垝鏁伴噺")
private BigDecimal planQuantity;
- @ApiModelProperty("瀹屾垚鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index 9d0d80d..0f634bd 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -22,7 +21,7 @@
*/
@Data
@TableName("production_order")
-@ApiModel(value = "ProductionOrder瀵硅薄", description = "鐢熶骇璁㈠崟琛�")
+@Schema(name = "ProductionOrder瀵硅薄", description = "鐢熶骇璁㈠崟琛�")
public class ProductionOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,60 +29,60 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閿�鍞彴璐d")
+ @Schema(description = "閿�鍞彴璐d")
private Long salesLedgerId;
- @ApiModelProperty("鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]")
+ @Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]")
private String productionPlanIds;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("鐢熶骇璁㈠崟鍙�")
+ @Schema(description = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id")
private Long technologyRoutingId;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal quantity;
- @ApiModelProperty("瀹屾垚鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Schema(description = "寮�濮嬫棩鏈�")
private LocalDateTime startTime;
- @ApiModelProperty("缁撴潫鏃ユ湡")
+ @Schema(description = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
- @ApiModelProperty("閿�鍞骇鍝佽鏍糹d")
+ @Schema(description = "閿�鍞骇鍝佽鏍糹d")
private Integer saleLedgerProductId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
- @ApiModelProperty(value = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
+ @Schema(description = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
private Integer status;
- @ApiModelProperty("寮哄害")
+ @Schema(description = "寮哄害")
private String strength;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
index 26c981d..7086222 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -20,44 +19,44 @@
*/
@Data
@TableName("production_order_bom")
-@ApiModel(value = "ProductionOrderBom瀵硅薄", description = "鐢熶骇璁㈠崟BOM")
+@Schema(name = "ProductionOrderBom瀵硅薄", description = "鐢熶骇璁㈠崟BOM")
public class ProductionOrderBom implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐖惰妭鐐笽D")
+ @Schema(description = "鐖惰妭鐐笽D")
private Long parentId;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("鍗曚綅浜у嚭闇�瑕佹暟閲�")
+ @Schema(description = "鍗曚綅浜у嚭闇�瑕佹暟閲�")
private BigDecimal unitQuantity;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal demandedQuantity;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("bom鐨刬d")
+ @Schema(description = "bom鐨刬d")
private Long bomId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
index 6e67ce0..f488269 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -21,42 +20,42 @@
*/
@Data
@TableName("production_order_pick")
-@ApiModel(value = "ProductionOrderPick瀵硅薄", description = "璁㈠崟棰嗘枡绾胯竟浠�")
+@Schema(name = "ProductionOrderPick瀵硅薄", description = "璁㈠崟棰嗘枡绾胯竟浠�")
public class ProductionOrderPick implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭id")
+ @Schema(description = "涓婚敭id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Integer productModelId;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鎵瑰彿")
+ @Schema(description = "鎵瑰彿")
private String batchNo;
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java
index 3417b9a..dc610c2 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -21,58 +20,58 @@
*/
@Data
@TableName("production_order_pick_record")
-@ApiModel(value = "ProductionOrderPickRecord瀵硅薄", description = "绾胯竟浠撳嚭鍏ュ簱璁板綍")
+@Schema(name = "ProductionOrderPickRecord瀵硅薄", description = "绾胯竟浠撳嚭鍏ュ簱璁板綍")
public class ProductionOrderPickRecord implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭id")
+ @Schema(description = "涓婚敭id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈棰嗘枡鍗昳d锛坧roduction_order_pick.id锛�")
+ @Schema(description = "鍏宠仈棰嗘枡鍗昳d锛坧roduction_order_pick.id锛�")
private Long pickId;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("鐢熶骇宸ュ崟id")
+ @Schema(description = "鐢熶骇宸ュ崟id")
private Long productionOperationTaskId;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Integer productModelId;
- @ApiModelProperty("鎵瑰彿")
+ @Schema(description = "鎵瑰彿")
private String batchNo;
- @ApiModelProperty("棰嗘枡鏁伴噺")
+ @Schema(description = "棰嗘枡鏁伴噺")
private BigDecimal pickQuantity;
- @ApiModelProperty("棰嗘枡鍓嶆暟閲�")
+ @Schema(description = "棰嗘枡鍓嶆暟閲�")
private BigDecimal beforeQuantity;
- @ApiModelProperty("棰嗘枡鍚庡墿浣欐暟閲�")
+ @Schema(description = "棰嗘枡鍚庡墿浣欐暟閲�")
private BigDecimal afterQuantity;
- @ApiModelProperty("棰嗘枡绫诲瀷锛�1姝ｅ父棰嗘枡 2琛ユ枡")
+ @Schema(description = "棰嗘枡绫诲瀷锛�1姝ｅ父棰嗘枡 2琛ユ枡")
private Byte pickType;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
index b798cd1..8e8317e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("production_order_routing")
-@ApiModel(value = "ProductionOrderRouting瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎琛�")
+@Schema(name = "ProductionOrderRouting瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎琛�")
public class ProductionOrderRouting implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,37 +25,37 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("鎻忚堪")
+ @Schema(description = "鎻忚堪")
private String description;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id")
private Long technologyRoutingId;
- @ApiModelProperty("宸ヨ壓璺嚎缂栫爜")
+ @Schema(description = "宸ヨ壓璺嚎缂栫爜")
private String processRouteCode;
- @ApiModelProperty("鍏宠仈bom鐨刬d")
+ @Schema(description = "鍏宠仈bom鐨刬d")
private Integer bomId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index 17e8660..0a061c0 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -20,7 +19,7 @@
*/
@Data
@TableName("production_order_routing_operation")
-@ApiModel(value = "ProductionOrderRoutingOperation瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭琛�")
+@Schema(name = "ProductionOrderRoutingOperation瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭琛�")
public class ProductionOrderRoutingOperation implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,37 +27,37 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭琛╥d")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
private Long technologyRoutingOperationId;
- @ApiModelProperty("宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id")
private Long technologyRoutingId;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鎷栧姩鎺掑簭")
+ @Schema(description = "鎷栧姩鎺掑簭")
private Integer dragSort;
- @ApiModelProperty("鏄惁璐ㄦ宸ュ簭")
+ @Schema(description = "鏄惁璐ㄦ宸ュ簭")
private Boolean isQuality;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
index 3c1bc09..d1b7c3a 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -20,74 +19,74 @@
*/
@Data
@TableName("production_order_routing_operation_param")
-@ApiModel(value = "ProductionOrderRoutingOperationParam瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
+@Schema(name = "ProductionOrderRoutingOperationParam瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
public class ProductionOrderRoutingOperationParam implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭鍙傛暟琛╥d")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟琛╥d")
private Long technologyRoutingOperationParamId;
- @ApiModelProperty("鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
+ @Schema(description = "鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ @Schema(description = "鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private String createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("淇敼浜�")
+ @Schema(description = "淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("鍩虹鍙傛暟ID")
+ @Schema(description = "鍩虹鍙傛暟ID")
private Long paramId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("宸ュ簭鍙傛暟ID")
+ @Schema(description = "宸ュ簭鍙傛暟ID")
private Long technologyOperationParamId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭ID")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭ID")
private Long technologyRoutingOperationId;
- @ApiModelProperty("鏍囧噯鍊�")
+ @Schema(description = "鏍囧噯鍊�")
private String standardValue;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index 1b00082..868367c 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -22,65 +21,65 @@
@Getter
@Setter
@TableName("production_plan")
-@ApiModel(value = "ProductionPlan瀵硅薄", description = "鐢熶骇璁″垝琛�")
+@Schema(name = "ProductionPlan瀵硅薄", description = "鐢熶骇璁″垝琛�")
public class ProductionPlan implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("涓荤敓浜ц鍒掑彿")
+ @Schema(description = "涓荤敓浜ц鍒掑彿")
private String mpsNo;
- @ApiModelProperty("闇�姹傛棩鏈�")
+ @Schema(description = "闇�姹傛棩鏈�")
private LocalDateTime requiredDate;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("浜у搧鍨嬪彿id")
+ @Schema(description = "浜у搧鍨嬪彿id")
private Long productModelId;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal qtyRequired;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
@TableLogic
private String state;
- @ApiModelProperty("鏄惁涓嬪彂鍒堕�犺鍗�")
+ @Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
private Boolean issued;
- @ApiModelProperty("鏉ユ簮")
+ @Schema(description = "鏉ユ簮")
private String source;
- @ApiModelProperty("瀹℃牳鐘舵��")
+ @Schema(description = "瀹℃牳鐘舵��")
private String isAudit;
- @ApiModelProperty("鎵胯鏃ユ湡")
+ @Schema(description = "鎵胯鏃ユ湡")
private LocalDateTime promisedDeliveryDate;
- @ApiModelProperty("鐢宠鍗曠紪鍙�")
+ @Schema(description = "鐢宠鍗曠紪鍙�")
private String applyNo;
- @ApiModelProperty("鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
+ @Schema(description = "鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
private Integer status;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
index 8554767..0526bc1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
@@ -1,7 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -14,37 +14,37 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鎶ュ伐id")
+ @Schema(description = "鎶ュ伐id")
private Long productMainId;
- @ApiModelProperty(value = "鐢熶骇鎶ュ伐涓昏〃id")
+ @Schema(description = "鐢熶骇鎶ュ伐涓昏〃id")
private Long productionProductMainId;
- @ApiModelProperty(value = "浜у搧id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty(value = "鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty(value = "鎶曞叆鏁伴噺")
+ @Schema(description = "鎶曞叆鏁伴噺")
private BigDecimal inputQuantity;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+ @Schema(description = "鏇存柊鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index f38764f..0002b5b 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,49 +16,49 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鎶ュ伐鍗曞彿")
+ @Schema(description = "鎶ュ伐鍗曞彿")
@Excel(name = "鎶ュ伐鍗曞彿")
private String productNo;
- @ApiModelProperty(value = "鎶ュ伐浜哄憳id")
+ @Schema(description = "鎶ュ伐浜哄憳id")
private Long userId;
- @ApiModelProperty(value = "鎶ュ伐浜哄憳")
+ @Schema(description = "鎶ュ伐浜哄憳")
private String userName;
- @ApiModelProperty(value = "鐢熶骇椤圭洰id")
+ @Schema(description = "鐢熶骇椤圭洰id")
private Long productProcessRouteItemId;
- @ApiModelProperty(value = "宸ュ崟id")
+ @Schema(description = "宸ュ崟id")
private Long workOrderId;
- @ApiModelProperty(value = "鐢熶骇宸ュ簭宸ュ崟id")
+ @Schema(description = "鐢熶骇宸ュ簭宸ュ崟id")
private Long productionOperationTaskId;
- @ApiModelProperty(value = "鎶ュ伐鐘舵��")
+ @Schema(description = "鎶ュ伐鐘舵��")
private Integer status;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+ @Schema(description = "鏇存柊鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 31cf274..47629f1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -1,7 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -14,37 +14,37 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鎶ュ伐id")
+ @Schema(description = "鎶ュ伐id")
private Long productMainId;
- @ApiModelProperty(value = "鐢熶骇鎶ュ伐涓昏〃id")
+ @Schema(description = "鐢熶骇鎶ュ伐涓昏〃id")
private Long productionProductMainId;
- @ApiModelProperty(value = "浜у搧id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty(value = "鎶ュ伐鏁伴噺(鎬绘暟閲�)")
+ @Schema(description = "鎶ュ伐鏁伴噺(鎬绘暟閲�)")
private BigDecimal quantity;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ @Schema(description = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+ @Schema(description = "鏇存柊鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index ca64819..d3069a5 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.slf4j.Logger;
@@ -29,7 +29,7 @@
*
* @author ruoyi
*/
-@Api(tags = "閫氱敤鎺ュ彛")
+@Tag(name = "閫氱敤鎺ュ彛")
@AllArgsConstructor
@RestController
@RequestMapping("/common")
@@ -80,7 +80,7 @@
// * minio閫氱敤涓婁紶璇锋眰锛堝涓級
// */
// @PostMapping("/minioUploads")
-// @ApiOperation(value = "minio閫氱敤涓婁紶璇锋眰")
+// @Operation(summary = "minio閫氱敤涓婁紶璇锋眰")
// public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception
// {
// return AjaxResult.success();
@@ -178,7 +178,7 @@
// }
// }
@PostMapping({"/upload"})
- @ApiOperation(value = "鏂囦欢涓婁紶")
+ @Operation(summary = "鏂囦欢涓婁紶")
public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {
return R.ok(storageBlobService.upload(files));
}
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 b6691a4..5aa3413 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -88,7 +88,7 @@
}
@PostMapping("appReadNotice")
- @ApiOperation("绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
+ @Operation(summary = "绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
public AjaxResult appReadNotice(@RequestParam("noticeId") Long noticeId) {
boolean result = noticeService.appReadNotice(noticeId);
return toAjax(result);
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 fc6d212..cb921a0 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
@@ -7,8 +7,8 @@
import com.ruoyi.project.system.domain.SysUserClient;
import com.ruoyi.project.system.service.SysUserClientService;
import com.ruoyi.common.utils.SecurityUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,7 @@
* @version 1.0
* @since 2026/2/9
*/
-@Api(tags = "鐢ㄦ埛璁惧缁戝畾")
+@Tag(name = "鐢ㄦ埛璁惧缁戝畾")
@RestController
@RequestMapping("/system/client")
@AllArgsConstructor
@@ -35,7 +35,7 @@
* 娣诲姞/鏇存柊鐢ㄦ埛cid
*/
@PostMapping("/addOrUpdateClientId")
- @ApiOperation("娣诲姞/鏇存柊鐢ㄦ埛cid")
+ @Operation(summary = "娣诲姞/鏇存柊鐢ㄦ埛cid")
public AjaxResult addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
Long userId = SecurityUtils.getUserId();
sysUserClient.setUserId(userId);
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUserDept.java b/src/main/java/com/ruoyi/project/system/domain/SysUserDept.java
index 8ca1d40..a254ca8 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUserDept.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUserDept.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -16,19 +16,19 @@
private Long deptId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
}
diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
index 0bf2406..f416d39 100644
--- a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
+++ b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.project.system.domain.SysUserDept;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
diff --git a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java b/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
index 21871ce..0859437 100644
--- a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
+++ b/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
@@ -12,22 +12,21 @@
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.StringUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
/**
* swagger 鐢ㄦ埛娴嬭瘯鏂规硶
*
* @author ruoyi
*/
-@Api("鐢ㄦ埛淇℃伅绠＄悊")
+@Tag(name = "鐢ㄦ埛淇℃伅绠＄悊")
@RestController
@RequestMapping("/test/user")
public class TestController extends BaseController
@@ -38,7 +37,7 @@
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
}
- @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
+ @Operation(summary = "鑾峰彇鐢ㄦ埛鍒楄〃")
@GetMapping("/list")
public R<List<UserEntity>> userList()
{
@@ -46,10 +45,10 @@
return R.ok(userList);
}
- @ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
- @GetMapping("/{userId}")
- public R<UserEntity> getUser(@PathVariable Integer userId)
+ @Operation(summary = "鑾峰彇鐢ㄦ埛璇︾粏")
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
+ @GetMapping("/{userId}")
+ public R<UserEntity> getUser(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
@@ -61,15 +60,15 @@
}
}
- @ApiOperation("鏂板鐢ㄦ埛")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛id", dataType = "Integer", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚嶇О", dataType = "String", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", value = "鐢ㄦ埛瀵嗙爜", dataType = "String", dataTypeClass = String.class),
- @ApiImplicitParam(name = "mobile", value = "鐢ㄦ埛鎵嬫満", dataType = "String", dataTypeClass = String.class)
- })
- @PostMapping("/save")
- public R<String> save(UserEntity user)
+ @Operation(summary = "鏂板鐢ㄦ埛")
+ @Parameters({
+ @Parameter(name = "userId", description = "鐢ㄦ埛id"),
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚嶇О"),
+ @Parameter(name = "password", description = "鐢ㄦ埛瀵嗙爜"),
+ @Parameter(name = "mobile", description = "鐢ㄦ埛鎵嬫満")
+ })
+ @PostMapping("/save")
+ public R<String> save(UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
{
@@ -79,7 +78,7 @@
return R.ok();
}
- @ApiOperation("鏇存柊鐢ㄦ埛")
+ @Operation(summary = "鏇存柊鐢ㄦ埛")
@PutMapping("/update")
public R<String> update(@RequestBody UserEntity user)
{
@@ -96,10 +95,10 @@
return R.ok();
}
- @ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
- @DeleteMapping("/{userId}")
- public R<String> delete(@PathVariable Integer userId)
+ @Operation(summary = "鍒犻櫎鐢ㄦ埛淇℃伅")
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
+ @DeleteMapping("/{userId}")
+ public R<String> delete(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
@@ -113,19 +112,19 @@
}
}
-@ApiModel(value = "UserEntity", description = "鐢ㄦ埛瀹炰綋")
+@Schema(name = "UserEntity", description = "鐢ㄦ埛瀹炰綋")
class UserEntity
{
- @ApiModelProperty("鐢ㄦ埛ID")
+ @Schema(description = "鐢ㄦ埛ID")
private Integer userId;
- @ApiModelProperty("鐢ㄦ埛鍚嶇О")
+ @Schema(description = "鐢ㄦ埛鍚嶇О")
private String username;
- @ApiModelProperty("鐢ㄦ埛瀵嗙爜")
+ @Schema(description = "鐢ㄦ埛瀵嗙爜")
private String password;
- @ApiModelProperty("鐢ㄦ埛鎵嬫満")
+ @Schema(description = "鐢ㄦ埛鎵嬫満")
private String mobile;
public UserEntity()
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
index 6d1b151..56baf0f 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
@@ -8,8 +8,8 @@
import com.ruoyi.projectManagement.vo.SaveInfoStageVo;
import com.ruoyi.projectManagement.vo.SaveInfoVo;
import com.ruoyi.projectManagement.vo.SearchInfoVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
*/
@RestController
@RequestMapping("/projectManagement/info")
-@Api(value = "InfoController", tags = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
+@Tag(name = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
public class InfoController {
@@ -30,54 +30,54 @@
private final InfoStageHandleService infoStageHandleService;
@PostMapping("/save")
- @ApiOperation("淇濆瓨")
+ @Operation(summary = "淇濆瓨")
public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
infoService.save(saveInfoVo);
return AjaxResult.success();
}
@PostMapping("/updateStatus")
- @ApiOperation("淇敼鐘舵��")
+ @Operation(summary = "淇敼鐘舵��")
public AjaxResult updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
infoService.updateStatus(updateStateInfo);
return AjaxResult.success();
}
@PostMapping("/delete/{id}")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable Long id) {
infoService.deleteInfo(id);
return AjaxResult.success();
}
@PostMapping("/listPage")
- @ApiOperation("鍒嗛〉鍒楄〃")
+ @Operation(summary = "鍒嗛〉鍒楄〃")
public AjaxResult listPage(@RequestBody @Valid SearchInfoVo vo) {
return AjaxResult.success(infoService.searchListInfo(vo));
}
@PostMapping("/{id}")
- @ApiOperation("璇︽儏")
+ @Operation(summary = "璇︽儏")
public AjaxResult getInfoById(@PathVariable Long id) {
return AjaxResult.success(infoService.getInfoById(id));
}
@PostMapping("/saveStage")
- @ApiOperation("淇濆瓨闃舵")
+ @Operation(summary = "淇濆瓨闃舵")
public AjaxResult saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
infoStageHandleService.save(dto);
return AjaxResult.success();
}
@PostMapping("/listStage/{id}")
- @ApiOperation("鍒楄〃闃舵")
+ @Operation(summary = "鍒楄〃闃舵")
public AjaxResult listStage(@PathVariable Long id) {
return AjaxResult.success(infoStageHandleService.getListVoByInfoId(id));
}
@PostMapping("/deleteStage/{id}")
- @ApiOperation("鍒犻櫎闃舵")
+ @Operation(summary = "鍒犻櫎闃舵")
public AjaxResult deleteStage(@PathVariable Long id) {
infoStageHandleService.deleteById(id);
return AjaxResult.success();
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
index f49ae82..c8b982c 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
@@ -5,8 +5,8 @@
import com.ruoyi.projectManagement.vo.SavePlanNodeVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
import com.ruoyi.projectManagement.vo.SearchPlanVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,28 +20,28 @@
*/
@RestController
@RequestMapping("/projectManagement/plan")
-@Api(value = "PlanController", tags = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
+@Tag(name = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
public class PlanController {
private final PlanService planService;
@PostMapping("/save")
- @ApiOperation("淇濆瓨")
+ @Operation(summary = "淇濆瓨")
public AjaxResult save(@RequestBody @Valid SavePlanVo savePlanVo) {
planService.savePlan(savePlanVo);
return AjaxResult.success();
}
@PostMapping("/delete/{id}")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable Long id) {
planService.deletePlan(id);
return AjaxResult.success();
}
@PostMapping("/listPage")
- @ApiOperation("鍒嗛〉鍒楄〃")
+ @Operation(summary = "鍒嗛〉鍒楄〃")
public AjaxResult listPage(@RequestBody SearchPlanVo searchPlanVo) {
return AjaxResult.success(planService.searchPlan(searchPlanVo));
}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index 3385128..8adcf8d 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -9,8 +9,8 @@
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -19,20 +19,20 @@
@RestController
@AllArgsConstructor
@RequestMapping("/projectManagement/roles")
-@Api(value = "Roles", tags = "")
+@Tag(name = "")
public class RolesController {
private RolesService rolesservice;
private RolesMapper rolesMapper;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈�")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈�")
public AjaxResult listPage(Page<Roles> page, Roles roles) {
return AjaxResult.success(rolesservice.listPage(page, roles));
}
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody RoleDto roleDto) {
if (roleDto.getIsDefaultNo()) {
roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
@@ -41,13 +41,13 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody Roles roles) {
return AjaxResult.success(rolesservice.updateById(roles));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(rolesservice.removeBatchByIds(ids));
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
index a93b483..f033d2f 100644
--- a/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
+++ b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
@@ -1,12 +1,12 @@
package com.ruoyi.projectManagement.dto;
import com.ruoyi.projectManagement.pojo.Roles;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class RoleDto extends Roles {
// 鏄惁浣跨敤绯荤粺缂栧彿
- @ApiModelProperty("鏄惁浣跨敤绯荤粺缂栧彿")
+ @Schema(description = "鏄惁浣跨敤绯荤粺缂栧彿")
private Boolean isDefaultNo;
}
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java b/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
index 5f542e4..a45409b 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -17,69 +16,69 @@
*/
@TableName(value ="project_management_plan")
@Data
-@ApiModel(description="椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
+@Schema(description = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
public class Plan {
/**
*
*/
@TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value="涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
private Long id;
/**
* 璁″垝鍚嶇О
*/
@TableField(value = "name")
- @ApiModelProperty(value="璁″垝鍚嶇О")
+ @Schema(description = "璁″垝鍚嶇О")
private String name;
/**
* 璁″垝鎻忚堪
*/
@TableField(value = "description")
- @ApiModelProperty(value="璁″垝鎻忚堪")
+ @Schema(description = "璁″垝鎻忚堪")
private String description;
/**
* 闄勪欢 ,杩涜鍒嗗壊
*/
@TableField(value = "attachment")
- @ApiModelProperty(value="闄勪欢")
+ @Schema(description = "闄勪欢")
private String attachment;
/**
*
*/
@TableField(value = "is_delete")
- @ApiModelProperty(value="鏄惁鍒犻櫎")
+ @Schema(description = "鏄惁鍒犻櫎")
private Integer isDelete;
/**
*
*/
@TableField(value = "create_time",fill = FieldFill.INSERT)
- @ApiModelProperty(value="鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
/**
*
*/
@TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
- @ApiModelProperty(value="鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
private LocalDateTime updateTime;
/**
*
*/
@TableField(value = "create_user",fill = FieldFill.INSERT)
- @ApiModelProperty(value="鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private Integer createUser;
/**
*
*/
@TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
- @ApiModelProperty(value="鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
private Integer updateUser;
@TableField(value = "create_user_name", fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
index ff8fed2..1b65ea4 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -12,7 +11,7 @@
@Data
@TableName("project_management_roles")
-@ApiModel(description="")
+@Schema(description = "")
public class Roles implements Serializable {
private static final long serialVersionUID = 1L;
@@ -20,37 +19,37 @@
/**
* 涓婚敭ID
*/
- @ApiModelProperty(value="涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value="缂栧彿")
+ @Schema(description = "缂栧彿")
private String no;
/**
* 鍚嶇О
*/
- @ApiModelProperty(value="鍚嶇О")
+ @Schema(description = "鍚嶇О")
private String name;
/**
* 鐘舵��(1:鍚敤, 0:绂佺敤)
*/
- @ApiModelProperty(value="鐘舵��(1:鍚敤, 0:绂佺敤)")
+ @Schema(description = "鐘舵��(1:鍚敤, 0:绂佺敤)")
private Integer status;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
index aa2dd6c..813fb44 100644
--- a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
@@ -11,8 +11,8 @@
import com.ruoyi.purchase.pojo.InvoicePurchase;
import com.ruoyi.purchase.service.IInvoicePurchaseService;
import com.ruoyi.waterrecord.pojo.WaterRecord;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +24,7 @@
import java.util.List;
@RestController
-@Api(tags = "閲囪喘鎶ヨ〃")
+@Tag(name = "閲囪喘鎶ヨ〃")
@RequestMapping("/purchase/report")
@AllArgsConstructor
public class AccountingReportController {
@@ -40,7 +40,7 @@
@Log(title = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎瀵煎嚭")
+ @Operation(summary = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎瀵煎嚭")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
InvoicePurchaseReportDto waterRecord = new InvoicePurchaseReportDto();
@@ -58,7 +58,7 @@
@Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.EXPORT)
@PostMapping("/exportTwo")
- @ApiOperation("閲囪喘鎶ヨ〃-澧炲�肩◣姣斿")
+ @Operation(summary = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿")
public void exportTwo(HttpServletResponse response) {
Page page = new Page(-1,-1);
IPage<VatDto> result = invoicePurchaseService.listVat(page, null);
diff --git a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
index 221d58c..cbdee81 100644
--- a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
@@ -9,7 +9,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
import com.ruoyi.purchase.service.impl.ProcurementBusinessSummaryServiceImpl;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +21,7 @@
* @author :yys
* @date : 2026/1/15 13:29
*/
-@Api(tags = "閲囪喘涓氬姟姹囨��")
+@Tag(name = "閲囪喘涓氬姟姹囨��")
@RestController
@RequestMapping("/procurementBusinessSummary")
@AllArgsConstructor
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index d6d48da..3290499 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -20,8 +20,8 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -48,7 +48,7 @@
@RestController
@RequestMapping("/purchase/ledger")
@AllArgsConstructor
-@Api(tags = "閲囪喘鍙拌处")
+@Tag(name = "閲囪喘鍙拌处")
@Slf4j
public class PurchaseLedgerController extends BaseController {
private IPurchaseLedgerService purchaseLedgerService;
@@ -66,14 +66,14 @@
*/
@Log(title = "瀵煎叆閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/import")
- @ApiOperation("瀵煎叆閲囪喘鍙拌处")
+ @Operation(summary = "瀵煎叆閲囪喘鍙拌处")
public AjaxResult importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return purchaseLedgerService.importData(file);
}
- @ApiOperation("瀵煎嚭閲囪喘鍙拌处妯℃澘")
+ @Operation(summary = "瀵煎嚭閲囪喘鍙拌处妯℃澘")
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
// 1. 妯℃澘鏂囦欢鍦╮esources/static涓嬬殑璺緞
@@ -158,7 +158,7 @@
/**
* 鏌ヨ閲囪喘妯℃澘
*/
- @ApiOperation("/鏌ヨ閲囪喘妯℃澘")
+ @Operation(summary = "/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
public AjaxResult getPurchaseTemplateList() {
List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
@@ -262,7 +262,7 @@
return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
- @ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
+ @Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
public AjaxResult createPurchaseNo() {
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
index 161c255..3b3c97f 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
@@ -10,8 +10,8 @@
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -29,7 +29,7 @@
*/
@RestController
@RequestMapping("/purchaseLedgerTemplate")
-@Api(tags = "閲囪喘鍙拌处妯℃澘")
+@Tag(name = "閲囪喘鍙拌处妯℃澘")
@AllArgsConstructor
public class PurchaseLedgerTemplateController {
@@ -38,7 +38,7 @@
@PostMapping("/add")
@Log(title = "娣诲姞閲囪喘鍙拌处妯℃澘", businessType = BusinessType.INSERT)
- @ApiOperation(value = "娣诲姞閲囪喘鍙拌处妯℃澘")
+ @Operation(summary = "娣诲姞閲囪喘鍙拌处妯℃澘")
public AjaxResult add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 閲囪喘妯℃澘
if(StringUtils.isNotEmpty(purchaseLedgerDto.getTemplateName())){
@@ -68,7 +68,7 @@
@DeleteMapping("/delete")
@Log(title = "閲囪喘鍙拌处妯℃澘", businessType = BusinessType.DELETE)
- @ApiOperation(value = "鍒犻櫎閲囪喘鍙拌处妯℃澘")
+ @Operation(summary = "鍒犻櫎閲囪喘鍙拌处妯℃澘")
public AjaxResult delete(@RequestBody List<Long> id) {
if(CollectionUtils.isEmpty(id)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
int result = purchaseLedgerTemplateMapper.deleteBatchIds(id);
@@ -79,7 +79,7 @@
@PostMapping("/update")
@Log(title = "淇敼閲囪喘鍙拌处妯℃澘", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "淇敼閲囪喘鍙拌处妯℃澘")
+ @Operation(summary = "淇敼閲囪喘鍙拌处妯℃澘")
public AjaxResult update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
PurchaseLedgerTemplate purchaseLedgerTemplate = purchaseLedgerTemplateMapper
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
index e3b1e8b..896c3c3 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
@@ -1,6 +1,6 @@
package com.ruoyi.purchase.controller;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -14,7 +14,7 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrderProducts")
-@Api(tags = "閲囪喘閫�璐т骇鍝�")
+@Tag(name = "閲囪喘閫�璐т骇鍝�")
public class PurchaseReturnOrderProductsController {
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index 8d0a942..16449e8 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -8,7 +8,7 @@
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrders")
-@Api(tags = "閲囪喘閫�璐у崟")
+@Tag(name = "閲囪喘閫�璐у崟")
@AllArgsConstructor
public class PurchaseReturnOrdersController {
private PurchaseReturnOrdersService purchaseReturnOrdersService;
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index c3b8ef6..2395276 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -19,9 +19,9 @@
import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.purchase.service.impl.PaymentRegistrationServiceImpl;
import com.ruoyi.sales.service.ICommonFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
@@ -43,7 +43,7 @@
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
-@Api(tags = "鏉ョエ鐧昏")
+@Tag(name = "鏉ョエ鐧昏")
public class TicketRegistrationController extends BaseController {
private final PaymentRegistrationServiceImpl paymentRegistrationServiceImpl;
@@ -65,27 +65,27 @@
return getDataTable(list);
}
- @ApiOperation("鏍规嵁id鏌ヨ浠樻娴佹按淇℃伅")
+ @Operation(summary = "鏍规嵁id鏌ヨ浠樻娴佹按淇℃伅")
@GetMapping("/getById")
public List<PaymentRegistrationDto> getById( Long id ) {
return ticketRegistrationService.getPaymentRegistrationDtoById(id);
}
- @ApiOperation("鏍规嵁id鏌ヨ浠樻娴佹按")
+ @Operation(summary = "鏍规嵁id鏌ヨ浠樻娴佹按")
@GetMapping("/getPaymentRegistrationById")
public AjaxResult getPaymentRegistrationById(Long id) {
PaymentRegistration byId = paymentRegistrationService.getById(id);
return AjaxResult.success(byId);
}
- @ApiOperation("淇敼浠樻娴佹按")
+ @Operation(summary = "淇敼浠樻娴佹按")
@PutMapping("/updatePaymentRegistration")
@Log(title = "淇敼浠樻娴佹按", businessType = BusinessType.UPDATE)
public AjaxResult updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
return AjaxResult.success(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
}
- @ApiOperation("鍒犻櫎浠樻娴佹按")
+ @Operation(summary = "鍒犻櫎浠樻娴佹按")
@DeleteMapping("/delPaymentRegistration")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
@@ -146,7 +146,7 @@
return AjaxResult.success(productRecordService.getProductRecordById(productRecordDto));
}
- @ApiModelProperty("淇敼鏉ョエ鐧昏")
+ @Schema(description = "淇敼鏉ョエ鐧昏")
@PostMapping("/updateRegistration")
public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
@@ -207,7 +207,7 @@
return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
+ @Schema(description = "鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
@GetMapping("/getPuargeById")
public AjaxResult getPuargeById(Long id) {
return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
index 192bea5..3e48e79 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
@@ -8,8 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,7 +20,7 @@
* @date : 2026/1/15 13:34
*/
@Data
-@ApiModel
+@Schema
public class ProcurementBusinessSummaryDto {
@Excel(name = "浜у搧澶х被")
@@ -33,12 +32,12 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDateStart;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDateEnd;
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index c8ea3f5..3b52fe5 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -5,7 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +18,7 @@
/**
* 瀹℃壒浜篿d鍒楄〃
*/
- @ApiModelProperty(value = "瀹℃壒浜篿d鍒楄〃")
+ @Schema(description = "瀹℃壒浜篿d鍒楄〃")
private String approveUserIds;
@@ -175,26 +175,26 @@
@TableField(exist = false)
- @ApiModelProperty("鏉ョエ閲戦")
+ @Schema(description = "鏉ョエ閲戦")
@Excel(name = "宸叉潵绁ㄩ噾棰�(鍏�)")
private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
- @ApiModelProperty("鏈潵绁ㄩ噾棰�")
+ @Schema(description = "鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
@Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
- @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
+ @Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
private Integer type;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty("瀹℃壒鐘舵��")
+ @Schema(description = "瀹℃壒鐘舵��")
private Integer approvalStatus;
- @ApiModelProperty(value = "妯℃澘鍚嶇О")
+ @Schema(description = "妯℃澘鍚嶇О")
private String templateName;
- @ApiModelProperty(value = "瀹℃壒浜篿d")
+ @Schema(description = "瀹℃壒浜篿d")
private Integer approverId;
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
index f915051..bf510b4 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@@ -35,16 +35,16 @@
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date executionDate;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
@Excel(name = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty(value = "瀹℃牳浜�(澶氫釜鐢紝闅斿紑)")
+ @Schema(description = "瀹℃牳浜�(澶氫釜鐢紝闅斿紑)")
@Excel(name = "瀹℃牳浜�(澶氫釜鐢紝闅斿紑)")
private String approveUserIds;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
index 196a4bd..0d9eb46 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
@@ -1,6 +1,6 @@
package com.ruoyi.purchase.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -111,7 +111,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
index 3a83b3f..a84cf04 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
@@ -1,6 +1,6 @@
package com.ruoyi.purchase.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -103,7 +103,7 @@
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
index dc9d37e..fdd7503 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
@@ -1,6 +1,6 @@
package com.ruoyi.purchase.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -128,7 +128,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index b56ab90..d937bad 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -137,29 +137,29 @@
private String phoneNumber;
@TableField(exist = false)
- @ApiModelProperty("鏉ョエ閲戦")
+ @Schema(description = "鏉ョエ閲戦")
private String receiptPaymentAmount;
- @ApiModelProperty("鏈潵绁ㄩ噾棰�")
+ @Schema(description = "鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
private String unReceiptPaymentAmount;
- @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
+ @Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
private Integer type;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty("瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
+ @Schema(description = "瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
private Integer approvalStatus;
- @ApiModelProperty(value = "妯℃澘鍚嶇О")
+ @Schema(description = "妯℃澘鍚嶇О")
private String templateName;
- @ApiModelProperty(value = "瀹℃壒浜篿d")
+ @Schema(description = "瀹℃壒浜篿d")
private String approveUserIds;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
index 4bb1312..018c38e 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
@@ -12,8 +12,7 @@
import java.util.Date;
import java.util.List;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -28,73 +27,73 @@
@Getter
@Setter
@TableName("purchase_ledger_template")
-@ApiModel(value = "PurchaseLedgerTemplate瀵硅薄", description = "閲囪喘鍙拌处妯℃澘")
+@Schema(name = "PurchaseLedgerTemplate瀵硅薄", description = "閲囪喘鍙拌处妯℃澘")
public class PurchaseLedgerTemplate implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("鑷涓婚敭ID")
+ @Schema(description = "鑷涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("閲囪喘鍚堝悓鍙�")
+ @Schema(description = "閲囪喘鍚堝悓鍙�")
private String purchaseContractNumber;
- @ApiModelProperty("渚涘簲鍟嗗悕绉癷d")
+ @Schema(description = "渚涘簲鍟嗗悕绉癷d")
private Long supplierId;
- @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @ApiModelProperty("褰曞叆浜篿d")
+ @Schema(description = "褰曞叆浜篿d")
private Integer recorderId;
- @ApiModelProperty("褰曞叆浜哄鍚�")
+ @Schema(description = "褰曞叆浜哄鍚�")
private String recorderName;
- @ApiModelProperty("閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty("椤圭洰鍚嶇О")
+ @Schema(description = "椤圭洰鍚嶇О")
private String projectName;
- @ApiModelProperty("褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
private Date entryDate;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remarks;
- @ApiModelProperty("璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
private Date createdAt;
- @ApiModelProperty("璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
private Date updatedAt;
- @ApiModelProperty("鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
+ @Schema(description = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
private Integer salesLedgerId;
- @ApiModelProperty("鍚堝悓閲戦")
+ @Schema(description = "鍚堝悓閲戦")
private BigDecimal contractAmount;
- @ApiModelProperty("涓氬姟鍛�")
+ @Schema(description = "涓氬姟鍛�")
private String businessPerson;
- @ApiModelProperty("涓氬姟鍛榠d")
+ @Schema(description = "涓氬姟鍛榠d")
private Integer businessPersonId;
- @ApiModelProperty("褰曞叆浜虹數璇�")
+ @Schema(description = "褰曞叆浜虹數璇�")
private String phoneNumber;
private String paymentMethod;
private Date executionDate;
- @ApiModelProperty("妯℃澘鍚嶇О")
+ @Schema(description = "妯℃澘鍚嶇О")
private String templateName;
@TableField(exist = false)
private List<SalesLedgerProductTemplate> productList;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
index 4276a13..2a1b172 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
@@ -8,8 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,7 +23,7 @@
@Getter
@Setter
@TableName("purchase_return_order_products")
-@ApiModel(value = "PurchaseReturnOrderProducts瀵硅薄", description = "")
+@Schema(name = "PurchaseReturnOrderProducts瀵硅薄", description = "")
public class PurchaseReturnOrderProducts implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,23 +31,23 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閫�璐у崟id")
+ @Schema(description = "閫�璐у崟id")
private Long purchaseReturnOrderId;
- @ApiModelProperty("閲囪喘浜у搧id")
+ @Schema(description = "閲囪喘浜у搧id")
private Long salesLedgerProductId;
- @ApiModelProperty("閫�璐ф暟閲�")
+ @Schema(description = "閫�璐ф暟閲�")
private BigDecimal returnQuantity;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
index 217d798..a89317b 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -11,9 +11,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -29,7 +27,7 @@
@Getter
@Setter
@TableName("purchase_return_orders")
-@ApiModel(value = "PurchaseReturnOrders瀵硅薄", description = "閲囪喘閫�璐у崟")
+@Schema(name = "PurchaseReturnOrders瀵硅薄", description = "閲囪喘閫�璐у崟")
public class PurchaseReturnOrders implements Serializable {
private static final long serialVersionUID = 1L;
@@ -37,65 +35,65 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閫�璐у崟缂栧彿")
+ @Schema(description = "閫�璐у崟缂栧彿")
private String no;
- @ApiModelProperty("閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹")
+ @Schema(description = "閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹")
private Integer returnType;
- @ApiModelProperty("渚涘簲鍟唅d")
+ @Schema(description = "渚涘簲鍟唅d")
private Long supplierId;
- @ApiModelProperty("椤圭洰id")
+ @Schema(description = "椤圭洰id")
private Long projectId;
- @ApiModelProperty("椤圭洰闃舵")
+ @Schema(description = "椤圭洰闃舵")
private Integer projectPhase;
- @ApiModelProperty("鍒跺崟鏃ユ湡")
+ @Schema(description = "鍒跺崟鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate preparedAt;
- @ApiModelProperty("鍒跺崟浜篿d")
+ @Schema(description = "鍒跺崟浜篿d")
private Long preparedUserId;
- @ApiModelProperty("鍒跺崟浜哄悕绉�")
+ @Schema(description = "鍒跺崟浜哄悕绉�")
private String preparedUserName;
- @ApiModelProperty("閫�鏂欎汉id")
+ @Schema(description = "閫�鏂欎汉id")
private Long returnUserId;
- @ApiModelProperty("閫�鏂欎汉鍚嶇О")
+ @Schema(description = "閫�鏂欎汉鍚嶇О")
private String returnUserName;
- @ApiModelProperty("閲囪喘璁㈠崟id")
+ @Schema(description = "閲囪喘璁㈠崟id")
private Long purchaseLedgerId;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("'鏁村崟鎶樻墸棰�'")
+ @Schema(description = "'鏁村崟鎶樻墸棰�'")
private BigDecimal totalDiscountAmount;
- @ApiModelProperty("'鏁村崟鎶樻墸鐜�'")
+ @Schema(description = "'鏁村崟鎶樻墸鐜�'")
private BigDecimal totalDiscountRate;
- @ApiModelProperty("'鎴愪氦閲戦'")
+ @Schema(description = "'鎴愪氦閲戦'")
private BigDecimal totalAmount;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鏀跺叆绫诲瀷")
+ @Schema(description = "鏀跺叆绫诲瀷")
@TableField(value = "income_type")
private Integer incomeType;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
index d5f8b28..3f1690c 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
@@ -8,8 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,55 +23,55 @@
@Getter
@Setter
@TableName("sales_ledger_product_template")
-@ApiModel(value = "SalesLedgerProductTemplate瀵硅薄", description = "浜у搧淇℃伅妯℃澘")
+@Schema(name = "SalesLedgerProductTemplate瀵硅薄", description = "浜у搧淇℃伅妯℃澘")
public class SalesLedgerProductTemplate implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("浜у搧淇℃伅涓婚敭")
+ @Schema(description = "浜у搧淇℃伅涓婚敭")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍏宠仈鍙拌处涓昏〃涓婚敭")
+ @Schema(description = "鍏宠仈鍙拌处涓昏〃涓婚敭")
private Integer salesLedgerId;
- @ApiModelProperty("浜у搧澶х被")
+ @Schema(description = "浜у搧澶х被")
private String productCategory;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鏈�浣庡簱瀛�")
+ @Schema(description = "鏈�浣庡簱瀛�")
private BigDecimal minStock;
- @ApiModelProperty("绋庣巼")
+ @Schema(description = "绋庣巼")
private BigDecimal taxRate;
- @ApiModelProperty("鍚◣鍗曚环")
+ @Schema(description = "鍚◣鍗曚环")
private BigDecimal taxInclusiveUnitPrice;
- @ApiModelProperty("鍚◣鎬讳环")
+ @Schema(description = "鍚◣鎬讳环")
private BigDecimal taxInclusiveTotalPrice;
- @ApiModelProperty("涓嶅惈绋庢�讳环")
+ @Schema(description = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
- @ApiModelProperty("鍙戠エ绫诲瀷")
+ @Schema(description = "鍙戠エ绫诲瀷")
private String invoiceType;
- @ApiModelProperty("1.閿�鍞彴璐︼紝2.閲囪喘鍙拌处")
+ @Schema(description = "1.閿�鍞彴璐︼紝2.閲囪喘鍙拌处")
private Integer type;
- @ApiModelProperty("浜у搧id")
+ @Schema(description = "浜у搧id")
private Integer productId;
- @ApiModelProperty("鍨嬪彿id")
+ @Schema(description = "鍨嬪彿id")
private Integer productModelId;
private String register;
@@ -81,9 +80,9 @@
private BigDecimal warnNum;
- @ApiModelProperty("鏄惁鎺ㄩ�佽川妫�")
+ @Schema(description = "鏄惁鎺ㄩ�佽川妫�")
private Boolean isChecked;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index 1845e44..0dcf7c6 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -140,12 +140,12 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "宸蹭粯娆炬�婚噾棰�")
+ @Schema(description = "宸蹭粯娆炬�婚噾棰�")
@TableField(exist = false)
@Excel(name = "宸蹭粯娆炬�婚噾棰�")
private BigDecimal paymentAmountTotal;
- @ApiModelProperty(value = "鏈粯娆炬�婚噾棰�")
+ @Schema(description = "鏈粯娆炬�婚噾棰�")
@TableField(exist = false)
@Excel(name = "鏈粯娆炬�婚噾棰�")
private BigDecimal unPaymentAmountTotal;
@@ -161,9 +161,9 @@
@TableField(exist = false)
private String supplierNameOrContractNo;
- @ApiModelProperty(value = "褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
private LocalDate enterDate;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
index 228a6e2..4d005b0 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -2,9 +2,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.service.QualityReportService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-14 03:39:49
*/
-@Api(tags = "璐ㄩ噺绠＄悊")
+@Tag(name = "璐ㄩ噺绠＄悊")
@RestController
@RequestMapping("/qualityReport")
@AllArgsConstructor
@@ -28,7 +28,7 @@
/**
* 鑾峰彇妫�楠岀粺璁℃暟鎹�
*/
- @ApiOperation("鑾峰彇妫�楠岀粺璁℃暟鎹�")
+ @Operation(summary = "鑾峰彇妫�楠岀粺璁℃暟鎹�")
@GetMapping("/getInspectStatistics")
public AjaxResult getInspectStatistics() {
return AjaxResult.success(qualityReportService.getInspectStatistics());
@@ -37,7 +37,7 @@
/**
* 鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�
*/
- @ApiOperation("鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�")
+ @Operation(summary = "鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�")
@GetMapping("/getPassRateStatistics")
public AjaxResult getPassRateStatistics() {
return AjaxResult.success(qualityReportService.getPassRateStatistics());
@@ -46,7 +46,7 @@
/**
* 鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�
*/
- @ApiOperation("鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�")
+ @Operation(summary = "鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�")
@GetMapping("/getMonthlyPassRateStatistics")
public AjaxResult getMonthlyPassRateStatistics(@RequestParam("year") String year) {
return AjaxResult.success(qualityReportService.getMonthlyPassRateStatistics(year));
@@ -55,7 +55,7 @@
/**
* 鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁
*/
- @ApiOperation("鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁")
+ @Operation(summary = "鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁")
@GetMapping("/getYearlyPassRateStatistics")
public AjaxResult getYearlyPassRateStatistics(@RequestParam("year") String year) {
return AjaxResult.success(qualityReportService.getYearlyPassRateStatistics(year));
@@ -64,7 +64,7 @@
/**
* 鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁
*/
- @ApiOperation("鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁")
+ @Operation(summary = "鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁")
@GetMapping("/getMonthlyCompletionDetails")
public AjaxResult getMonthlyCompletionDetails(@RequestParam("year") String year) {
return AjaxResult.success(qualityReportService.getMonthlyCompletionDetails(year));
@@ -73,7 +73,7 @@
/**
* 鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�
*/
- @ApiOperation("鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�")
+ @Operation(summary = "鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�")
@GetMapping("/getTopParameters")
public AjaxResult getTopParameters(@RequestParam("modelType") Integer modelType) {
return AjaxResult.success(qualityReportService.getTopParameters(modelType));
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java b/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
index 27d9579..0a51a19 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectParam;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityInspectStatDto.java b/src/main/java/com/ruoyi/quality/dto/QualityInspectStatDto.java
index f1e92d6..7ff7687 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityInspectStatDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityInspectStatDto.java
@@ -1,24 +1,23 @@
package com.ruoyi.quality.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
import java.io.Serializable;
@Data
-@ApiModel(value = "QualityInspectStatDto", description = "璐ㄩ噺妫�楠岀粺璁TO")
+@Schema(name = "QualityInspectStatDto", description = "璐ㄩ噺妫�楠岀粺璁TO")
public class QualityInspectStatDto implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "绫诲埆(0:鍘熸潗鏂�;1:鍗婃垚鍝�;2:鎴愬搧)")
+ @Schema(description = "绫诲埆(0:鍘熸潗鏂�;1:鍗婃垚鍝�;2:鎴愬搧)")
private Integer modelType;
- @ApiModelProperty(value = "鎬绘暟閲�")
+ @Schema(description = "鎬绘暟閲�")
private BigDecimal totalCount;
- @ApiModelProperty(value = "宸插畬鎴愭暟閲�")
+ @Schema(description = "宸插畬鎴愭暟閲�")
private BigDecimal completedCount;
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityMonthlyDetailDto.java b/src/main/java/com/ruoyi/quality/dto/QualityMonthlyDetailDto.java
index c8ac682..a39c45c 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityMonthlyDetailDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityMonthlyDetailDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.quality.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -11,19 +10,19 @@
* 璐ㄩ噺鏈堝害瀹屾垚鏄庣粏DTO
*/
@Data
-@ApiModel(value = "QualityMonthlyDetailDto", description = "璐ㄩ噺鏈堝害瀹屾垚鏄庣粏DTO")
+@Schema(name = "QualityMonthlyDetailDto", description = "璐ㄩ噺鏈堝害瀹屾垚鏄庣粏DTO")
public class QualityMonthlyDetailDto implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鏈堜唤")
+ @Schema(description = "鏈堜唤")
private String month;
- @ApiModelProperty(value = "鍘熸潗鏂�")
+ @Schema(description = "鍘熸潗鏂�")
private BigDecimal rawMaterialCount;
- @ApiModelProperty(value = "鍗婃垚鍝�")
+ @Schema(description = "鍗婃垚鍝�")
private BigDecimal processCount;
- @ApiModelProperty(value = "鎴愬搧")
+ @Schema(description = "鎴愬搧")
private BigDecimal outgoingCount;
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateDto.java b/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateDto.java
index c38f715..264a9f9 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.quality.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -11,31 +10,31 @@
* 璐ㄩ噺鏈堝害鍚堟牸鐜囩粺璁TO
*/
@Data
-@ApiModel(value = "QualityMonthlyPassRateDto", description = "璐ㄩ噺鏈堝害鍚堟牸鐜囩粺璁TO")
+@Schema(name = "QualityMonthlyPassRateDto", description = "璐ㄩ噺鏈堝害鍚堟牸鐜囩粺璁TO")
public class QualityMonthlyPassRateDto implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鏈堜唤(涓�鏈�, 浜屾湀...)")
+ @Schema(description = "鏈堜唤(涓�鏈�, 浜屾湀...)")
private String month;
- @ApiModelProperty(value = "绫诲埆(0:鍘熸潗鏂�;1:鍗婃垚鍝�;2:鎴愬搧)")
+ @Schema(description = "绫诲埆(0:鍘熸潗鏂�;1:鍗婃垚鍝�;2:鎴愬搧)")
private Integer modelType;
- @ApiModelProperty(value = "鎬绘暟閲�")
+ @Schema(description = "鎬绘暟閲�")
private BigDecimal totalCount;
- @ApiModelProperty(value = "宸插畬鎴愭暟閲�")
+ @Schema(description = "宸插畬鎴愭暟閲�")
private BigDecimal completedCount;
- @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+ @Schema(description = "鍚堟牸鏁伴噺")
private BigDecimal qualifiedCount;
- @ApiModelProperty(value = "涓嶅悎鏍兼暟閲�")
+ @Schema(description = "涓嶅悎鏍兼暟閲�")
private BigDecimal unqualifiedCount;
- @ApiModelProperty(value = "瀹屾垚鍗犳瘮")
+ @Schema(description = "瀹屾垚鍗犳瘮")
private BigDecimal completionRate;
- @ApiModelProperty(value = "鍚堟牸鐜囧崰姣�")
+ @Schema(description = "鍚堟牸鐜囧崰姣�")
private BigDecimal passRate;
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateWrapperDto.java b/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateWrapperDto.java
index f0d517b..60ee442 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateWrapperDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateWrapperDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.quality.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -10,19 +9,19 @@
* 璐ㄩ噺鏈堝害鍚堟牸鐜囧寘瑁匘TO锛堟寜鏈堝垎缁勶級
*/
@Data
-@ApiModel(value = "QualityMonthlyPassRateWrapperDto", description = "璐ㄩ噺鏈堝害鍚堟牸鐜囧寘瑁匘TO锛堟寜鏈堝垎缁勶級")
+@Schema(name = "QualityMonthlyPassRateWrapperDto", description = "璐ㄩ噺鏈堝害鍚堟牸鐜囧寘瑁匘TO锛堟寜鏈堝垎缁勶級")
public class QualityMonthlyPassRateWrapperDto implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鏈堜唤")
+ @Schema(description = "鏈堜唤")
private String month;
- @ApiModelProperty(value = "鍘熸潗鏂�")
+ @Schema(description = "鍘熸潗鏂�")
private QualityPassRateDto rawMaterial;
- @ApiModelProperty(value = "鍗婃垚鍝�")
+ @Schema(description = "鍗婃垚鍝�")
private QualityPassRateDto process;
- @ApiModelProperty(value = "鎴愬搧")
+ @Schema(description = "鎴愬搧")
private QualityPassRateDto outgoing;
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityParameterStatDto.java b/src/main/java/com/ruoyi/quality/dto/QualityParameterStatDto.java
index 0675981..ef4eb9b 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityParameterStatDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityParameterStatDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.quality.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -11,16 +10,16 @@
* 妫�楠屾寚鏍囩粺璁TO
*/
@Data
-@ApiModel(value = "QualityParameterStatDto", description = "妫�楠屾寚鏍囩粺璁TO")
+@Schema(name = "QualityParameterStatDto", description = "妫�楠屾寚鏍囩粺璁TO")
public class QualityParameterStatDto implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鎸囨爣鍚嶇О")
+ @Schema(description = "鎸囨爣鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal count;
- @ApiModelProperty(value = "鐧惧垎姣�")
+ @Schema(description = "鐧惧垎姣�")
private BigDecimal percentage;
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityPassRateDto.java b/src/main/java/com/ruoyi/quality/dto/QualityPassRateDto.java
index b322528..1948e38 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityPassRateDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityPassRateDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.quality.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -11,29 +10,29 @@
* 璐ㄩ噺鍚堟牸鐜囩粺璁TO
*/
@Data
-@ApiModel(value = "QualityPassRateDto", description = "璐ㄩ噺鍚堟牸鐜囩粺璁TO")
+@Schema(name = "QualityPassRateDto", description = "璐ㄩ噺鍚堟牸鐜囩粺璁TO")
public class QualityPassRateDto implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "绫诲埆(0:鍘熸潗鏂�;1:鍗婃垚鍝�;2:鎴愬搧)")
+ @Schema(description = "绫诲埆(0:鍘熸潗鏂�;1:鍗婃垚鍝�;2:鎴愬搧)")
private Integer modelType;
- @ApiModelProperty(value = "鎬绘暟閲�")
+ @Schema(description = "鎬绘暟閲�")
private BigDecimal totalCount;
- @ApiModelProperty(value = "宸插畬鎴愭暟閲�")
+ @Schema(description = "宸插畬鎴愭暟閲�")
private BigDecimal completedCount;
- @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+ @Schema(description = "鍚堟牸鏁伴噺")
private BigDecimal qualifiedCount;
- @ApiModelProperty(value = "涓嶅悎鏍兼暟閲�")
+ @Schema(description = "涓嶅悎鏍兼暟閲�")
private BigDecimal unqualifiedCount;
- @ApiModelProperty(value = "瀹屾垚鍗犳瘮")
+ @Schema(description = "瀹屾垚鍗犳瘮")
private BigDecimal completionRate;
- @ApiModelProperty(value = "鍚堟牸鐜囧崰姣�")
+ @Schema(description = "鍚堟牸鐜囧崰姣�")
private BigDecimal passRate;
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityTopParameterDto.java b/src/main/java/com/ruoyi/quality/dto/QualityTopParameterDto.java
index 0be4e8b..038dbc7 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityTopParameterDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityTopParameterDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.quality.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -12,13 +11,13 @@
* 璐ㄦ鐑偣鎸囨爣缁熻缁撴灉DTO (鍗曠被鍨�)
*/
@Data
-@ApiModel(value = "QualityTopParameterDto", description = "璐ㄦ鐑偣鎸囨爣缁熻缁撴灉DTO (鍗曠被鍨�)")
+@Schema(name = "QualityTopParameterDto", description = "璐ㄦ鐑偣鎸囨爣缁熻缁撴灉DTO (鍗曠被鍨�)")
public class QualityTopParameterDto implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鎬绘娴嬮」娆℃暟閲�")
+ @Schema(description = "鎬绘娴嬮」娆℃暟閲�")
private BigDecimal totalCount;
- @ApiModelProperty(value = "鎸囨爣缁熻鍒楄〃 (Top 4 + 鍏朵粬)")
+ @Schema(description = "鎸囨爣缁熻鍒楄〃 (Top 4 + 鍏朵粬)")
private List<QualityParameterStatDto> list;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index b5b1bc9..9d8a07d 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
@@ -113,23 +113,23 @@
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@@ -149,7 +149,7 @@
//涓嶅悎鏍肩幇璞�
private String defectivePhenomena;
- @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ @Schema(description = "鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
private Long testStandardId;
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java
index a1cfe39..1ecf5cd 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
@@ -24,36 +24,36 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty(value = "鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private int fileSize;
- @ApiModelProperty(value = "妫�楠孖D")
+ @Schema(description = "妫�楠孖D")
@NotBlank(message = "妫�楠宨d涓嶈兘涓虹┖!")
private Long inspectId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java
index a15b47b..f765f9f 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
@@ -64,23 +64,23 @@
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index 2a2c758..0bc6071 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -8,8 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,7 +23,7 @@
@Getter
@Setter
@TableName("quality_test_standard")
-@ApiModel(value = "QualityTestStandard瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛�")
+@Schema(name = "QualityTestStandard瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛�")
public class QualityTestStandard implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,42 +31,42 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鏍囧噯缂栧彿")
+ @Schema(description = "鏍囧噯缂栧彿")
private String standardNo;
- @ApiModelProperty("鏍囧噯鍚嶇О")
+ @Schema(description = "鏍囧噯鍚嶇О")
private String standardName;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String state;
- @ApiModelProperty("绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
+ @Schema(description = "绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
private Integer inspectType;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Integer processId;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
index 6bb1efb..3a24901 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("quality_test_standard_binding")
-@ApiModel(value = "QualityTestStandardBinding瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛ㄤ笌浜у搧鍏宠仈琛�")
+@Schema(name = "QualityTestStandardBinding瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛ㄤ笌浜у搧鍏宠仈琛�")
public class QualityTestStandardBinding implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,29 +30,29 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("浜у搧ID")
+ @Schema(description = "浜у搧ID")
private Long productId;
- @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ @Schema(description = "鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
private Integer testStandardId;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
index c9a1b98..2638991 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("quality_test_standard_param")
-@ApiModel(value = "QualityTestStandardParam瀵硅薄", description = "妫�娴嬫爣鍑嗗弬鏁�")
+@Schema(name = "QualityTestStandardParam瀵硅薄", description = "妫�娴嬫爣鍑嗗弬鏁�")
public class QualityTestStandardParam implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,42 +30,42 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍙傛暟椤�")
+ @Schema(description = "鍙傛暟椤�")
private String parameterItem;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏍囧噯鍊�")
+ @Schema(description = "鏍囧噯鍊�")
private String standardValue;
- @ApiModelProperty("鍐呮帶鍊�")
+ @Schema(description = "鍐呮帶鍊�")
private String controlValue;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ @Schema(description = "鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
private Long testStandardId;
- @ApiModelProperty("榛樿鍊�")
+ @Schema(description = "榛樿鍊�")
private String defaultValue;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 4ed2f58..31984af 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
@@ -113,31 +113,31 @@
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("鍏宠仈妫�娴媔d")
+ @Schema(description = "鍏宠仈妫�娴媔d")
private Long inspectId;
- @ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
+ @Schema(description = "鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
private Boolean method;
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java b/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java
index 77af2fe..400998a 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeAccidentController.java
@@ -4,8 +4,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeAccident;
import com.ruoyi.safe.service.SafeAccidentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,30 +22,30 @@
@RestController
@RequestMapping("/safeAccident")
@AllArgsConstructor
-@Api(tags = "瀹夊叏鐢熶骇--浜嬫晠涓婃姤璁板綍")
+@Tag(name = "瀹夊叏鐢熶骇--浜嬫晠涓婃姤璁板綍")
public class SafeAccidentController {
private SafeAccidentService safeAccidentService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeAccident safeAccident) {
return R.ok(safeAccidentService.pageSafeAccident(page, safeAccident));
}
- @ApiOperation("鏂板浜嬫晠涓婃姤璁板綍")
+ @Operation(summary = "鏂板浜嬫晠涓婃姤璁板綍")
@PostMapping()
public R add(@RequestBody SafeAccident safeAccident) {
return R.ok(safeAccidentService.save(safeAccident));
}
- @ApiOperation("淇敼浜嬫晠涓婃姤璁板綍")
+ @Operation(summary = "淇敼浜嬫晠涓婃姤璁板綍")
@PutMapping ()
public R update(@RequestBody SafeAccident safeAccident) {
return R.ok(safeAccidentService.updateById(safeAccident));
}
- @ApiOperation("鍒犻櫎浜嬫晠涓婃姤璁板綍")
+ @Operation(summary = "鍒犻櫎浜嬫晠涓婃姤璁板綍")
@DeleteMapping("/{ids}")
public R delSafeAccident(@RequestBody List<Integer> ids) {
return R.ok(safeAccidentService.removeBatchByIds(ids));
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java b/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
index 84fac8e..bdedc46 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
@@ -4,8 +4,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeCertification;
import com.ruoyi.safe.service.SafeCertificationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,31 +22,31 @@
*/
@RestController
@RequestMapping("/safeCertification")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
@AllArgsConstructor
public class SafeCertificationController {
private SafeCertificationService safeCertificationService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page<SafeCertification> page, SafeCertification safeCertification) {
return R.ok(safeCertificationService.pageSafeCertification(page, safeCertification));
}
- @ApiOperation("鏂板瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+ @Operation(summary = "鏂板瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
@PostMapping()
public R add(@RequestBody SafeCertification safeCertification) {
return R.ok(safeCertificationService.save(safeCertification));
}
- @ApiOperation("淇敼瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+ @Operation(summary = "淇敼瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
@PutMapping ()
public R update(@RequestBody SafeCertification safeCertification) {
return R.ok(safeCertificationService.updateById(safeCertification));
}
- @ApiOperation("鍒犻櫎瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+ @Operation(summary = "鍒犻櫎瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
@DeleteMapping("/{ids}")
public R delSafeCertification(@RequestBody List<Integer> ids) {
return R.ok(safeCertificationService.removeBatchByIds(ids));
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java b/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
index cce9272..49e3e1d 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeCertificationFile;
import com.ruoyi.safe.service.SafeCertificationFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.annotation.Resource;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
*/
@RestController
@RequestMapping("/safeCertificationFile")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�--闄勪欢")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�--闄勪欢")
public class SafeCertificationFileController {
@Resource
@@ -36,7 +36,7 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public R add(@RequestBody SafeCertificationFile safeCertificationFile) {
return R.ok(safeCertificationFileService.save(safeCertificationFile));
}
@@ -47,7 +47,7 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public R delSafeCertificationFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -63,7 +63,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R listPage(Page page, SafeCertificationFile safeCertificationFile) {
return R.ok(safeCertificationFileService.page(page, Wrappers.<SafeCertificationFile>lambdaQuery().eq(SafeCertificationFile::getSafeCertificationId,safeCertificationFile.getSafeCertificationId())));
}
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java b/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
index 8f90e8d..d5d835d 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
@@ -4,8 +4,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeContingencyPlan;
import com.ruoyi.safe.service.SafeContingencyPlanService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,31 +21,31 @@
*/
@RestController
@RequestMapping("/safeContingencyPlan")
-@Api(tags = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
+@Tag(name = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
@AllArgsConstructor
public class SafeContingencyPlanController {
private final SafeContingencyPlanService safeContingencyPlanService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeContingencyPlan safeContingencyPlan) {
return R.ok(safeContingencyPlanService.pageSafeContingencyPlan(page, safeContingencyPlan));
}
- @ApiOperation("鏂板搴旀�ラ妗堟煡闃�")
+ @Operation(summary = "鏂板搴旀�ラ妗堟煡闃�")
@PostMapping()
public R add(@RequestBody SafeContingencyPlan safeContingencyPlan) {
return R.ok(safeContingencyPlanService.save(safeContingencyPlan));
}
- @ApiOperation("淇敼搴旀�ラ妗堟煡闃�")
+ @Operation(summary = "淇敼搴旀�ラ妗堟煡闃�")
@PutMapping ()
public R update(@RequestBody SafeContingencyPlan safeContingencyPlan) {
return R.ok(safeContingencyPlanService.updateById(safeContingencyPlan));
}
- @ApiOperation("鍒犻櫎搴旀�ラ妗堟煡闃�")
+ @Operation(summary = "鍒犻櫎搴旀�ラ妗堟煡闃�")
@DeleteMapping("/{ids}")
public R delSafeCertification(@RequestBody List<Integer> ids) {
return R.ok(safeContingencyPlanService.removeBatchByIds(ids));
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
index 598d864..b433d04 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
@@ -4,8 +4,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.service.SafeHazardService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,31 +21,31 @@
*/
@RestController
@RequestMapping("/safeHazard")
-@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+@Tag(name = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
@AllArgsConstructor
public class SafeHazardController {
private SafeHazardService safeHazardService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeHazard safeHazard) {
return R.ok(safeHazardService.pageSafeHazard(page, safeHazard));
}
- @ApiOperation("鏂板鍗遍櫓婧愬彴璐�")
+ @Operation(summary = "鏂板鍗遍櫓婧愬彴璐�")
@PostMapping()
public R add(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.save(safeHazard));
}
- @ApiOperation("淇敼鍗遍櫓婧愬彴璐�")
+ @Operation(summary = "淇敼鍗遍櫓婧愬彴璐�")
@PutMapping ()
public R update(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.updateById(safeHazard));
}
- @ApiOperation("鍒犻櫎鍗遍櫓婧愬彴璐�")
+ @Operation(summary = "鍒犻櫎鍗遍櫓婧愬彴璐�")
@DeleteMapping("/{ids}")
public R delSafeHazard(@RequestBody List<Integer> ids) {
return R.ok(safeHazardService.delSafeHazard(ids));
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
index d1398d0..681efa5 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
@@ -5,8 +5,8 @@
import com.ruoyi.safe.dto.SafeHazardRecordDto;
import com.ruoyi.safe.pojo.SafeHazardRecord;
import com.ruoyi.safe.service.SafeHazardRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,31 +22,31 @@
*/
@RestController
@RequestMapping("/safeHazardRecord")
-@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+@Tag(name = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
@AllArgsConstructor
public class SafeHazardRecordController {
private SafeHazardRecordService safeHazardRecordService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeHazardRecordDto safeHazardRecordDto) {
return R.ok(safeHazardRecordService.pageSafeHazardRecord(page, safeHazardRecordDto));
}
- @ApiOperation("棰嗙敤")
+ @Operation(summary = "棰嗙敤")
@PostMapping("/borrow")
public R borrow(@RequestBody SafeHazardRecord safeHazardRecord) {
return R.ok(safeHazardRecordService.borrow(safeHazardRecord));
}
- @ApiOperation("褰掕繕")
+ @Operation(summary = "褰掕繕")
@PutMapping("/return")
public R returnSafeHazardRecord(@RequestBody SafeHazardRecord safeHazardRecord) {
return R.ok(safeHazardRecordService.returnSafeHazardRecord(safeHazardRecord));
}
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
@DeleteMapping("/{ids}")
public R delSafeHazardRecord(@RequestBody List<Integer> ids) {
return R.ok(safeHazardRecordService.delSafeHazardRecord(ids));
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java b/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
index ca07275..f77f294 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
@@ -5,8 +5,8 @@
import com.ruoyi.safe.dto.SafeHiddenDto;
import com.ruoyi.safe.pojo.SafeHidden;
import com.ruoyi.safe.service.SafeHiddenService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -23,30 +23,30 @@
@RestController
@RequestMapping("/safeHidden")
@AllArgsConstructor
-@Api(tags = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
+@Tag(name = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
public class SafeHiddenController {
private SafeHiddenService safeHiddenService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeHiddenDto safeHiddenDto) {
return R.ok(safeHiddenService.pageSafeHidden(page, safeHiddenDto));
}
- @ApiOperation("鏂板闅愭偅鎺掓煡")
+ @Operation(summary = "鏂板闅愭偅鎺掓煡")
@PostMapping()
public R add(@RequestBody SafeHidden safeHidden) {
return R.ok(safeHiddenService.add(safeHidden));
}
- @ApiOperation("淇敼闅愭偅鎺掓煡(鏁存敼/楠屾敹)")
+ @Operation(summary = "淇敼闅愭偅鎺掓煡(鏁存敼/楠屾敹)")
@PutMapping ()
public R update(@RequestBody SafeHidden safeHidden) {
return R.ok(safeHiddenService.updateById(safeHidden));
}
- @ApiOperation("鍒犻櫎闅愭偅鎺掓煡")
+ @Operation(summary = "鍒犻櫎闅愭偅鎺掓煡")
@DeleteMapping("/{ids}")
public R delSafeHidden(@RequestBody List<Integer> ids) {
return R.ok(safeHiddenService.delSafeHidden(ids));
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java b/src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java
index 227f861..511bdb7 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeHiddenFile;
import com.ruoyi.safe.service.SafeHiddenFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
*/
@RestController
@RequestMapping("/safeHiddenFile")
-@Api(tags = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢")
+@Tag(name = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢")
public class SafeHiddenFileController {
@Resource
@@ -36,7 +36,7 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public R add(@RequestBody SafeHiddenFile safeHiddenFile) {
return R.ok(safeHiddenFileService.save(safeHiddenFile));
}
@@ -47,7 +47,7 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public R delSafeHiddenFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -63,7 +63,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R listPage(Page page, SafeHiddenFile safeHiddenFile) {
return R.ok(safeHiddenFileService.page(page, Wrappers.<SafeHiddenFile>lambdaQuery().eq(SafeHiddenFile::getSafeHiddenId,safeHiddenFile.getSafeHiddenId())));
}
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
index 48857aa..ae8fafa 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingController.java
@@ -7,8 +7,8 @@
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
import com.ruoyi.safe.service.SafeTrainingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@
*/
@RestController
@RequestMapping("/safeTraining")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
@RequiredArgsConstructor
public class SafeTrainingController {
@@ -33,42 +33,42 @@
private SafeTrainingDetailsService safeTrainingDetailsService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeTrainingDto safeTrainingDto) {
return R.ok(safeTrainingService.pageSafeTraining(page, safeTrainingDto));
}
- @ApiOperation("鏂板/缂栬緫瀹夊叏鍩硅鑰冩牳")
+ @Operation(summary = "鏂板/缂栬緫瀹夊叏鍩硅鑰冩牳")
@PostMapping()
public R addOrUpdate(@RequestBody SafeTraining safeTraining) {
return R.ok(safeTrainingService.addOrUpdate(safeTraining));
}
- @ApiOperation("绛惧埌")
+ @Operation(summary = "绛惧埌")
@PostMapping ("/sign")
public R sign(@RequestBody SafeTrainingDetails safeTrainingDetails) {
return R.ok(safeTrainingDetailsService.save(safeTrainingDetails));
}
- @ApiOperation("缁撴灉鏄庣粏鏌ヨ")
+ @Operation(summary = "缁撴灉鏄庣粏鏌ヨ")
@GetMapping ("/getSafeTraining")
public R getSafeTraining(Long id) {
return R.ok(safeTrainingService.getSafeTraining(id));
}
- @ApiOperation("缁撴灉鏄庣粏淇濆瓨")
+ @Operation(summary = "缁撴灉鏄庣粏淇濆瓨")
@PostMapping ("/saveSafeTraining")
public R saveSafeTraining(@RequestBody SafeTrainingDto safeTrainingDto) {
return R.ok(safeTrainingService.saveSafeTraining(safeTrainingDto));
}
- @ApiOperation("鍒犻櫎瀹夊叏鍩硅鑰冩牳")
+ @Operation(summary = "鍒犻櫎瀹夊叏鍩硅鑰冩牳")
@DeleteMapping("/{ids}")
public R delSafeTraining(@RequestBody List<Integer> ids) {
return R.ok(safeTrainingService.delSafeTraining(ids));
}
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
@PostMapping ("/export")
public void export(HttpServletResponse response, @RequestBody SafeTraining safeTraining) {
safeTrainingService.export(response,safeTraining.getId());
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
index b000680..63a03e4 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingDetailsController.java
@@ -4,8 +4,8 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.service.SafeTrainingDetailsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +20,7 @@
*/
@RestController
@RequestMapping("/safeTrainingDetails")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
@AllArgsConstructor
public class SafeTrainingDetailsController {
@@ -28,12 +28,12 @@
private final SafeTrainingDetailsService safeTrainingDetailsService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeTrainingDetails safeTrainingDetails) {
return R.ok(safeTrainingDetailsService.pageDetails(page, safeTrainingDetails));
}
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody SafeTrainingDetails safeTrainingDetails) {
safeTrainingDetailsService.export(response,safeTrainingDetails.getUserId());
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java
index 7ca0450..5d18a03 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java
@@ -6,8 +6,8 @@
import com.ruoyi.safe.pojo.SafeHiddenFile;
import com.ruoyi.safe.pojo.SafeTrainingFile;
import com.ruoyi.safe.service.SafeTrainingFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@
*/
@RestController
@RequestMapping("/safeTrainingFile")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
public class SafeTrainingFileController {
@Resource
@@ -37,7 +37,7 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public R add(@RequestBody SafeTrainingFile safeHiddenFile) {
return R.ok(safeTrainingFileService.save(safeHiddenFile));
}
@@ -48,7 +48,7 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public R delSafeHiddenFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -64,7 +64,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R listPage(Page page, SafeTrainingFile safeTrainingFile) {
return R.ok(safeTrainingFileService.page(page, Wrappers.<SafeTrainingFile>lambdaQuery().eq(SafeTrainingFile::getSafeTrainingId,safeTrainingFile.getSafeTrainingId())));
}
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
index 3d2c2e0..49615ff 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.safe.pojo.SafeHazardRecord;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -18,25 +17,25 @@
@Data
public class SafeHazardRecordDto extends SafeHazardRecord {
- @ApiModelProperty("棰嗙敤浜�")
+ @Schema(description = "棰嗙敤浜�")
private String applyUserName;
- @ApiModelProperty("褰掕繕浜�")
+ @Schema(description = "褰掕繕浜�")
private String returnUserName;
- @ApiModelProperty("鍗遍櫓婧愬悕绉�")
+ @Schema(description = "鍗遍櫓婧愬悕绉�")
private String name;
- @ApiModelProperty("鍗遍櫓婧愮紪鐮�")
+ @Schema(description = "鍗遍櫓婧愮紪鐮�")
private String code;
- @ApiModelProperty("鍗遍櫓婧愮被鍨�")
+ @Schema(description = "鍗遍櫓婧愮被鍨�")
private String type;
- @ApiModelProperty("椋庨櫓绛夌骇")
+ @Schema(description = "椋庨櫓绛夌骇")
private String riskLevel;
- @ApiModelProperty("鎵�鍦ㄤ綅缃�")
+ @Schema(description = "鎵�鍦ㄤ綅缃�")
private String location;
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
index fedb6a0..f99b423 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.safe.pojo.SafeHidden;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -17,12 +16,12 @@
@Data
public class SafeHiddenDto extends SafeHidden {
- @ApiModelProperty("涓婃姤浜�")
+ @Schema(description = "涓婃姤浜�")
private String createUserName;
- @ApiModelProperty("鏁存敼璐ｄ换浜�")
+ @Schema(description = "鏁存敼璐ｄ换浜�")
private String rectifyUserName;
- @ApiModelProperty("楠屾敹浜�")
+ @Schema(description = "楠屾敹浜�")
private String verifyUserName;
}
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java
index 0eb6da5..bbdf02e 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -16,13 +15,13 @@
@Data
public class SafeTrainingDetailsDto extends SafeTrainingDetails {
- @ApiModelProperty("鍩硅浜哄憳缂栧彿")
+ @Schema(description = "鍩硅浜哄憳缂栧彿")
private String userName;
- @ApiModelProperty("鍩硅浜哄憳鍚嶇О")
+ @Schema(description = "鍩硅浜哄憳鍚嶇О")
private String nickName;
- @ApiModelProperty("鎵嬫満鍙风爜")
+ @Schema(description = "鎵嬫満鍙风爜")
private String phonenumber;
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
index 0b8d7cd..fc64f64 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
@@ -3,7 +3,7 @@
import com.ruoyi.safe.pojo.SafeTraining;
import com.ruoyi.safe.pojo.SafeTrainingDetails;
import com.ruoyi.safe.pojo.SafeTrainingFile;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -11,16 +11,16 @@
@Data
public class SafeTrainingDto extends SafeTraining {
- @ApiModelProperty("鎶ュ悕浜烘暟")
+ @Schema(description = "鎶ュ悕浜烘暟")
private Integer nums;
- @ApiModelProperty("璇勪环浜�")
+ @Schema(description = "璇勪环浜�")
private String assessmentUserName;
- @ApiModelProperty("闄勪欢闆嗗悎")
+ @Schema(description = "闄勪欢闆嗗悎")
private List<SafeTrainingFile> safeTrainingFileList;
- @ApiModelProperty("鍩硅璁板綍浜哄憳璇︽儏闆嗗悎")
+ @Schema(description = "鍩硅璁板綍浜哄憳璇︽儏闆嗗悎")
private List<SafeTrainingDetailsDto> safeTrainingDetailsDtoList;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java b/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
index 3792d0b..74a46b6 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("safe_accident")
-@ApiModel(value = "SafeAccident瀵硅薄", description = "瀹夊叏鐢熶骇--浜嬫晠涓婃姤璁板綍")
+@Schema(name = "SafeAccident瀵硅薄", description = "瀹夊叏鐢熶骇--浜嬫晠涓婃姤璁板綍")
public class SafeAccident implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,61 +34,61 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("浜嬫晠缂栧彿")
+ @Schema(description = "浜嬫晠缂栧彿")
private String accidentCode;
- @ApiModelProperty("浜嬫晠鍚嶇О")
+ @Schema(description = "浜嬫晠鍚嶇О")
private String accidentName;
- @ApiModelProperty("浜嬫晠绫诲瀷")
+ @Schema(description = "浜嬫晠绫诲瀷")
private String accidentType;
- @ApiModelProperty("浜嬫晠鍙戠敓鏃堕棿")
+ @Schema(description = "浜嬫晠鍙戠敓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime happenTime;
- @ApiModelProperty("浜嬫晠鍙戠敓浣嶇疆")
+ @Schema(description = "浜嬫晠鍙戠敓浣嶇疆")
private String happenLocation;
- @ApiModelProperty("浜嬫晠绛夌骇")
+ @Schema(description = "浜嬫晠绛夌骇")
private String accidentGrade;
- @ApiModelProperty("浜嬫晠鐩存帴鍘熷洜")
+ @Schema(description = "浜嬫晠鐩存帴鍘熷洜")
private String accidentCause;
- @ApiModelProperty("浜嬫晠鏍规湰鍘熷洜")
+ @Schema(description = "浜嬫晠鏍规湰鍘熷洜")
private String rootCause;
- @ApiModelProperty("浜哄憳鎹熷け鎯呭喌")
+ @Schema(description = "浜哄憳鎹熷け鎯呭喌")
private String personLoss;
- @ApiModelProperty("鐩存帴璐骇鎹熷け锛堝厓锛� ")
+ @Schema(description = "鐩存帴璐骇鎹熷け锛堝厓锛� ")
private BigDecimal assetLoss;
- @ApiModelProperty("鐢熶骇褰卞搷鎯呭喌")
+ @Schema(description = "鐢熶骇褰卞搷鎯呭喌")
private String productionLoss;
- @ApiModelProperty("鐜板満搴旀�ュ缃帾鏂�")
+ @Schema(description = "鐜板満搴旀�ュ缃帾鏂�")
private String handleMeasures;
- @ApiModelProperty("浜嬫晠璐ｄ换浜�")
+ @Schema(description = "浜嬫晠璐ｄ换浜�")
private String responsiblePerson;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("涓婃姤鏃堕棿")
+ @Schema(description = "涓婃姤鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("涓婃姤浜篿d")
+ @Schema(description = "涓婃姤浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("涓婃姤浜�")
+ @Schema(description = "涓婃姤浜�")
@TableField(exist = false)
private String createUserName;
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java b/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java
index cca0e3c..770e123 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("safe_certification")
-@ApiModel(value = "SafeCertification瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+@Schema(name = "SafeCertification瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
public class SafeCertification implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,22 +34,22 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("瑙勭▼璧勮川鍚嶇О")
+ @Schema(description = "瑙勭▼璧勮川鍚嶇О")
private String name;
- @ApiModelProperty("瑙勭▼璧勮川缂栧彿")
+ @Schema(description = "瑙勭▼璧勮川缂栧彿")
private String code;
- @ApiModelProperty("瑙勭▼璧勮川绫诲瀷")
+ @Schema(description = "瑙勭▼璧勮川绫诲瀷")
private String type;
- @ApiModelProperty("鐗堟湰鍙�")
+ @Schema(description = "鐗堟湰鍙�")
private String version;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鏈夋晥鏈�")
+ @Schema(description = "鏈夋晥鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate effectiveTime;
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java
index dc23511..cc59b6f 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -25,7 +24,7 @@
@Getter
@Setter
@TableName("safe_certification_file")
-@ApiModel(value = "SafeCertificationFile瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�--闄勪欢")
+@Schema(name = "SafeCertificationFile瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�--闄勪欢")
public class SafeCertificationFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -33,7 +32,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍏宠仈瀹夊叏鐢熶骇璧勮川id")
+ @Schema(description = "鍏宠仈瀹夊叏鐢熶骇璧勮川id")
@NotBlank(message = "鍏宠仈瀹夊叏鐢熶骇璧勮川id涓嶈兘涓虹┖")
private Integer safeCertificationId;
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java b/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
index 6812ea2..869d84f 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("safe_contingency_plan")
-@ApiModel(value = "SafeContingencyPlan瀵硅薄", description = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
+@Schema(name = "SafeContingencyPlan瀵硅薄", description = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
public class SafeContingencyPlan implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,34 +34,34 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("搴旀�ラ妗堢紪鐮�")
+ @Schema(description = "搴旀�ラ妗堢紪鐮�")
private String planCode;
- @ApiModelProperty("搴旀�ラ妗堝悕绉�")
+ @Schema(description = "搴旀�ラ妗堝悕绉�")
private String planName;
- @ApiModelProperty("棰勬绫诲瀷")
+ @Schema(description = "棰勬绫诲瀷")
private String planType;
- @ApiModelProperty("閫傜敤鑼冨洿")
+ @Schema(description = "閫傜敤鑼冨洿")
private String applyScope;
- @ApiModelProperty("鏍稿績璐ｄ换浜�")
+ @Schema(description = "鏍稿績璐ｄ换浜�")
private Integer coreResponsorUserId;
- @ApiModelProperty("鏍稿績璐ｄ换浜�")
+ @Schema(description = "鏍稿績璐ｄ换浜�")
@TableField(exist = false)
private String coreResponsorUserName;
- @ApiModelProperty("搴旀�ュ缃楠�")
+ @Schema(description = "搴旀�ュ缃楠�")
private String execSteps;
- @ApiModelProperty("鍙戝竷鐢熸晥鏃堕棿")
+ @Schema(description = "鍙戝竷鐢熸晥鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate publishTime;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
@TableField(fill = FieldFill.INSERT)
@@ -73,7 +72,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏈�鍚庝慨璁㈡椂闂�")
+ @Schema(description = "鏈�鍚庝慨璁㈡椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
index af7fb7f..ca88032 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("safe_hazard")
-@ApiModel(value = "SafeHazard瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+@Schema(name = "SafeHazard瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
public class SafeHazard implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,41 +34,41 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍗遍櫓婧愬悕绉�")
+ @Schema(description = "鍗遍櫓婧愬悕绉�")
private String name;
- @ApiModelProperty("鍗遍櫓婧愮紪鐮�")
+ @Schema(description = "鍗遍櫓婧愮紪鐮�")
private String code;
- @ApiModelProperty("鍗遍櫓婧愮被鍨�")
+ @Schema(description = "鍗遍櫓婧愮被鍨�")
private String type;
- @ApiModelProperty("椋庨櫓绛夌骇")
+ @Schema(description = "椋庨櫓绛夌骇")
private String riskLevel;
- @ApiModelProperty("鎵�鍦ㄤ綅缃�")
+ @Schema(description = "鎵�鍦ㄤ綅缃�")
private String location;
- @ApiModelProperty("瑙勬牸 / 椋庨櫓鎻忚堪")
+ @Schema(description = "瑙勬牸 / 椋庨櫓鎻忚堪")
private String specInfo;
- @ApiModelProperty("绠℃帶鎺柦")
+ @Schema(description = "绠℃帶鎺柦")
private String controlMeasures;
- @ApiModelProperty("绠℃帶璐ｄ换浜� ID")
+ @Schema(description = "绠℃帶璐ｄ换浜� ID")
private Integer principalUserId;
- @ApiModelProperty("绠℃帶璐ｄ换浜�")
+ @Schema(description = "绠℃帶璐ｄ换浜�")
@TableField(exist = false)
private String principalUser;
- @ApiModelProperty("璐ｄ换浜鸿仈绯荤數璇�")
+ @Schema(description = "璐ｄ换浜鸿仈绯荤數璇�")
private String principalMobile;
- @ApiModelProperty("搴撳瓨鏁伴噺")
+ @Schema(description = "搴撳瓨鏁伴噺")
private BigDecimal stockQty;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
index c60913a..79b59aa 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
@@ -11,8 +11,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -28,7 +27,7 @@
@Getter
@Setter
@TableName("safe_hazard_record")
-@ApiModel(value = "SafeHazardRecord瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+@Schema(name = "SafeHazardRecord瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
public class SafeHazardRecord implements Serializable {
private static final long serialVersionUID = 1L;
@@ -36,35 +35,35 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍗曞彿")
+ @Schema(description = "鍗曞彿")
private String materialRecordCode;
- @ApiModelProperty("鍏宠仈鍗遍櫓婧愬彴璐� ID")
+ @Schema(description = "鍏宠仈鍗遍櫓婧愬彴璐� ID")
private Integer safeHazardId;
- @ApiModelProperty("棰嗙敤浜� ID")
+ @Schema(description = "棰嗙敤浜� ID")
private Integer applyUserId;
- @ApiModelProperty("棰嗙敤鏃堕棿")
+ @Schema(description = "棰嗙敤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate applyTime;
- @ApiModelProperty("棰嗙敤鏁伴噺")
+ @Schema(description = "棰嗙敤鏁伴噺")
private BigDecimal applyQty;
- @ApiModelProperty("棰嗙敤鐢ㄩ��")
+ @Schema(description = "棰嗙敤鐢ㄩ��")
private String applyPurpose;
- @ApiModelProperty("褰掕繕浜� ID")
+ @Schema(description = "褰掕繕浜� ID")
private Integer returnUserId;
- @ApiModelProperty("褰掕繕鏃堕棿")
+ @Schema(description = "褰掕繕鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate returnTime;
- @ApiModelProperty("褰掕繕鎯呭喌璇存槑")
+ @Schema(description = "褰掕繕鎯呭喌璇存槑")
private String returnRemark;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
index 7c90c8e..1b10824 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -22,7 +21,7 @@
*/
@Data
@TableName("safe_hidden")
-@ApiModel(value = "SafeHidden瀵硅薄", description = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
+@Schema(name = "SafeHidden瀵硅薄", description = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
public class SafeHidden implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,63 +29,63 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("闅愭偅缂栧彿")
+ @Schema(description = "闅愭偅缂栧彿")
private String hiddenCode;
- @ApiModelProperty("闅愭偅绫诲瀷")
+ @Schema(description = "闅愭偅绫诲瀷")
private String type;
- @ApiModelProperty("闅愭偅椋庨櫓绛夌骇")
+ @Schema(description = "闅愭偅椋庨櫓绛夌骇")
private String riskLevel;
- @ApiModelProperty("闅愭偅鍏蜂綋浣嶇疆")
+ @Schema(description = "闅愭偅鍏蜂綋浣嶇疆")
private String location;
- @ApiModelProperty("闅愭偅鎻忚堪")
+ @Schema(description = "闅愭偅鎻忚堪")
private String hiddenDesc;
- @ApiModelProperty("鏁存敼璐ｄ换浜� ID")
+ @Schema(description = "鏁存敼璐ｄ换浜� ID")
@NotBlank(message = "鏁存敼璐ｄ换浜轰笉鑳戒负绌�")
private Integer rectifyUserId;
- @ApiModelProperty("鏁存敼浜鸿仈绯荤數璇�")
+ @Schema(description = "鏁存敼浜鸿仈绯荤數璇�")
private String rectifyUserMobile;
- @ApiModelProperty("鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)")
+ @Schema(description = "鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotBlank(message = "鏁存敼瀹屾垚鏈熼檺涓嶈兘涓虹┖")
private LocalDate rectifyTime;
- @ApiModelProperty("鏁存敼鍏蜂綋鎺柦")
+ @Schema(description = "鏁存敼鍏蜂綋鎺柦")
private String rectifyMeasures;
- @ApiModelProperty("瀹為檯鏁存敼瀹屾垚鏃堕棿")
+ @Schema(description = "瀹為檯鏁存敼瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate rectifyActualTime;
- @ApiModelProperty("楠屾敹浜� ID")
+ @Schema(description = "楠屾敹浜� ID")
private Integer verifyUserId;
- @ApiModelProperty("楠屾敹缁撴灉")
+ @Schema(description = "楠屾敹缁撴灉")
private String verifyResult;
- @ApiModelProperty("楠屾敹鎰忚")
+ @Schema(description = "楠屾敹鎰忚")
private String verifyRemark;
- @ApiModelProperty("楠屾敹鏃堕棿")
+ @Schema(description = "楠屾敹鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate verifyTime;
- @ApiModelProperty("涓婃姤鏃堕棿")
+ @Schema(description = "涓婃姤鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("涓婃姤浜篿d")
+ @Schema(description = "涓婃姤浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
index bac10ce..320af53 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("safe_hidden_file")
-@ApiModel(value = "SafeHiddenFile瀵硅薄", description = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢")
+@Schema(name = "SafeHiddenFile瀵硅薄", description = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢")
public class SafeHiddenFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,7 +30,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍏宠仈闅愭偅鎺掓煡涓婃姤id")
+ @Schema(description = "鍏宠仈闅愭偅鎺掓煡涓婃姤id")
private Integer safeHiddenId;
private String name;
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java b/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
index 8c89ab8..b4add43 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
@@ -11,8 +11,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -30,7 +29,7 @@
@Getter
@Setter
@TableName("safe_training")
-@ApiModel(value = "SafeTraining瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
+@Schema(name = "SafeTraining瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳")
public class SafeTraining implements Serializable {
private static final long serialVersionUID = 1L;
@@ -38,68 +37,68 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("璇剧▼缂栧彿")
+ @Schema(description = "璇剧▼缂栧彿")
private String courseCode;
- @ApiModelProperty("鍩硅鐩爣")
+ @Schema(description = "鍩硅鐩爣")
private String trainingObjectives;
- @ApiModelProperty("鍩硅鍐呭")
+ @Schema(description = "鍩硅鍐呭")
private String trainingContent;
- @ApiModelProperty("鍩硅鏂瑰紡")
+ @Schema(description = "鍩硅鏂瑰紡")
private String trainingMode;
- @ApiModelProperty("鐘舵��(0锛氭湭寮�濮�1锛氳繘琛屼腑锛�2锛氬凡缁撴潫)")
+ @Schema(description = "鐘舵��(0锛氭湭寮�濮�1锛氳繘琛屼腑锛�2锛氬凡缁撴潫)")
private Integer state;
- @ApiModelProperty("鍙傚姞瀵硅薄")
+ @Schema(description = "鍙傚姞瀵硅薄")
private String participants;
- @ApiModelProperty("鍩硅鍦扮偣")
+ @Schema(description = "鍩硅鍦扮偣")
private String placeTraining;
- @ApiModelProperty("鍩硅璁插笀")
+ @Schema(description = "鍩硅璁插笀")
private String trainingLecturer;
- @ApiModelProperty("鍩硅鏃ユ湡")
+ @Schema(description = "鍩硅鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotBlank(message = "鍩硅鏃ユ湡涓嶈兘涓虹┖")
private LocalDate trainingDate;
- @ApiModelProperty("寮�濮嬫椂闂�(鏃跺垎绉�)")
+ @Schema(description = "寮�濮嬫椂闂�(鏃跺垎绉�)")
@NotBlank(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
private String openingTime;
- @ApiModelProperty("缁撴潫鏃堕棿(鏃跺垎绉�)")
+ @Schema(description = "缁撴潫鏃堕棿(鏃跺垎绉�)")
@NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
private String endTime;
- @ApiModelProperty("璇鹃瀛﹀垎")
+ @Schema(description = "璇鹃瀛﹀垎")
private String projectCredits;
- @ApiModelProperty("璇炬椂")
+ @Schema(description = "璇炬椂")
private Double classHour;
- @ApiModelProperty("鑰冩牳鏂瑰紡")
+ @Schema(description = "鑰冩牳鏂瑰紡")
private String assessmentMethod;
- @ApiModelProperty("鏈鍩硅缁煎悎璇勪环")
+ @Schema(description = "鏈鍩硅缁煎悎璇勪环")
private String comprehensiveAssessment;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remarks;
- @ApiModelProperty("璇勪环浜篿d")
+ @Schema(description = "璇勪环浜篿d")
private Integer assessmentUserId;
- @ApiModelProperty("璇勪环鏃堕棿")
+ @Schema(description = "璇勪环鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate assessmentDate;
- @ApiModelProperty("鍩硅鎽樿")
+ @Schema(description = "鍩硅鎽樿")
private String trainingAbstract;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
index 825b4ad..a0611d9 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
@@ -25,7 +24,7 @@
@Getter
@Setter
@TableName("safe_training_details")
-@ApiModel(value = "SafeTrainingDetails瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
+@Schema(name = "SafeTrainingDetails瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--璁板綍璇︽儏")
public class SafeTrainingDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -33,14 +32,14 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鐢ㄦ埛琛ㄦ牸锛坲ser锛変富閿�")
+ @Schema(description = "鐢ㄦ埛琛ㄦ牸锛坲ser锛変富閿�")
@NotBlank(message = "鐢ㄦ埛id涓嶈兘涓虹┖")
private Long userId;
- @ApiModelProperty("鍏宠仈瀹夊叏鍩硅鑰冩牳id")
+ @Schema(description = "鍏宠仈瀹夊叏鍩硅鑰冩牳id")
private Integer safeTrainingId;
- @ApiModelProperty("鑰冩牳缁撴灉")
+ @Schema(description = "鑰冩牳缁撴灉")
private String examinationResults;
@TableField(fill = FieldFill.INSERT)
@@ -63,29 +62,29 @@
private Integer tenantId;
- @ApiModelProperty("鍩硅鏃ユ湡")
+ @Schema(description = "鍩硅鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private LocalDate trainingDate;
- @ApiModelProperty("璇剧▼缂栧彿")
+ @Schema(description = "璇剧▼缂栧彿")
@TableField(exist = false)
private String courseCode;
- @ApiModelProperty("鍩硅鍐呭")
+ @Schema(description = "鍩硅鍐呭")
@TableField(exist = false)
private String trainingContent;
- @ApiModelProperty("鍩硅璇炬椂")
+ @Schema(description = "鍩硅璇炬椂")
@TableField(exist = false)
private Double classHour;
- @ApiModelProperty("璇鹃瀛﹀垎")
+ @Schema(description = "璇鹃瀛﹀垎")
@TableField(exist = false)
private String projectCredits;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
@TableField(exist = false)
private String remarks;
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
index 87c559e..482d197 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("safe_training_file")
-@ApiModel(value = "SafeTrainingFile瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
+@Schema(name = "SafeTrainingFile瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
public class SafeTrainingFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,7 +30,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍏宠仈瀹夊叏鍩硅鑰冩牳id")
+ @Schema(description = "鍏宠仈瀹夊叏鍩硅鑰冩牳id")
private Integer safeTrainingId;
private String name;
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 56b7ddb..8ad4f02 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -4,8 +4,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.service.impl.MetricStatisticsServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +15,7 @@
* @author :yys
* @date : 2026/1/15 9:39
*/
-@Api(tags = "鎸囨爣缁熻")
+@Tag(name = "鎸囨爣缁熻")
@RestController
@RequestMapping("/metricStatistics")
@AllArgsConstructor
@@ -23,13 +23,13 @@
private MetricStatisticsServiceImpl metricStatisticsService;
- @ApiOperation("澶撮儴鎬昏")
+ @Operation(summary = "澶撮儴鎬昏")
@GetMapping("/total")
public AjaxResult total() {
return metricStatisticsService.total();
}
- @ApiOperation("缁熻琛�")
+ @Operation(summary = "缁熻琛�")
@GetMapping("/statisticsTable")
public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
return metricStatisticsService.statisticsTable(statisticsTableDto);
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index 4e6eeb0..f88a0e6 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -9,8 +9,8 @@
import com.ruoyi.sales.mapper.PaymentShippingMapper;
import com.ruoyi.sales.pojo.PaymentShipping;
import com.ruoyi.sales.service.PaymentShippingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
*/
@RestController
@RequestMapping("/paymentShipping")
-@Api(tags = "鏀粯涓庡彂璐х鐞�")
+@Tag(name = "鏀粯涓庡彂璐х鐞�")
@AllArgsConstructor
public class PaymentShippingController extends BaseController {
@@ -31,14 +31,14 @@
private PaymentShippingMapper paymentShippingMapper;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
public AjaxResult listPage(Page page, PaymentShipping paymentShipping) {
IPage<PaymentShipping> listPage = paymentShippingService.listPage(page, paymentShipping);
return AjaxResult.success(listPage);
}
@PostMapping("/add")
- @ApiOperation("娣诲姞鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
@@ -48,7 +48,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "淇敼鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody PaymentShipping paymentShipping) {
boolean update = paymentShippingService.updateById(paymentShipping);
@@ -56,7 +56,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)){
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index a5ebc32..5512a8d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -14,7 +14,7 @@
import com.ruoyi.sales.dto.ReceiptPaymentRecordDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.ReceiptPaymentService;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -110,7 +110,7 @@
return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
}
- @ApiModelProperty("瀵煎嚭鍥炴鐧昏")
+ @Schema(description = "瀵煎嚭鍥炴鐧昏")
@PostMapping("/export")
public void export(HttpServletResponse response, String ids) {
if (ids == null || ids.isEmpty()) {
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 96b7ef4..05d2505 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -19,8 +19,8 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiParam;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
@@ -47,7 +47,7 @@
@RestController
@RequestMapping("/sales/ledger")
@AllArgsConstructor
-@Api(tags = "閿�鍞彴璐�")
+@Tag(name = "閿�鍞彴璐�")
@Slf4j
public class SalesLedgerController extends BaseController {
@@ -61,14 +61,14 @@
*/
@Log(title = "瀵煎叆閿�鍞彴璐�", businessType = BusinessType.INSERT)
@PostMapping("/import")
- @ApiOperation("瀵煎叆閿�鍞彴璐�")
+ @Operation(summary = "瀵煎叆閿�鍞彴璐�")
public AjaxResult importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return salesLedgerService.importData(file);
}
- @ApiOperation("瀵煎嚭閿�鍞彴璐︽ā鏉�")
+ @Operation(summary = "瀵煎嚭閿�鍞彴璐︽ā鏉�")
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
// 1. 妯℃澘鏂囦欢鍦╮esources/static涓嬬殑璺緞
@@ -338,7 +338,7 @@
return iPage;
}
- @ApiOperation("鏌ヨ閿�鍞彴璐︽秷鑰楃墿鏂欎俊鎭�")
+ @Operation(summary = "鏌ヨ閿�鍞彴璐︽秷鑰楃墿鏂欎俊鎭�")
@GetMapping("/getSalesLedgerWithProductsLoss")
public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
diff --git a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
index 9b407d8..5f64f8c 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
@@ -6,8 +6,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.pojo.SalespersonManagement;
import com.ruoyi.sales.service.SalespersonManagementService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -20,21 +20,21 @@
*/
@RestController
@RequestMapping("/salespersonManagement")
-@Api(tags = "涓氬姟鍛樼鐞�")
+@Tag(name = "涓氬姟鍛樼鐞�")
@AllArgsConstructor
public class SalespersonManagementController extends BaseController {
private SalespersonManagementService salespersonManagementService;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ涓氬姟鍛樹俊鎭�")
+ @Operation(summary = "鍒嗛〉鏌ヨ涓氬姟鍛樹俊鎭�")
public AjaxResult listPage(Page page, SalespersonManagement salespersonManagement) {
IPage<SalespersonManagement> listPage = salespersonManagementService.listPage(page, salespersonManagement);
return AjaxResult.success(listPage);
}
@PostMapping("/add")
- @ApiOperation("娣诲姞涓氬姟鍛樹俊鎭�")
+ @Operation(summary = "娣诲姞涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody SalespersonManagement salespersonManagement) {
boolean save = salespersonManagementService.save(salespersonManagement);
@@ -42,7 +42,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼涓氬姟鍛樹俊鎭�")
+ @Operation(summary = "淇敼涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody SalespersonManagement salespersonManagement) {
boolean update = salespersonManagementService.updateById(salespersonManagement);
@@ -50,7 +50,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎涓氬姟鍛樹俊鎭�")
+ @Operation(summary = "鍒犻櫎涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (ids == null || ids.isEmpty()) {
diff --git a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
index 56c0e9f..8c95270 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
@@ -13,8 +13,8 @@
import com.ruoyi.sales.pojo.ShipmentApproval;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ShipmentApprovalService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -24,7 +24,7 @@
@RestController
@RequestMapping("/shipmentApproval")
-@Api(tags = "鍙戣揣瀹℃壒绠＄悊")
+@Tag(name = "鍙戣揣瀹℃壒绠＄悊")
@AllArgsConstructor
public class ShipmentApprovalController extends BaseController {
@@ -34,14 +34,14 @@
private final StockUtils stockUtils;
@GetMapping("/listPage")
- @ApiOperation("鍙戣揣瀹℃壒鍒楄〃")
+ @Operation(summary = "鍙戣揣瀹℃壒鍒楄〃")
public AjaxResult listPage(Page page, ShipmentApproval req) {
IPage<ShipmentApproval> listPage = shipmentApprovalService.listPage(page,req);
return AjaxResult.success(listPage);
}
@PostMapping("/update")
- @ApiOperation("鍙戣揣瀹℃壒,鏇存柊鍙戣揣瀹℃壒鐘舵��")
+ @Operation(summary = "鍙戣揣瀹℃壒,鏇存柊鍙戣揣瀹℃壒鐘舵��")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody ShipmentApproval req) {
@@ -95,7 +95,7 @@
* 瀵煎嚭鍙戣揣淇℃伅绠＄悊
*/
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鍙戣揣瀹℃壒")
+ @Operation(summary = "瀵煎嚭鍙戣揣瀹℃壒")
public void export(HttpServletResponse response) {
List<ShipmentApproval> list = shipmentApprovalService.list();
ExcelUtil<ShipmentApproval> util = new ExcelUtil<ShipmentApproval>(ShipmentApproval.class);
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index ff0416b..eccb2ea 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -16,8 +16,8 @@
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +33,7 @@
*/
@RestController
@RequestMapping("/shippingInfo")
-@Api(tags = "鍙戣揣淇℃伅绠＄悊")
+@Tag(name = "鍙戣揣淇℃伅绠＄悊")
@AllArgsConstructor
public class ShippingInfoController extends BaseController {
@@ -43,14 +43,14 @@
@GetMapping("/listPage")
- @ApiOperation("鍙戣揣淇℃伅鍒楄〃")
+ @Operation(summary = "鍙戣揣淇℃伅鍒楄〃")
public AjaxResult listPage(Page page, ShippingInfo req) {
IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page,req);
return AjaxResult.success(listPage);
}
@PostMapping("/add")
- @ApiOperation("娣诲姞鍙戣揣淇℃伅")
+ @Operation(summary = "娣诲姞鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
@@ -72,7 +72,7 @@
return save ? AjaxResult.success() : AjaxResult.error();
}
- @ApiOperation("鍙戣揣鎵ｅ簱瀛�")
+ @Operation(summary = "鍙戣揣鎵ｅ簱瀛�")
@PostMapping("/deductStock")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
@@ -81,7 +81,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼鍙戣揣淇℃伅")
+ @Operation(summary = "淇敼鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody ShippingInfo req) {
@@ -94,7 +94,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎鍙戣揣淇℃伅")
+ @Operation(summary = "鍒犻櫎鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -106,7 +106,7 @@
* 瀵煎嚭鍙戣揣淇℃伅绠＄悊
*/
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鍙戣揣淇℃伅")
+ @Operation(summary = "瀵煎嚭鍙戣揣淇℃伅")
public void export(HttpServletResponse response) {
List<ShippingInfo> list = shippingInfoMapper.listAll();
ExcelUtil<ShippingInfo> util = new ExcelUtil<ShippingInfo>(ShippingInfo.class);
@@ -115,7 +115,7 @@
@GetMapping("/getByCustomerName")
- @ApiOperation("閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
+ @Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
public AjaxResult getByCustomerName(String customerName) {
return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
}
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
index c638ebb..8f15d3b 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.vo.FileVo;
import com.ruoyi.sales.pojo.InvoiceLedger;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -16,41 +16,41 @@
private List<FileVo> fileList;
- @ApiModelProperty(value = "鏌ヨ鏂囨湰")
+ @Schema(description = "鏌ヨ鏂囨湰")
private String searchText;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(value = "瀹㈡埛ID")
+ @Schema(description = "瀹㈡埛ID")
private Integer customerId;
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(value = "涓氬姟鍛�")
+ @Schema(description = "涓氬姟鍛�")
private String salesman;
- @ApiModelProperty(value = "鍙戠エ鏂囦欢鍚�")
+ @Schema(description = "鍙戠エ鏂囦欢鍚�")
private String invoiceFileName;
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
private BigDecimal receiptPaymentAmount;
- @ApiModelProperty(value = "鍥炴鏃ユ湡")
+ @Schema(description = "鍥炴鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date receiptPaymentDate;
- @ApiModelProperty(value = "鏈洖娆鹃噾棰�")
+ @Schema(description = "鏈洖娆鹃噾棰�")
private BigDecimal unReceiptPaymentAmount;
- @ApiModelProperty(value = "绋庣巼")
+ @Schema(description = "绋庣巼")
private BigDecimal taxRate;
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty(value = "閿�鍞悎鍚孖D")
+ @Schema(description = "閿�鍞悎鍚孖D")
private Integer salesLedgerId;
private String paymentMethod;
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java
index 05e8509..af7dedc 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java
@@ -2,7 +2,7 @@
import com.ruoyi.sales.pojo.InvoiceRegistration;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -11,19 +11,19 @@
@Data
public class InvoiceRegistrationDto extends InvoiceRegistration {
- @ApiModelProperty(name = "寮�绁ㄧ櫥璁颁骇鍝侀泦鍚�")
+ @Schema(description = "寮�绁ㄧ櫥璁颁骇鍝侀泦鍚�")
private List<InvoiceRegistrationProductDto> productDtoList;
- @ApiModelProperty(name = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(name = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(name = "鍚堝悓閲戦")
+ @Schema(description = "鍚堝悓閲戦")
private BigDecimal contractAmount;
- @ApiModelProperty(name = "鏈紑绁ㄩ噾棰�")
+ @Schema(description = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmountTotal;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
index 23fe6b4..4f94afc 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
@@ -6,7 +6,7 @@
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.InvoiceLedgerFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,28 +18,28 @@
@Data
public class InvoiceRegistrationProductDto extends InvoiceRegistrationProduct {
- @ApiModelProperty(name = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(name = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(name = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty(name = "闄勪欢")
+ @Schema(description = "闄勪欢")
private List<FileVo> fileList;
- @ApiModelProperty(value = "鍙戠エ鍙�")
+ @Schema(description = "鍙戠エ鍙�")
private String invoiceNo;
- @ApiModelProperty(value = "鍙戠エ閲戦")
+ @Schema(description = "鍙戠エ閲戦")
private BigDecimal invoiceTotal;
- @ApiModelProperty(value = "寮�绁ㄤ汉")
+ @Schema(description = "寮�绁ㄤ汉")
private String invoicePerson;
- @ApiModelProperty(value = "寮�绁ㄦ椂闂�")
+ @Schema(description = "寮�绁ㄦ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate invoiceDate;
@@ -49,10 +49,10 @@
@TableField(exist = false)
private String invoiceDateEnd;
- @ApiModelProperty(value = "寮�绁ㄥ彴璐d")
+ @Schema(description = "寮�绁ㄥ彴璐d")
private Integer invoiceLedgerId;
- @ApiModelProperty(value = "鍙戠エ鏂囦欢鍚�")
+ @Schema(description = "鍙戠エ鏂囦欢鍚�")
private String invoiceFileName;
private List<InvoiceLedgerFile> commonFiles;
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 1afb02c..fb2004a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.ReceiptPayment;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,23 +15,23 @@
@Data
public class ReceiptPaymentDto extends ReceiptPayment {
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��")
private String statusName;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "寮�绁ㄦ棩鏈�",width = 30,dateFormat = "yyyy-MM-dd")
- @ApiModelProperty(value = "寮�绁ㄦ棩鏈�")
+ @Schema(description = "寮�绁ㄦ棩鏈�")
private Date invoiceDate;
@TableField(exist = false)
@@ -39,42 +39,42 @@
@TableField(exist = false)
private String invoiceDateEnd;
- @ApiModelProperty(value = "鏌ヨ鏂囨湰")
+ @Schema(description = "鏌ヨ鏂囨湰")
private String searchText;
- @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
+ @Schema(description = "閿�鍞彴璐ales_ledger")
@Excel(isExport = false)
private Long salesLedgerId;
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
+ @Schema(description = "瀹㈡埛鍚嶇ОID")
@Excel(isExport = false)
private Integer customerId;
- @ApiModelProperty(value = "鍙戠エ鍙�")
+ @Schema(description = "鍙戠エ鍙�")
@Excel(name = "鍙戠エ鍙�")
private String invoiceNo;
- @ApiModelProperty(value = "鍙戠エ閲戦")
+ @Schema(description = "鍙戠エ閲戦")
@Excel(name = "鍙戠エ閲戦")
private BigDecimal invoiceTotal;
- @ApiModelProperty(value = "绋庣巼锛�%锛�")
+ @Schema(description = "绋庣巼锛�%锛�")
@Excel(name = "绋庣巼锛�%锛�")
private BigDecimal taxRate;
- @ApiModelProperty(value = "浜у搧澶х被")
+ @Schema(description = "浜у搧澶х被")
@Excel(name = "浜у搧澶х被")
private String productCategory;
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
@Excel(name = "鍥炴閲戦")
private BigDecimal receiptPaymentAmountTotal;
- @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Schema(description = "寰呭洖娆鹃噾棰�")
@Excel(name = "寰呭洖娆鹃噾棰�")
private BigDecimal noReceiptAmount;
@@ -89,7 +89,7 @@
@Excel(isExport = false)
private String receiptPaymentDateEnd;
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Schema(description = "椤圭洰鍚嶇О")
@Excel(name = "椤圭洰鍚嶇О")
private String projectName;
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentExeclDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentExeclDto.java
index 2cda02b..4212961 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentExeclDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentExeclDto.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -10,44 +10,44 @@
@Data
public class ReceiptPaymentExeclDto {
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿",sort = 1)
private String salesContractNo;
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
@Excel(name = "瀹㈡埛鍚堝悓鍙�",sort = 2)
private String customerContractNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О",sort = 3)
private String customerName;
- @ApiModelProperty(value = "浜у搧澶х被")
+ @Schema(description = "浜у搧澶х被")
@Excel(name = "浜у搧澶х被",sort = 4)
private String productCategory;
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Schema(description = "椤圭洰鍚嶇О")
@Excel(name = "椤圭洰鍚嶇О",sort = 5)
private String projectName;
- @ApiModelProperty(value = "鍙戠エ鍙�")
+ @Schema(description = "鍙戠エ鍙�")
@Excel(name = "鍙戠エ鍙�",sort = 6)
private String invoiceNo;
- @ApiModelProperty(value = "鍙戠エ閲戦")
+ @Schema(description = "鍙戠エ閲戦")
@Excel(name = "鍙戠エ閲戦",sort = 7)
private BigDecimal invoiceTotal;
- @ApiModelProperty(value = "绋庣巼锛�%锛�")
+ @Schema(description = "绋庣巼锛�%锛�")
@Excel(name = "绋庣巼锛�%锛�",sort = 8)
private BigDecimal taxRate;
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
@Excel(name = "鍥炴閲戦",sort = 9)
private BigDecimal receiptPaymentAmountTotal;
- @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Schema(description = "寰呭洖娆鹃噾棰�")
@Excel(name = "寰呭洖娆鹃噾棰�",sort = 10)
private BigDecimal noReceiptAmount;
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java
index 42411e1..c2410e8 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentRecordDto.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,41 +19,41 @@
@Data
public class ReceiptPaymentRecordDto {
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鐧昏鏃ユ湡",width = 30,dateFormat = "yyyy-MM-dd")
- @ApiModelProperty(value = "鐧昏鏃ユ湡")
+ @Schema(description = "鐧昏鏃ユ湡")
private LocalDateTime createTime;
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
@Excel(name = "鍥炴閲戦")
private BigDecimal receiptPaymentAmount;
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Schema(description = "椤圭洰鍚嶇О")
@Excel(name = "椤圭洰鍚嶇О")
private String projectName;
- @ApiModelProperty(value = "鍥炴褰㈠紡 0鐢垫眹1鎵垮厬")
+ @Schema(description = "鍥炴褰㈠紡 0鐢垫眹1鎵垮厬")
@Excel(name = "鍥炴褰㈠紡",readConverterExp = "0=鐢垫眹,1=鎵垮厬")
private String receiptPaymentType;
- @ApiModelProperty(value = "鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
@Excel(name = "鐧昏浜�")
private String registrant;
- @ApiModelProperty(value = "鏉ユ鏃ユ湡")
+ @Schema(description = "鏉ユ鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鏉ユ鏃ユ湡",width = 30,dateFormat = "yyyy-MM-dd")
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 05bd888..204f688 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@@ -48,14 +48,14 @@
private List<CommonFile> SalesLedgerFiles;
private Integer type;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
private LocalDate executionDate;
private Boolean status;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @Schema(description = "浜よ揣鏃ユ湡")
private LocalDate deliveryDate;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
index a4c585b..2430d10 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
@@ -5,7 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -38,12 +38,12 @@
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date executionDate;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
@Excel(name = "浠樻鏂瑰紡")
private String paymentMethod;
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
index 666ccf4..9867633 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -59,10 +59,10 @@
private Integer approvalStatus;
- @ApiModelProperty(value = "鏈��璐ф暟")
+ @Schema(description = "鏈��璐ф暟")
private BigDecimal unQuantity;
- @ApiModelProperty(value = "閫�璐ф�绘暟")
+ @Schema(description = "閫�璐ф�绘暟")
private BigDecimal totalReturnNum;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java b/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
index 2f40bdd..4841ffd 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
@@ -2,14 +2,14 @@
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.SalesQuotationProduct;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Data
public class SalesQuotationDto extends SalesQuotation {
- @ApiModelProperty(value = "鎶ヤ环鍟嗗搧")
+ @Schema(description = "鎶ヤ环鍟嗗搧")
private List<SalesQuotationProduct> products;
/**
diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
index 260d217..675bba1 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
diff --git a/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java b/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java
index e6b8ff5..979b54b 100644
--- a/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/StatisticsTableDto.java
@@ -2,8 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@@ -13,18 +12,18 @@
* @date : 2026/1/15 10:18
*/
@Data
-@ApiModel
+@Schema
public class StatisticsTableDto{
private String customerName;
private String productCategory;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM")
private Date entryDateStart;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM")
private Date entryDateEnd;
diff --git a/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java b/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java
index aee8370..b5d09a7 100644
--- a/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java
+++ b/src/main/java/com/ruoyi/sales/excel/InvoiceLedgerExcelDto.java
@@ -6,7 +6,7 @@
import com.ruoyi.common.vo.FileVo;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.InvoiceLedger;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java b/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java
index 8f042c6..8979504 100644
--- a/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java
+++ b/src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
index b797ab0..9bfd69c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
@@ -1,6 +1,6 @@
package com.ruoyi.sales.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
@@ -41,7 +41,7 @@
/** 鏇存柊鏃堕棿 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
index efb9b0c..ef85b3a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -22,40 +22,40 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "invoice_registration_product琛ㄤ富閿�")
+ @Schema(description = "invoice_registration_product琛ㄤ富閿�")
private Integer invoiceRegistrationProductId;
- @ApiModelProperty(value = "鍙戠エ鍙�")
+ @Schema(description = "鍙戠エ鍙�")
private String invoiceNo;
- @ApiModelProperty(value = "鍙戠エ閲戦")
+ @Schema(description = "鍙戠エ閲戦")
private BigDecimal invoiceTotal;
- @ApiModelProperty(value = "寮�绁ㄤ汉")
+ @Schema(description = "寮�绁ㄤ汉")
private String invoicePerson;
- @ApiModelProperty(value = "寮�绁ㄦ椂闂�")
+ @Schema(description = "寮�绁ㄦ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate invoiceDate;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
index 363e388..0d4a4f5 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -10,38 +10,38 @@
@Data
public class InvoiceLedgerFile {
- @ApiModelProperty(value = "鏂囦欢ID")
+ @Schema(description = "鏂囦欢ID")
private Long id;
- @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty(value = "鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private int fileSize;
- @ApiModelProperty(value = "寮�绁ㄥ彴璐D")
+ @Schema(description = "寮�绁ㄥ彴璐D")
private Integer invoiceLedgerId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
index ddf6b79..e7a926b 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
@@ -1,7 +1,7 @@
package com.ruoyi.sales.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -16,38 +16,38 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "閿�鍞彴璐ales_ledger涓婚敭")
+ @Schema(description = "閿�鍞彴璐ales_ledger涓婚敭")
private Integer salesLedgerId;
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
+ @Schema(description = "瀹㈡埛鍚嶇ОID")
private Integer customerId;
- @ApiModelProperty(value = "涓氬姟鍛�")
+ @Schema(description = "涓氬姟鍛�")
private String salesman;
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Schema(description = "椤圭洰鍚嶇О")
private String projectName;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
index f02e681..75ef549 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
@@ -1,7 +1,7 @@
package com.ruoyi.sales.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -17,71 +17,71 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
+ @Schema(description = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
private Integer salesLedgerId;
- @ApiModelProperty(value = "sales_ledger_product涓婚敭")
+ @Schema(description = "sales_ledger_product涓婚敭")
private Integer salesLedgerProductId;
- @ApiModelProperty(value = "寮�绁ㄧ櫥璁拌〃invoice_registration涓婚敭")
+ @Schema(description = "寮�绁ㄧ櫥璁拌〃invoice_registration涓婚敭")
private Integer invoiceRegistrationId;
- @ApiModelProperty(value = "浜у搧澶х被")
+ @Schema(description = "浜у搧澶х被")
private String productCategory;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ApiModelProperty(value = "鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty(value = "鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty(value = "绋庣巼")
+ @Schema(description = "绋庣巼")
private BigDecimal taxRate;
- @ApiModelProperty(value = "鍚◣鍗曚环")
+ @Schema(description = "鍚◣鍗曚环")
private BigDecimal taxInclusiveUnitPrice;
- @ApiModelProperty(value = "鍚◣鎬讳环")
+ @Schema(description = "鍚◣鎬讳环")
private BigDecimal taxInclusiveTotalPrice;
- @ApiModelProperty(value = "涓嶅惈绋庢�讳环")
+ @Schema(description = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
- @ApiModelProperty(value = "鍙戠エ绫诲瀷")
+ @Schema(description = "鍙戠エ绫诲瀷")
private String invoiceType;
- @ApiModelProperty(value = "寮�绁ㄦ暟")
+ @Schema(description = "寮�绁ㄦ暟")
private BigDecimal invoiceNum;
- @ApiModelProperty(value = "鏈紑绁ㄦ暟")
+ @Schema(description = "鏈紑绁ㄦ暟")
private BigDecimal noInvoiceNum;
- @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+ @Schema(description = "寮�绁ㄩ噾棰�")
private BigDecimal invoiceAmount;
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
+ @Schema(description = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmount;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/Loss.java b/src/main/java/com/ruoyi/sales/pojo/Loss.java
index fb64698..37fa5ff 100644
--- a/src/main/java/com/ruoyi/sales/pojo/Loss.java
+++ b/src/main/java/com/ruoyi/sales/pojo/Loss.java
@@ -1,7 +1,7 @@
package com.ruoyi.sales.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -24,11 +24,11 @@
private BigDecimal rate;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java b/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
index 5d3f148..51589cd 100644
--- a/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
+++ b/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -17,7 +16,7 @@
*/
@TableName(value = "payment_shipping")
@Data
-@ApiModel
+@Schema
public class PaymentShipping {
@@ -28,55 +27,55 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁㈠崟鍙�")
+ @Schema(description = "璁㈠崟鍙�")
private String orderNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customer;
- @ApiModelProperty(value = "璁㈠崟閲戦")
+ @Schema(description = "璁㈠崟閲戦")
private String orderAmount;
- @ApiModelProperty(value = "宸蹭粯娆鹃噾棰�")
+ @Schema(description = "宸蹭粯娆鹃噾棰�")
private String paidAmount;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty(value = "浠樻鐘舵��")
+ @Schema(description = "浠樻鐘舵��")
private String paymentStatus;
- @ApiModelProperty(value = "鍙戣揣鐘舵��")
+ @Schema(description = "鍙戣揣鐘舵��")
private String shippingStatus;
- @ApiModelProperty(value = "鍙戣揣鏃ユ湡")
+ @Schema(description = "鍙戣揣鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shippingDate;
- @ApiModelProperty(value = "鐗╂祦鍗曞彿")
+ @Schema(description = "鐗╂祦鍗曞彿")
private String trackingNo;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java b/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java
index 32fac3c..1bbac84 100644
--- a/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -10,35 +10,35 @@
@Data
public class PurchaseLedgerFile {
- @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty(value = "鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private int fileSize;
- @ApiModelProperty(value = "寮�绁ㄥ彴璐D")
+ @Schema(description = "寮�绁ㄥ彴璐D")
private Integer purchaseLedgerId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
index 12688c8..132bfa2 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -23,47 +23,47 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "鍥炴褰㈠紡 0鐢垫眹1鎵垮厬")
+ @Schema(description = "鍥炴褰㈠紡 0鐢垫眹1鎵垮厬")
private String receiptPaymentType;
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
private BigDecimal receiptPaymentAmount;
- @ApiModelProperty(value = "鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
private String registrant;
- @ApiModelProperty(value = "invoice_ledger寮�绁ㄥ彴璐︿富閿甀D")
+ @Schema(description = "invoice_ledger寮�绁ㄥ彴璐︿富閿甀D")
private Integer invoiceLedgerId;
- @ApiModelProperty(value = "sales_ledger閿�鍞彴璐︿富閿甀D")
+ @Schema(description = "sales_ledger閿�鍞彴璐︿富閿甀D")
private Long salesLedgerId;
- @ApiModelProperty(value = "sales_ledger_product閿�鍞彴璐︿骇鍝佷富閿甀D")
+ @Schema(description = "sales_ledger_product閿�鍞彴璐︿骇鍝佷富閿甀D")
private Long salesLedgerProductId;
- @ApiModelProperty(value = "鏉ユ鏃ユ湡")
+ @Schema(description = "鏉ユ鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate receiptPaymentDate;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 9e5722a..bc4d02c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -78,7 +78,7 @@
private String entryPerson;
@TableField(exist = false)
- @ApiModelProperty(value = "褰曞叆浜�")
+ @Schema(description = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String entryPersonName;
@@ -104,40 +104,40 @@
private BigDecimal contractAmount;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "鏈紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
private LocalDate executionDate;
@TableField(exist = false)
- @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "宸插紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "宸插紑绁ㄩ噾棰�")
private BigDecimal invoiceTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Schema(description = "寰呭洖娆鹃噾棰�")
private BigDecimal noReceiptAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
@TableField(exist = false)
- @ApiModelProperty(value = "鐢熶骇鐘舵��")
+ @Schema(description = "鐢熶骇鐘舵��")
private String productionStatus = "鏈紑濮�";
//浜よ揣鏃ユ湡
- @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @Schema(description = "浜よ揣鏃ユ湡")
@TableField(value = "delivery_date")
private LocalDate deliveryDate;
@TableField(exist = false)
- @ApiModelProperty(value = "浜よ揣澶╂暟宸�")
+ @Schema(description = "浜よ揣澶╂暟宸�")
private Integer deliveryDaysDiff;
@TableField(exist = false)
@@ -147,14 +147,14 @@
@TableField(exist = false)
//鏄惁鍙紪杈�
private Boolean isEdit;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty(value = "鏄惁鏈夌敓浜ц褰�")
+ @Schema(description = "鏄惁鏈夌敓浜ц褰�")
@TableField(exist = false)
private Boolean hasProductionRecord;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 34aa729..5765262 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -129,24 +129,24 @@
*/
private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
- @ApiModelProperty(value = "寮�绁ㄦ暟")
+ @Schema(description = "寮�绁ㄦ暟")
private BigDecimal invoiceNum = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈紑绁ㄦ暟")
+ @Schema(description = "鏈紑绁ㄦ暟")
private BigDecimal noInvoiceNum = BigDecimal.ZERO;
- @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+ @Schema(description = "寮�绁ㄩ噾棰�")
private BigDecimal invoiceAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
+ @Schema(description = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
+ @Schema(description = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
private BigDecimal currentInvoiceNum;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
+ @Schema(description = "鏈寮�绁ㄩ噾棰�")
private BigDecimal currentInvoiceAmount;
/**
@@ -159,30 +159,30 @@
*/
private Long productModelId;
- @ApiModelProperty(value = "鍒濆鏈紑绁ㄦ暟")
+ @Schema(description = "鍒濆鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal originalNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄦ暟")
+ @Schema(description = "涓存椂鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈紑绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempnoInvoiceAmount;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄦ暟")
+ @Schema(description = "涓存椂鏈潵绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempFutureTickets;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempFutureTicketsAmount;
- @ApiModelProperty("鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
private String register;
- @ApiModelProperty("鐧昏鏃ユ湡")
+ @Schema(description = "鐧昏鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime registerDate;
@@ -193,11 +193,11 @@
@TableField(exist = false)
private String shippingCarNumber;
- @ApiModelProperty("蹇�掑叕鍙�")
+ @Schema(description = "蹇�掑叕鍙�")
@TableField(exist = false)
private String expressCompany;
- @ApiModelProperty("蹇�掑崟鍙�")
+ @Schema(description = "蹇�掑崟鍙�")
@TableField(exist = false)
private String expressNumber;
@@ -210,28 +210,28 @@
private Date shippingDate;
@TableField(exist = false)
- @ApiModelProperty(value = "鍙戣揣鐘舵��")
+ @Schema(description = "鍙戣揣鐘舵��")
private String shippingStatus = "寰呭彂璐�";
/**
* 浜у搧鐘舵��
*/
// @TableField(exist = false)
- @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
+ @Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
- @ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
+ @Schema(description = "寰呭洖娆炬�婚噾棰�")
private BigDecimal pendingInvoiceTotal;
- @ApiModelProperty(value = "鍥炴鎬婚噾棰�")
+ @Schema(description = "鍥炴鎬婚噾棰�")
private BigDecimal invoiceTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
+ @Schema(description = "寰呬粯娆炬�婚噾棰�")
private BigDecimal pendingTicketsTotal;
- @ApiModelProperty(value = "浠樻鎬婚噾棰�")
+ @Schema(description = "浠樻鎬婚噾棰�")
private BigDecimal ticketsTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏄惁璐ㄦ")
+ @Schema(description = "鏄惁璐ㄦ")
private Boolean isChecked;
@TableField(exist = false)
@@ -244,7 +244,7 @@
// 鍙敤鏁伴噺 quantity - returnQuality
@TableField(exist = false)
private BigDecimal availableQuality;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index 2761fd7..9a795c4 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,55 +16,55 @@
public class SalesQuotation {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鎶ヤ环鍗曠紪鍙�")
+ @Schema(description = "鎶ヤ环鍗曠紪鍙�")
@Excel(name = "鎶ヤ环鍗曠紪鍙�")
private String quotationNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customer;
- @ApiModelProperty(value = "涓氬姟鍛�")
+ @Schema(description = "涓氬姟鍛�")
@Excel(name = "涓氬姟鍛�")
private String salesperson;
- @ApiModelProperty(value = "鎶ヤ环鏃ユ湡")
+ @Schema(description = "鎶ヤ环鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鎶ヤ环鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate quotationDate;
- @ApiModelProperty(value = "鏈夋晥鏈熻嚦")
+ @Schema(description = "鏈夋晥鏈熻嚦")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate validDate;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty(value = "浜よ揣鍛ㄦ湡澶╂暟")
+ @Schema(description = "浜よ揣鍛ㄦ湡澶╂暟")
private String deliveryPeriod;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
+ @Schema(description = "鎶ヤ环鎬婚噾棰�")
@Excel(name = "鎶ヤ环閲戦")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
index 4d7c9a1..3e64d15 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
@@ -1,7 +1,7 @@
package com.ruoyi.sales.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -9,41 +9,41 @@
@Data
@TableName("sales_quotation_product")
public class SalesQuotationProduct {
- @ApiModelProperty(value = "鎶ヤ环鍟嗗搧ID")
+ @Schema(description = "鎶ヤ环鍟嗗搧ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "閿�鍞姤浠峰崟id")
+ @Schema(description = "閿�鍞姤浠峰崟id")
private Long salesQuotationId;
- @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ @Schema(description = "鍟嗗搧鍚嶇О")
private String product;
- @ApiModelProperty(value = "鍟嗗搧瑙勬牸")
+ @Schema(description = "鍟嗗搧瑙勬牸")
private String specification;
- @ApiModelProperty(value = "鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty(value = "鍗曚环")
+ @Schema(description = "鍗曚环")
private Double unitPrice;
- @ApiModelProperty(value = "鏁伴噺")
+ @Schema(description = "鏁伴噺")
private Integer quantity;
- @ApiModelProperty(value = "閲戦")
+ @Schema(description = "閲戦")
private Double amount;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java b/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
index 996351d..f826397 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,7 +18,7 @@
*/
@TableName(value = "salesperson_management")
@Data
-@ApiModel
+@Schema
public class SalespersonManagement {
private static final long serialVersionUID = 1L;
@@ -29,49 +28,49 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "濮撳悕")
+ @Schema(description = "濮撳悕")
private String name;
- @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
private String phone;
- @ApiModelProperty(value = "閭")
+ @Schema(description = "閭")
private String email;
- @ApiModelProperty(value = "閮ㄩ棬")
+ @Schema(description = "閮ㄩ棬")
private String department;
- @ApiModelProperty(value = "鑱屼綅")
+ @Schema(description = "鑱屼綅")
private String position;
- @ApiModelProperty(value = "鍏ヨ亴鏃ユ湡")
+ @Schema(description = "鍏ヨ亴鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date hireDate;
- @ApiModelProperty(value = "鏉冮檺")
+ @Schema(description = "鏉冮檺")
private String permissions;
- @ApiModelProperty(value = "鏉冮檺List")
+ @Schema(description = "鏉冮檺List")
@TableField(exist = false)
private List<String> permissionsList;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java b/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
index 725fa4c..6399728 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,49 +18,49 @@
public class ShipmentApproval {
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鍙戣揣淇℃伅id")
+ @Schema(description = "鍙戣揣淇℃伅id")
private Long shippingInfoId;
- @ApiModelProperty(value = "閿�鍞彴璐d")
+ @Schema(description = "閿�鍞彴璐d")
private Long salesLedgerId;
- @ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
+ @Schema(description = "閿�鍞姤浠蜂骇鍝佽〃id")
private Long salesLedgerProductId;
- @ApiModelProperty(value = "鐢宠閮ㄩ棬id")
+ @Schema(description = "鐢宠閮ㄩ棬id")
private Long approveDeptId;
- @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Schema(description = "鐢宠閮ㄩ棬鍚嶇О")
@Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
- @ApiModelProperty(value = "瀹℃壒鐢ㄦ埛id")
+ @Schema(description = "瀹℃壒鐢ㄦ埛id")
private Integer approveUserId;
- @ApiModelProperty(value = "瀹℃壒鐢ㄦ埛鍚嶇О")
+ @Schema(description = "瀹℃壒鐢ㄦ埛鍚嶇О")
@Excel(name = "瀹℃壒鐢ㄦ埛")
private String approveUserNames;
/**
* 瀹℃壒鐘舵��
*/
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈嚭搴�,1宸插嚭搴�,2寰呭鏍�,3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
+ @Schema(description = "瀹℃壒鐘舵�侊細0鏈嚭搴�,1宸插嚭搴�,2寰呭鏍�,3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=鏈嚭搴�,1=宸插嚭搴�,2=寰呭鏍�,3=瀹℃牳瀹屾垚,4=瀹℃牳澶辫触")
private Integer approveStatus;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@@ -176,28 +176,28 @@
@TableField(exist = false)
private BigDecimal futureTicketsAmount;
- @ApiModelProperty(value = "寮�绁ㄦ暟")
+ @Schema(description = "寮�绁ㄦ暟")
@TableField(exist = false)
private BigDecimal invoiceNum;
- @ApiModelProperty(value = "鏈紑绁ㄦ暟")
+ @Schema(description = "鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal noInvoiceNum;
- @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+ @Schema(description = "寮�绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal invoiceAmount;
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
+ @Schema(description = "鏈紑绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal noInvoiceAmount;
- @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
+ @Schema(description = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
private BigDecimal currentInvoiceNum;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
+ @Schema(description = "鏈寮�绁ㄩ噾棰�")
private BigDecimal currentInvoiceAmount;
/**
@@ -212,31 +212,31 @@
@TableField(exist = false)
private Long productModelId;
- @ApiModelProperty(value = "鍒濆鏈紑绁ㄦ暟")
+ @Schema(description = "鍒濆鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal originalNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄦ暟")
+ @Schema(description = "涓存椂鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈紑绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempnoInvoiceAmount;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄦ暟")
+ @Schema(description = "涓存椂鏈潵绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempFutureTickets;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempFutureTicketsAmount;
- @ApiModelProperty("鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
@TableField(exist = false)
private String register;
- @ApiModelProperty("鐧昏鏃ユ湡")
+ @Schema(description = "鐧昏鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
@@ -295,7 +295,7 @@
private String entryPerson;
@TableField(exist = false)
- @ApiModelProperty(value = "褰曞叆浜�")
+ @Schema(description = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String entryPersonName;
@@ -321,33 +321,33 @@
private BigDecimal contractAmount;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "鏈紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
@TableField(exist = false)
private LocalDate executionDate;
@TableField(exist = false)
- @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "宸插紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "宸插紑绁ㄩ噾棰�")
private BigDecimal invoiceTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Schema(description = "寰呭洖娆鹃噾棰�")
private BigDecimal noReceiptAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
@TableField(exist = false)
private String paymentMethod;
@TableField(exist = false)
- @ApiModelProperty(value = "鐢熶骇鐘舵��")
+ @Schema(description = "鐢熶骇鐘舵��")
private String productionStatus = "鏈紑濮�";
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index 6ac6ecd..ed9a268 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,72 +19,72 @@
public class ShippingInfo {
@TableField(exist = false)
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@TableField(exist = false)
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "閿�鍞彴璐d")
+ @Schema(description = "閿�鍞彴璐d")
private Long salesLedgerId;
- @ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
+ @Schema(description = "閿�鍞姤浠蜂骇鍝佽〃id")
private Long salesLedgerProductId;
- @ApiModelProperty(value = "鐘舵�� 寰呭鏍� 瀹℃牳涓� 锛屽鏍告嫆缁� 瀹℃牳閫氳繃 宸插彂璐�")
+ @Schema(description = "鐘舵�� 寰呭鏍� 瀹℃牳涓� 锛屽鏍告嫆缁� 瀹℃牳閫氳繃 宸插彂璐�")
@Excel(name = "鐘舵��")
private String status;
- @ApiModelProperty(value = "鍙戣揣鏃ユ湡")
+ @Schema(description = "鍙戣揣鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date shippingDate;
- @ApiModelProperty(value = "鍙戣揣缂栧彿")
+ @Schema(description = "鍙戣揣缂栧彿")
@Excel(name = "鍙戣揣缂栧彿")
private String shippingNo;
- @ApiModelProperty(value = "蹇�掑崟鍙�")
+ @Schema(description = "蹇�掑崟鍙�")
@Excel(name = "蹇�掑崟鍙�")
private String expressNumber;
- @ApiModelProperty(value = "蹇�掑叕鍙�")
+ @Schema(description = "蹇�掑叕鍙�")
@Excel(name = "蹇�掑叕鍙�")
private String expressCompany;
- @ApiModelProperty(value = "鍙戣揣绫诲瀷")
+ @Schema(description = "鍙戣揣绫诲瀷")
@Excel(name = "鍙戣揣绫诲瀷")
private String type;
- @ApiModelProperty(value = "鍙戣揣杞︾墝鍙�")
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
@Excel(name = "鍙戣揣杞︾墝鍙�")
private String shippingCarNumber;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/staff/controller/BankController.java b/src/main/java/com/ruoyi/staff/controller/BankController.java
index ab65ab6..1e9aa1f 100644
--- a/src/main/java/com/ruoyi/staff/controller/BankController.java
+++ b/src/main/java/com/ruoyi/staff/controller/BankController.java
@@ -5,8 +5,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.Bank;
import com.ruoyi.staff.service.BankService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +21,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-03-06 03:40:54
*/
-@Api(tags = "閾惰绠＄悊琛�")
+@Tag(name = "閾惰绠＄悊琛�")
@RestController
@RequestMapping("/bank")
@AllArgsConstructor
@@ -35,7 +35,7 @@
}
@PostMapping("/add")
- @ApiOperation("鏂板閾惰绠＄悊琛�")
+ @Operation(summary = "鏂板閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Bank bank) {
@@ -43,7 +43,7 @@
}
@PostMapping("/update")
- @ApiOperation("鏇存柊閾惰绠＄悊琛�")
+ @Operation(summary = "鏇存柊閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Bank bank) {
@@ -51,7 +51,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎閾惰绠＄悊琛�")
+ @Operation(summary = "鍒犻櫎閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
index f9d82dd..aa40835 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -7,8 +7,8 @@
import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -26,13 +26,13 @@
*/
@RestController
@RequestMapping("/personalAttendanceLocationConfig")
-@Api(tags = "浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+@Tag(name = "浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@RequiredArgsConstructor
public class PersonalAttendanceLocationConfigController {
private PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
- @ApiOperation("鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+ @Operation(summary = "鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@PostMapping("/add")
public R add(@RequestBody PersonalAttendanceLocationConfig personalAttendanceLocationConfig){
@@ -44,14 +44,14 @@
return R.ok(personalAttendanceLocationConfigService.saveOrUpdate(personalAttendanceLocationConfig));
}
- @ApiOperation("鍒嗛〉鏌ヨ浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+ @Operation(summary = "鍒嗛〉鏌ヨ浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@GetMapping("/listPage")
public R listPage(Page page){
return R.ok(personalAttendanceLocationConfigService.page(page));
}
- @ApiOperation("鍒犻櫎浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+ @Operation(summary = "鍒犻櫎浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@DeleteMapping("/del")
public R del(@RequestBody List<Integer> ids) {
return R.ok(personalAttendanceLocationConfigService.removeBatchByIds(ids));
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
index 4e93b5f..37902fa 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
@@ -5,8 +5,8 @@
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
@@ -22,30 +22,30 @@
*/
@RestController
@RequestMapping("/personalAttendanceRecords")
-@Api(tags = "浜哄憳鎵撳崱绛惧埌")
+@Tag(name = "浜哄憳鎵撳崱绛惧埌")
public class PersonalAttendanceRecordsController {
@Resource
private PersonalAttendanceRecordsService personalAttendanceRecordsService;
- @ApiOperation("鏂板鎵撳崱绛惧埌")
+ @Operation(summary = "鏂板鎵撳崱绛惧埌")
@PostMapping("")
public AjaxResult add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
}
- @ApiOperation("鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
@GetMapping("/listPage")
public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
}
- @ApiOperation("鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
+ @Operation(summary = "鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
@GetMapping("/today")
public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
}
- @ApiOperation("瀵煎嚭鎵撳崱绛惧埌")
+ @Operation(summary = "瀵煎嚭鎵撳崱绛惧埌")
@PostMapping("/export")
public void export(HttpServletResponse response, PersonalAttendanceRecordsDto personalAttendanceRecordsDto) {
personalAttendanceRecordsService.export(response, personalAttendanceRecordsDto);
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
index 676c672..2f1496b 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
@@ -12,8 +12,8 @@
import com.ruoyi.staff.service.PersonalShiftService;
import com.ruoyi.staff.utils.StyleMonthUtils;
import com.ruoyi.staff.utils.StyleYearUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -35,38 +35,38 @@
*/
@RestController
@RequestMapping("/personalShift")
-@Api(tags = "浜哄憳鎺掔彮")
+@Tag(name = "浜哄憳鎺掔彮")
@AllArgsConstructor
public class PersonalShiftController {
private PersonalShiftService personalShiftService;
- @ApiOperation("浜哄憳鎺掔彮")
+ @Operation(summary = "浜哄憳鎺掔彮")
@PostMapping("/add")
public R add(@RequestBody PerformanceShiftAddDto performanceShiftAddDto){
return R.ok(personalShiftService.performanceShiftAdd(performanceShiftAddDto));
}
- @ApiOperation(value = "鏈堜唤鍒嗛〉鏌ヨ")
+ @Operation(summary = "鏈堜唤鍒嗛〉鏌ヨ")
@GetMapping("page")
public R performanceShiftPage(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
return R.ok(personalShiftService.performanceShiftPage(new Page<>(current, size), time, userName, sysDeptId));
}
- @ApiOperation(value = "骞翠唤鍒嗛〉鏌ヨ")
+ @Operation(summary = "骞翠唤鍒嗛〉鏌ヨ")
@GetMapping("pageYear")
public R performanceShiftPageYear(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
return R.ok(personalShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, sysDeptId));
}
- @ApiOperation(value = "鐝鐘舵�佷慨鏀�")
+ @Operation(summary = "鐝鐘舵�佷慨鏀�")
@PostMapping("update")
public R performanceShiftUpdate(@RequestBody PersonalShift personalShift) {
personalShiftService.performanceShiftUpdate(personalShift);
return R.ok();
}
- @ApiOperation(value = "瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
@GetMapping("export")
public void exportToExcel(@NotNull(message = "鏃堕棿涓嶈兘涓虹┖锛�") String time, String userName, Integer sysDeptId, Boolean isMonth, HttpServletResponse response) throws Exception {
ServletOutputStream out = response.getOutputStream();
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
index 5c53747..fd97213 100644
--- a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-03-05 11:50:17
*/
-@Api(tags = "绀句繚鏂规閫傜敤浜哄憳琛�")
+@Tag(name = "绀句繚鏂规閫傜敤浜哄憳琛�")
@RestController
@RequestMapping("/schemeApplicableStaff")
@AllArgsConstructor
@@ -33,13 +33,13 @@
@GetMapping("/listPage")
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
}
@PostMapping("/add")
- @ApiOperation(value = "娣诲姞")
+ @Operation(summary = "娣诲姞")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
@@ -47,7 +47,7 @@
}
@PostMapping("/updateSchemeApplicableStaff")
- @ApiOperation(value = "淇敼")
+ @Operation(summary = "淇敼")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.UPDATE)
public AjaxResult updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
@@ -55,7 +55,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation(value = "鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
index 9a9f562..17cdaf6 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.service.StaffContractService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
@@ -14,7 +14,7 @@
*/
@RestController
@RequestMapping("/staff/staffContract")
-@Api(tags = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
+@Tag(name = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
public class StaffContractController {
@Resource
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
index 3fe71c9..64a35d9 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,7 @@
*/
@RestController
@RequestMapping("/staff/staffLeave")
-@Api(tags = "鍛樺伐绂昏亴")
+@Tag(name = "鍛樺伐绂昏亴")
public class StaffLeaveController {
@Resource
private StaffLeaveService staffLeaveService;
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index e85136b..3378f80 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -9,8 +9,8 @@
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.IStaffOnJobService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -26,7 +26,7 @@
*/
@RestController
@RequestMapping("/staff/staffOnJob")
-@Api(tags = "鍛樺伐鍙拌处")
+@Tag(name = "鍛樺伐鍙拌处")
public class StaffOnJobController {
@Resource
@@ -107,7 +107,7 @@
return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
}
- @ApiOperation("涓嬭浇妯℃澘")
+ @Operation(summary = "涓嬭浇妯℃澘")
@PostMapping("/downloadTemplate")
public void downloadTemplate(HttpServletResponse response) {
ExcelUtil<StaffOnJobExcelDto> util = new ExcelUtil<>(StaffOnJobExcelDto.class);
@@ -143,7 +143,7 @@
* @param staffOnJob
*/
@PostMapping("/exportCopy")
- @ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
+ @Operation(summary = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index 96dc322..569ca1c 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -7,8 +7,8 @@
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-03-06 01:22:05
*/
-@Api(tags = "鍛樺伐宸ヨ祫涓昏〃")
+@Tag(name = "鍛樺伐宸ヨ祫涓昏〃")
@RestController
@RequestMapping("/staffSalaryMain")
@AllArgsConstructor
@@ -32,19 +32,19 @@
private StaffSalaryMainService staffSalaryMainService;
@GetMapping("/listPage")
- @ApiOperation("鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.listPage(page, staffSalaryMain);
}
- @ApiOperation("閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
+ @Operation(summary = "閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
@PostMapping("/calculateSalary")
public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
return staffSalaryMainService.calculateSalary(calculateSalaryDto);
}
@PostMapping("/add")
- @ApiOperation("鏂板缓宸ヨ祫琛�")
+ @Operation(summary = "鏂板缓宸ヨ祫琛�")
@Log(title = "鏂板缓宸ヨ祫琛�", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -52,7 +52,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼宸ヨ祫琛�")
+ @Operation(summary = "淇敼宸ヨ祫琛�")
@Log(title = "淇敼宸ヨ祫琛�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -60,7 +60,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎宸ヨ祫琛�")
+ @Operation(summary = "鍒犻櫎宸ヨ祫琛�")
@Log(title = "鍒犻櫎宸ヨ祫琛�", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/staff/dto/PerformanceShiftAddDto.java b/src/main/java/com/ruoyi/staff/dto/PerformanceShiftAddDto.java
index bff3e4d..c5cda4e 100644
--- a/src/main/java/com/ruoyi/staff/dto/PerformanceShiftAddDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/PerformanceShiftAddDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.staff.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -12,21 +12,21 @@
public class PerformanceShiftAddDto {
@NotNull(message = "璇烽�夋嫨鐝")
- @ApiModelProperty("鐝")
+ @Schema(description = "鐝")
private Integer personalAttendanceLocationConfigId;
@NotNull(message = "璇烽�夋嫨鍛樺伐")
- @ApiModelProperty("鍛樺伐id")
+ @Schema(description = "鍛樺伐id")
private String staffOnJobId;
@NotNull(message = "璇烽�夋嫨鍛ㄦ")
- @ApiModelProperty("寮�濮嬪懆娆�")
+ @Schema(description = "寮�濮嬪懆娆�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startWeek;
@NotNull(message = "璇烽�夋嫨鍛ㄦ")
- @ApiModelProperty("缁撴潫鍛ㄦ")
+ @Schema(description = "缁撴潫鍛ㄦ")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endWeek;
diff --git a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
index ccb9da4..dba3ca4 100644
--- a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java
index 8ebc195..285c4f2 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobExcelDto.java
@@ -7,7 +7,7 @@
import com.ruoyi.staff.pojo.StaffEducation;
import com.ruoyi.staff.pojo.StaffEmergencyContact;
import com.ruoyi.staff.pojo.StaffWorkExperience;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -64,22 +64,22 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鍚堝悓寮�濮嬫椂闂�")
+ @Schema(description = "鍚堝悓寮�濮嬫椂闂�")
@Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 15)
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鍚堝悓缁撴潫鏃堕棿")
+ @Schema(description = "鍚堝悓缁撴潫鏃堕棿")
@Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 16)
private Date contractEndTime;
- @ApiModelProperty(value = "鍚堝悓鏈熼檺")
+ @Schema(description = "鍚堝悓鏈熼檺")
@Excel(name = "鍚堝悓鏈熼檺", sort = 17)
private String contractTerm;
- @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ @Schema(description = "鍑虹敓鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 18)
diff --git a/src/main/java/com/ruoyi/staff/pojo/Bank.java b/src/main/java/com/ruoyi/staff/pojo/Bank.java
index d3634ed..70e20a3 100644
--- a/src/main/java/com/ruoyi/staff/pojo/Bank.java
+++ b/src/main/java/com/ruoyi/staff/pojo/Bank.java
@@ -6,8 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -22,7 +21,7 @@
@Getter
@Setter
@TableName("bank")
-@ApiModel(value = "Bank瀵硅薄", description = "閾惰绠＄悊琛�")
+@Schema(name = "Bank瀵硅薄", description = "閾惰绠＄悊琛�")
public class Bank implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,9 +29,9 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閾惰鍚嶇О")
+ @Schema(description = "閾惰鍚嶇О")
private String bankName;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java b/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java
index 101fc01..9a5b54b 100644
--- a/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java
+++ b/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java
@@ -1,6 +1,6 @@
package com.ruoyi.staff.pojo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -56,7 +56,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
index 13938c5..13e0ca5 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
@@ -10,8 +10,7 @@
import java.time.LocalTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("personal_attendance_location_config")
-@ApiModel(value = "PersonalAttendanceLocationConfig瀵硅薄", description = "浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+@Schema(name = "PersonalAttendanceLocationConfig瀵硅薄", description = "浜哄憳鎵撳崱瑙勫垯閰嶇疆")
public class PersonalAttendanceLocationConfig implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,34 +34,34 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("閮ㄩ棬id")
+ @Schema(description = "閮ㄩ棬id")
private Integer sysDeptId;
- @ApiModelProperty("鍦扮偣鍚嶇О")
+ @Schema(description = "鍦扮偣鍚嶇О")
private String locationName;
- @ApiModelProperty("缁忓害")
+ @Schema(description = "缁忓害")
private Double longitude;
- @ApiModelProperty("绾害")
+ @Schema(description = "绾害")
private Double latitude;
- @ApiModelProperty("鎵撳崱鑼冨洿")
+ @Schema(description = "鎵撳崱鑼冨洿")
private Double radius;
- @ApiModelProperty("涓婄彮鏃堕棿")
+ @Schema(description = "涓婄彮鏃堕棿")
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
private LocalTime startAt;
- @ApiModelProperty("涓嬬彮鏃堕棿")
+ @Schema(description = "涓嬬彮鏃堕棿")
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
private LocalTime endAt;
- @ApiModelProperty("鐝")
+ @Schema(description = "鐝")
private String shift;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java
index f44047d..ac8177f 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java
@@ -12,8 +12,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -29,7 +28,7 @@
@Getter
@Setter
@TableName("personal_attendance_records")
-@ApiModel(value = "PersonalAttendanceRecords瀵硅薄", description = "")
+@Schema(name = "PersonalAttendanceRecords瀵硅薄", description = "")
public class PersonalAttendanceRecords implements Serializable {
private static final long serialVersionUID = 1L;
@@ -37,51 +36,51 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍛樺伐鍦ㄨ亴id")
+ @Schema(description = "鍛樺伐鍦ㄨ亴id")
private Long staffOnJobId;
- @ApiModelProperty("鏃ユ湡")
+ @Schema(description = "鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鏃ユ湡", sort = 1, dateFormat = "yyyy-MM-dd")
private LocalDate date;
- @ApiModelProperty("宸ヤ綔寮�濮嬫椂闂�")
+ @Schema(description = "宸ヤ綔寮�濮嬫椂闂�")
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
@Excel(name = "涓婄彮鏃堕棿", sort = 5, dateFormat = "HH:mm")
private LocalDateTime workStartAt;
- @ApiModelProperty("宸ヤ綔缁撴潫鏃堕棿")
+ @Schema(description = "宸ヤ綔缁撴潫鏃堕棿")
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
@Excel(name = "涓嬬彮鏃堕棿", sort = 6, dateFormat = "HH:mm")
private LocalDateTime workEndAt;
- @ApiModelProperty("宸ヤ綔鏃堕暱")
+ @Schema(description = "宸ヤ綔鏃堕暱")
@Excel(name = "宸ユ椂(灏忔椂)", sort = 7)
private BigDecimal workHours;
- @ApiModelProperty("鐘舵�� 0姝ｅ父 1杩熷埌 2鏃╅�� 3杩熷埌鏃╅�� 4缂哄嫟")
+ @Schema(description = "鐘舵�� 0姝ｅ父 1杩熷埌 2鏃╅�� 3杩熷埌鏃╅�� 4缂哄嫟")
@Excel(name = "鐘舵��", sort = 8,readConverterExp = "0=姝ｅ父,1=杩熷埌,2=鏃╅��,3=杩熷埌銆佹棭閫�,4=缂哄嫟")
private Integer status;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞", sort = 9)
private String remark;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java b/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
index b47d63d..67bcf7d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
@@ -9,8 +9,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -26,7 +25,7 @@
@Getter
@Setter
@TableName("personal_shift")
-@ApiModel(value = "PersonalShift瀵硅薄", description = "")
+@Schema(name = "PersonalShift瀵硅薄", description = "")
public class PersonalShift implements Serializable {
private static final long serialVersionUID = 1L;
@@ -34,29 +33,29 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐝(鎵撳崱瑙勫垯id)")
+ @Schema(description = "鐝(鎵撳崱瑙勫垯id)")
private Integer personalAttendanceLocationConfigId;
- @ApiModelProperty("鍛樺伐鍦ㄨ亴id")
+ @Schema(description = "鍛樺伐鍦ㄨ亴id")
private Long staffOnJobId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鎺掔彮鏃ユ湡")
+ @Schema(description = "鎺掔彮鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime workTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
index 62346ff..acc0e62 100644
--- a/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
+++ b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
@@ -10,8 +10,7 @@
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -26,59 +25,59 @@
@Getter
@Setter
@TableName("scheme_applicable_staff")
-@ApiModel(value = "SchemeApplicableStaff瀵硅薄", description = "绀句繚鏂规閫傜敤浜哄憳琛�")
+@Schema(name = "SchemeApplicableStaff瀵硅薄", description = "绀句繚鏂规閫傜敤浜哄憳琛�")
public class SchemeApplicableStaff implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("绀句繚鏂规淇濋櫓绂忓埄鏄庣粏")
+ @Schema(description = "绀句繚鏂规淇濋櫓绂忓埄鏄庣粏")
@TableField(exist = false)
private List<SchemeInsuranceDetail> schemeInsuranceDetailList;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鏍囬")
+ @Schema(description = "鏍囬")
private String title;
- @ApiModelProperty("閮ㄩ棬ids,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "閮ㄩ棬ids,澶氫釜浣跨敤,闅斿紑")
private String deptIds;
- @ApiModelProperty("閮ㄩ棬鍚嶇О,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "閮ㄩ棬鍚嶇О,澶氫釜浣跨敤,闅斿紑")
@TableField(exist = false)
private String deptNames;
- @ApiModelProperty("浜哄憳鍚嶇О,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "浜哄憳鍚嶇О,澶氫釜浣跨敤,闅斿紑")
private String staffNames;
- @ApiModelProperty("浜哄憳id,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "浜哄憳id,澶氫釜浣跨敤,闅斿紑")
private String staffIds;
- @ApiModelProperty("淇濋櫓绫诲瀷鍚嶇О澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "淇濋櫓绫诲瀷鍚嶇О澶氫釜浣跨敤,闅斿紑")
private String insuranceTypes;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
@TableField(exist = false)
- @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ @Schema(description = "鍒涘缓浜哄悕绉�")
private String createUserName;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8", shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java b/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
index 4ae8362..b9ce10d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
@@ -8,8 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,46 +23,46 @@
@Getter
@Setter
@TableName("scheme_insurance_detail")
-@ApiModel(value = "SchemeInsuranceDetail瀵硅薄", description = "绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛�")
+@Schema(name = "SchemeInsuranceDetail瀵硅薄", description = "绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛�")
public class SchemeInsuranceDetail implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("鏄庣粏ID锛堜富閿級")
+ @Schema(description = "鏄庣粏ID锛堜富閿級")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈鐨勭ぞ淇濇柟妗圛D")
+ @Schema(description = "鍏宠仈鐨勭ぞ淇濇柟妗圛D")
private Long schemeId;
- @ApiModelProperty("淇濋櫓绫诲瀷锛堝鍖荤枟淇濋櫓銆佸吇鑰佷繚闄╃瓑锛�")
+ @Schema(description = "淇濋櫓绫诲瀷锛堝鍖荤枟淇濋櫓銆佸吇鑰佷繚闄╃瓑锛�")
private String insuranceType;
- @ApiModelProperty("缂磋垂鍩烘暟")
+ @Schema(description = "缂磋垂鍩烘暟")
private BigDecimal paymentBase;
- @ApiModelProperty("鏄惁璋冪敤鍩烘湰宸ヨ祫锛�1-鍚︼紝2-鏄�")
+ @Schema(description = "鏄惁璋冪敤鍩烘湰宸ヨ祫锛�1-鍚︼紝2-鏄�")
private Integer useBasicSalary;
- @ApiModelProperty("涓汉缂磋垂姣斾緥锛�%锛�")
+ @Schema(description = "涓汉缂磋垂姣斾緥锛�%锛�")
private BigDecimal personalRatio;
- @ApiModelProperty("涓汉鍥哄畾缂磋垂閲戦")
+ @Schema(description = "涓汉鍥哄畾缂磋垂閲戦")
private BigDecimal personalFixed;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffContract.java b/src/main/java/com/ruoyi/staff/pojo/StaffContract.java
index 2febd27..d5ea86b 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffContract.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffContract.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,37 +16,37 @@
@Data
public class StaffContract {
- @ApiModelProperty(value = "搴忓彿")
+ @Schema(description = "搴忓彿")
private Long id;
- @ApiModelProperty(value = "鍦ㄨ亴鍛樺伐ID")
+ @Schema(description = "鍦ㄨ亴鍛樺伐ID")
private Long staffOnJobId;
- @ApiModelProperty(value = "鍚堝悓鏈熼檺")
+ @Schema(description = "鍚堝悓鏈熼檺")
private String contractTerm;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鍚堝悓寮�濮嬫椂闂�")
+ @Schema(description = "鍚堝悓寮�濮嬫椂闂�")
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鍚堝悓缁撴潫鏃堕棿")
+ @Schema(description = "鍚堝悓缁撴潫鏃堕棿")
private Date contractEndTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
index 41001c3..5bfd039 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,53 +26,53 @@
@Getter
@Setter
@TableName("staff_education")
-@ApiModel(value = "StaffEducation瀵硅薄", description = "鍛樺伐鏁欒偛缁忓巻琛�")
+@Schema(name = "StaffEducation瀵硅薄", description = "鍛樺伐鏁欒偛缁忓巻琛�")
public class StaffEducation implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ @Schema(description = "鍏宠仈staff_on_job琛ㄤ富閿甀D")
private Long staffOnJobId;
- @ApiModelProperty("瀛﹀巻")
+ @Schema(description = "瀛﹀巻")
private String education;
- @ApiModelProperty("姣曚笟闄㈡牎")
+ @Schema(description = "姣曚笟闄㈡牎")
private String schoolName;
- @ApiModelProperty("鍏ュ鏃堕棿")
+ @Schema(description = "鍏ュ鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate enrollTime;
- @ApiModelProperty("姣曚笟鏃堕棿")
+ @Schema(description = "姣曚笟鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate graduateTime;
- @ApiModelProperty("涓撲笟")
+ @Schema(description = "涓撲笟")
private String major;
- @ApiModelProperty("瀛︿綅")
+ @Schema(description = "瀛︿綅")
private String degree;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java b/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
index 4c31f5e..183c9be 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,43 +22,43 @@
@Getter
@Setter
@TableName("staff_emergency_contact")
-@ApiModel(value = "StaffEmergencyContact瀵硅薄", description = "鍛樺伐绱ф�ヨ仈绯讳汉琛�")
+@Schema(name = "StaffEmergencyContact瀵硅薄", description = "鍛樺伐绱ф�ヨ仈绯讳汉琛�")
public class StaffEmergencyContact implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ @Schema(description = "鍏宠仈staff_on_job琛ㄤ富閿甀D")
private Long staffOnJobId;
- @ApiModelProperty("绱ф�ヨ仈绯讳汉濮撳悕")
+ @Schema(description = "绱ф�ヨ仈绯讳汉濮撳悕")
private String contactName;
- @ApiModelProperty("绱ф�ヨ仈绯讳汉鍏崇郴")
+ @Schema(description = "绱ф�ヨ仈绯讳汉鍏崇郴")
private String contactRelation;
- @ApiModelProperty("绱ф�ヨ仈绯讳汉鎵嬫満")
+ @Schema(description = "绱ф�ヨ仈绯讳汉鎵嬫満")
private String contactPhone;
- @ApiModelProperty("绱ф�ヨ仈绯讳汉浣忓潃")
+ @Schema(description = "绱ф�ヨ仈绯讳汉浣忓潃")
private String contactAddress;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
index ccb01be..6de265c 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,35 +16,35 @@
@Data
public class StaffLeave {
- @ApiModelProperty(value = "搴忓彿")
+ @Schema(description = "搴忓彿")
private Long id;
- @ApiModelProperty(value = "鍦ㄨ亴鍛樺伐ID")
+ @Schema(description = "鍦ㄨ亴鍛樺伐ID")
private Long staffOnJobId;
- @ApiModelProperty(value = "绂昏亴鍘熷洜")
+ @Schema(description = "绂昏亴鍘熷洜")
private String reason;
- @ApiModelProperty(value = "绂昏亴澶囨敞")
+ @Schema(description = "绂昏亴澶囨敞")
private String remark;
- @ApiModelProperty(value = "绂昏亴鏃ユ湡")
+ @Schema(description = "绂昏亴鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDate leaveDate;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 8cddc3e..bff864a 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -185,64 +185,64 @@
private String remark;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒悕")
+ @Schema(description = "鍒悕")
private String alias;
- @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ @Schema(description = "鍑虹敓鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthDate;
- @ApiModelProperty(value = "姘戞棌")
+ @Schema(description = "姘戞棌")
private String nation;
- @ApiModelProperty(value = "濠氬Щ鐘跺喌")
+ @Schema(description = "濠氬Щ鐘跺喌")
private String maritalStatus;
- @ApiModelProperty(value = "璇曠敤鏈燂紙鏈堬級")
+ @Schema(description = "璇曠敤鏈燂紙鏈堬級")
private Integer proTerm;
- @ApiModelProperty(value = "杞鏃ユ湡")
+ @Schema(description = "杞鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date positiveDate;
- @ApiModelProperty(value = "鍩烘湰宸ヨ祫")
+ @Schema(description = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
- @ApiModelProperty(value = "鍛樺伐鏁欒偛缁忓巻闆嗗悎")
+ @Schema(description = "鍛樺伐鏁欒偛缁忓巻闆嗗悎")
@TableField(exist = false)
private List<StaffEducation> staffEducationList;
- @ApiModelProperty(value = "鍛樺伐宸ヤ綔缁忓巻闆嗗悎")
+ @Schema(description = "鍛樺伐宸ヤ綔缁忓巻闆嗗悎")
@TableField(exist = false)
private List<StaffWorkExperience> staffWorkExperienceList;
- @ApiModelProperty(value = "鍛樺伐绱ф�ヨ仈绯讳汉闆嗗悎")
+ @Schema(description = "鍛樺伐绱ф�ヨ仈绯讳汉闆嗗悎")
@TableField(exist = false)
private List<StaffEmergencyContact> staffEmergencyContactList;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
index 53b5da5..6cbe396 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
@@ -8,8 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,79 +23,79 @@
@Getter
@Setter
@TableName("staff_salary_detail")
-@ApiModel(value = "StaffSalaryDetail瀵硅薄", description = "鍛樺伐宸ヨ祫鏄庣粏琛�")
+@Schema(name = "StaffSalaryDetail瀵硅薄", description = "鍛樺伐宸ヨ祫鏄庣粏琛�")
public class StaffSalaryDetail implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈宸ヨ祫涓昏〃ID")
+ @Schema(description = "鍏宠仈宸ヨ祫涓昏〃ID")
private Long mainId;
- @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ @Schema(description = "鍏宠仈staff_on_job琛ㄤ富閿甀D")
private Long staffOnJobId;
- @ApiModelProperty("鍛樺伐濮撳悕")
+ @Schema(description = "鍛樺伐濮撳悕")
private String staffName;
- @ApiModelProperty("鑱屼綅鍚嶇О")
+ @Schema(description = "鑱屼綅鍚嶇О")
private String postName;
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Schema(description = "閮ㄩ棬鍚嶇О")
private String deptName;
- @ApiModelProperty("鍩烘湰宸ヨ祫")
+ @Schema(description = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
- @ApiModelProperty("璁′欢宸ヨ祫")
+ @Schema(description = "璁′欢宸ヨ祫")
private BigDecimal pieceSalary;
- @ApiModelProperty("璁℃椂宸ヨ祫")
+ @Schema(description = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
- @ApiModelProperty("鍏朵粬鏀跺叆")
+ @Schema(description = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
- @ApiModelProperty("绀句繚涓汉")
+ @Schema(description = "绀句繚涓汉")
private BigDecimal socialPersonal;
- @ApiModelProperty("鍏Н閲戜釜浜�")
+ @Schema(description = "鍏Н閲戜釜浜�")
private BigDecimal fundPersonal;
- @ApiModelProperty("鍏朵粬鏀嚭")
+ @Schema(description = "鍏朵粬鏀嚭")
private BigDecimal otherDeduct;
- @ApiModelProperty("宸ヨ祫涓◣")
+ @Schema(description = "宸ヨ祫涓◣")
private BigDecimal salaryTax;
- @ApiModelProperty("搴斿彂宸ヨ祫")
+ @Schema(description = "搴斿彂宸ヨ祫")
private BigDecimal grossSalary;
- @ApiModelProperty("搴旀墸宸ヨ祫")
+ @Schema(description = "搴旀墸宸ヨ祫")
private BigDecimal deductSalary;
- @ApiModelProperty("瀹炲彂宸ヨ祫")
+ @Schema(description = "瀹炲彂宸ヨ祫")
private BigDecimal netSalary;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
index e411eaa..c85c61c 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
@@ -11,8 +11,7 @@
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("staff_salary_main")
-@ApiModel(value = "StaffSalaryMain瀵硅薄", description = "鍛樺伐宸ヨ祫涓昏〃")
+@Schema(name = "StaffSalaryMain瀵硅薄", description = "鍛樺伐宸ヨ祫涓昏〃")
public class StaffSalaryMain implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,59 +34,59 @@
@TableField(exist = false)
private List<StaffSalaryDetail> staffSalaryDetailList;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("瀹℃牳浜篒d")
+ @Schema(description = "瀹℃牳浜篒d")
private Long auditUserId;
- @ApiModelProperty("瀹℃牳浜哄悕绉�")
+ @Schema(description = "瀹℃牳浜哄悕绉�")
private String auditUserName;
- @ApiModelProperty("宸ヨ祫涓婚")
+ @Schema(description = "宸ヨ祫涓婚")
private String salaryTitle;
- @ApiModelProperty("鍏宠仈閮ㄩ棬ID锛屽涓敤閫楀彿鍒嗛殧")
+ @Schema(description = "鍏宠仈閮ㄩ棬ID锛屽涓敤閫楀彿鍒嗛殧")
private String deptIds;
- @ApiModelProperty("宸ヨ祫鏈堜唤锛屾牸寮忥細yyyy-MM")
+ @Schema(description = "宸ヨ祫鏈堜唤锛屾牸寮忥細yyyy-MM")
private String salaryMonth;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鐘舵�侊細1-鑽夌 2-瀹℃牳鏈�氳繃 3-寰呭鏍� 4-寰呭彂鏀� 5-宸插彂鏀�")
+ @Schema(description = "鐘舵�侊細1-鑽夌 2-瀹℃牳鏈�氳繃 3-寰呭鏍� 4-寰呭彂鏀� 5-宸插彂鏀�")
private Integer status;
- @ApiModelProperty("宸ヨ祫鎬婚")
+ @Schema(description = "宸ヨ祫鎬婚")
private BigDecimal totalSalary;
- @ApiModelProperty("鏀粯閾惰")
+ @Schema(description = "鏀粯閾惰")
private String payBank;
@TableField(exist = false)
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private String createUserName;
- @ApiModelProperty("鍙戞斁鏃堕棿")
+ @Schema(description = "鍙戞斁鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDateTime payTime;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java b/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
index 679098c..684e7e1 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,53 +26,53 @@
@Getter
@Setter
@TableName("staff_work_experience")
-@ApiModel(value = "StaffWorkExperience瀵硅薄", description = "鍛樺伐宸ヤ綔缁忓巻琛�")
+@Schema(name = "StaffWorkExperience瀵硅薄", description = "鍛樺伐宸ヤ綔缁忓巻琛�")
public class StaffWorkExperience implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ @Schema(description = "鍏宠仈staff_on_job琛ㄤ富閿甀D")
private Long staffOnJobId;
- @ApiModelProperty("鍓嶅叕鍙�")
+ @Schema(description = "鍓嶅叕鍙�")
private String formerCompany;
- @ApiModelProperty("鍓嶅叕鍙搁儴闂�")
+ @Schema(description = "鍓嶅叕鍙搁儴闂�")
private String formerDept;
- @ApiModelProperty("鍓嶅叕鍙歌亴浣�")
+ @Schema(description = "鍓嶅叕鍙歌亴浣�")
private String formerPosition;
- @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate startDate;
- @ApiModelProperty("缁撴潫鏃ユ湡")
+ @Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
- @ApiModelProperty("宸ヤ綔鎻忚堪")
+ @Schema(description = "宸ヤ綔鎻忚堪")
private String workDesc;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
diff --git a/src/main/java/com/ruoyi/staff/vo/MonthlyTurnoverRateVo.java b/src/main/java/com/ruoyi/staff/vo/MonthlyTurnoverRateVo.java
index 90f9c69..82da034 100644
--- a/src/main/java/com/ruoyi/staff/vo/MonthlyTurnoverRateVo.java
+++ b/src/main/java/com/ruoyi/staff/vo/MonthlyTurnoverRateVo.java
@@ -1,6 +1,6 @@
package com.ruoyi.staff.vo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@@ -10,30 +10,30 @@
*/
@Data
public class MonthlyTurnoverRateVo {
- @ApiModelProperty("鏈堜唤")
+ @Schema(description = "鏈堜唤")
private String month;
- @ApiModelProperty("鏈堝垵鍛樺伐鏁�")
+ @Schema(description = "鏈堝垵鍛樺伐鏁�")
private Integer beginMonthStaffCount;
- @ApiModelProperty("鏈堟湯鍛樺伐鏁�")
+ @Schema(description = "鏈堟湯鍛樺伐鏁�")
private Integer endMonthStaffCount;
- @ApiModelProperty("鏈堝害鍏ヨ亴鍛樺伐鏁�")
+ @Schema(description = "鏈堝害鍏ヨ亴鍛樺伐鏁�")
private Integer newHireCount;
- @ApiModelProperty("鏈堝害绂昏亴鍛樺伐鏁�")
+ @Schema(description = "鏈堝害绂昏亴鍛樺伐鏁�")
private Integer leaveCount;
- @ApiModelProperty("娴佸け鐜�(%)")
+ @Schema(description = "娴佸け鐜�(%)")
private Double turnoverRate;
- @ApiModelProperty("娴佸姩鐜�(%)")
+ @Schema(description = "娴佸姩鐜�(%)")
private Double flowRate;
- @ApiModelProperty("鏈堜唤寮�濮嬫棩鏈�")
+ @Schema(description = "鏈堜唤寮�濮嬫棩鏈�")
private LocalDate monthStartDate;
- @ApiModelProperty("鏈堜唤缁撴潫鏃ユ湡")
+ @Schema(description = "鏈堜唤缁撴潫鏃ユ湡")
private LocalDate monthEndDate;
}
diff --git a/src/main/java/com/ruoyi/staff/vo/TotalTurnoverRateVo.java b/src/main/java/com/ruoyi/staff/vo/TotalTurnoverRateVo.java
index 49d2f42..7a1e88b 100644
--- a/src/main/java/com/ruoyi/staff/vo/TotalTurnoverRateVo.java
+++ b/src/main/java/com/ruoyi/staff/vo/TotalTurnoverRateVo.java
@@ -1,6 +1,6 @@
package com.ruoyi.staff.vo;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -8,12 +8,12 @@
*/
@Data
public class TotalTurnoverRateVo {
- @ApiModelProperty("鎬绘祦鍔ㄧ巼(%)")
+ @Schema(description = "鎬绘祦鍔ㄧ巼(%)")
private Double totalFlowRate;
- @ApiModelProperty("鎬绘祦澶辩巼(%)")
+ @Schema(description = "鎬绘祦澶辩巼(%)")
private Double totalTurnoverRate;
- @ApiModelProperty("褰撳墠鍦ㄨ亴鍛樺伐鏁�")
+ @Schema(description = "褰撳墠鍦ㄨ亴鍛樺伐鏁�")
private Integer currentOnJobCount;
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index 55cc831..e31304b 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.service.StockInRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.util.CollectionUtils;
@@ -17,7 +17,7 @@
import java.util.List;
@RestController
-@Api(tags = "鍏ュ簱")
+@Tag(name = "鍏ュ簱")
@RequestMapping("/stockInRecord")
@RequiredArgsConstructor
public class StockInRecordController {
@@ -26,7 +26,7 @@
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱绠＄悊鍒楄〃")
+ @Operation(summary = "鍏ュ簱绠＄悊鍒楄〃")
public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {
IPage<StockInRecordDto> result = stockInRecordService.listPage(page, stockInRecordDto);
return AjaxResult.success(result);
@@ -44,7 +44,7 @@
}
@PostMapping("/exportStockInRecord")
- @ApiOperation("瀵煎嚭鍏ュ簱璁板綍")
+ @Operation(summary = "瀵煎嚭鍏ュ簱璁板綍")
public void exportStockInRecord(HttpServletResponse response, StockInRecordDto stockInRecordDto) {
stockInRecordService.exportStockInRecord(response,stockInRecordDto);
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 3c67ab1..02a25fd 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -11,8 +11,8 @@
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.execl.StockInventoryExportData;
import com.ruoyi.stock.service.StockInventoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -31,28 +31,28 @@
*/
@RestController
@RequestMapping("/stockInventory")
-@Api(tags = "搴撳瓨琛�")
+@Tag(name = "搴撳瓨琛�")
@AllArgsConstructor
public class StockInventoryController {
private StockInventoryService stockInventoryService;
@GetMapping("/pagestockInventory")
- @ApiOperation("鍒嗛〉鏌ヨ搴撳瓨")
+ @Operation(summary = "鍒嗛〉鏌ヨ搴撳瓨")
public R pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pagestockInventory(page, stockInventoryDto);
return R.ok(stockInventoryDtoIPage);
}
@GetMapping("/pageListCombinedStockInventory")
- @ApiOperation("鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
+ @Operation(summary = "鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
return R.ok(stockInventoryDtoIPage);
}
@PostMapping("/addstockInventory")
- @ApiOperation("鏂板搴撳瓨")
+ @Operation(summary = "鏂板搴撳瓨")
public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
stockInventoryDto.setRecordId(0L);
@@ -61,7 +61,7 @@
@PostMapping("/subtractStockInventory")
- @ApiOperation("鎵ｅ噺搴撳瓨")
+ @Operation(summary = "鎵ｅ噺搴撳瓨")
public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
stockInventoryDto.setRecordId(0L);
@@ -70,7 +70,7 @@
@PostMapping("importStockInventory")
- @ApiOperation("瀵煎叆搴撳瓨")
+ @Operation(summary = "瀵煎叆搴撳瓨")
public R importStockInventory(MultipartFile file) {
return stockInventoryService.importStockInventory(file);
}
@@ -84,31 +84,31 @@
}
@PostMapping("/exportStockInventory")
- @ApiOperation("瀵煎嚭搴撳瓨")
+ @Operation(summary = "瀵煎嚭搴撳瓨")
public void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
stockInventoryService.exportStockInventory(response, stockInventoryDto);
}
@GetMapping("stockInventoryPage")
- @ApiOperation("搴撳瓨鎶ヨ〃鏌ヨ")
+ @Operation(summary = "搴撳瓨鎶ヨ〃鏌ヨ")
public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
}
@GetMapping("stockInAndOutRecord")
- @ApiOperation("缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
+ @Operation(summary = "缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
}
@PostMapping("/frozenStock")
- @ApiOperation("鍐荤粨搴撳瓨")
+ @Operation(summary = "鍐荤粨搴撳瓨")
public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.frozenStock(stockInventoryDto));
}
@PostMapping("/thawStock")
- @ApiOperation("瑙ｅ喕搴撳瓨")
+ @Operation(summary = "瑙ｅ喕搴撳瓨")
public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.thawStock(stockInventoryDto));
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index 71f1a81..c4d74c2 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.service.StockOutRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -25,7 +25,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-21 05:27:04
*/
-@Api(tags = "鍑哄簱")
+@Tag(name = "鍑哄簱")
@RestController
@RequestMapping("/stockOutRecord")
@AllArgsConstructor
@@ -34,7 +34,7 @@
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍑哄簱绠＄悊鍒楄〃")
+ @Operation(summary = "鍑哄簱绠＄悊鍒楄〃")
public AjaxResult listPage(Page page, StockOutRecordDto stockOutRecordDto) {
IPage<StockOutRecordDto> result = stockOutRecordService.listPage(page, stockOutRecordDto);
return AjaxResult.success(result);
@@ -62,7 +62,7 @@
}
@PostMapping("/exportStockOutRecord")
- @ApiOperation("瀵煎嚭鍑哄簱璁板綍")
+ @Operation(summary = "瀵煎嚭鍑哄簱璁板綍")
public void exportStockOutRecord(HttpServletResponse response, StockOutRecordDto stockOutRecordDto) {
stockOutRecordService.exportStockOutRecord(response,stockOutRecordDto);
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
index 2bb09cd..ebdbd07 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
@@ -8,7 +8,7 @@
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockUninventoryDto;
import com.ruoyi.stock.service.StockUninventoryService;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -28,14 +28,14 @@
private StockUninventoryService stockUninventoryService;
@GetMapping("/pagestockUninventory")
- @ApiOperation("鍒嗛〉鏌ヨ搴撳瓨")
+ @Operation(summary = "鍒嗛〉鏌ヨ搴撳瓨")
public R pagestockUninventory(Page page, StockUninventoryDto stockUninventoryDto) {
IPage<StockUninventoryDto> stockUninventoryDtoIPage = stockUninventoryService.pageStockUninventory(page, stockUninventoryDto);
return R.ok(stockUninventoryDtoIPage);
}
@PostMapping("/addstockUninventory")
- @ApiOperation("鏂板搴撳瓨")
+ @Operation(summary = "鏂板搴撳瓨")
public R addstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
stockUninventoryDto.setRecordType(String.valueOf(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
stockUninventoryDto.setRecordId(0L);
@@ -44,7 +44,7 @@
@PostMapping("/subtractstockUninventory")
- @ApiOperation("鎵ｅ噺搴撳瓨")
+ @Operation(summary = "鎵ｅ噺搴撳瓨")
public R subtractstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
stockUninventoryDto.setRecordType(String.valueOf(StockOutUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
stockUninventoryDto.setRecordId(0L);
@@ -52,20 +52,20 @@
}
@PostMapping("/exportStockUninventory")
- @ApiOperation("瀵煎嚭搴撳瓨")
+ @Operation(summary = "瀵煎嚭搴撳瓨")
public void exportStockUninventory(HttpServletResponse response, StockUninventoryDto stockUninventoryDto) {
stockUninventoryService.exportStockUninventory(response,stockUninventoryDto);
}
@PostMapping("/frozenStock")
- @ApiOperation("鍐荤粨搴撳瓨")
+ @Operation(summary = "鍐荤粨搴撳瓨")
public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockUninventoryService.frozenStock(stockInventoryDto));
}
@PostMapping("/thawStock")
- @ApiOperation("瑙ｅ喕搴撳瓨")
+ @Operation(summary = "瑙ｅ喕搴撳瓨")
public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockUninventoryService.thawStock(stockInventoryDto));
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 31a4188..9cc1fe6 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -41,33 +41,33 @@
private BigDecimal unLockedQuantity;
- @ApiModelProperty("椤堕儴鐖朵骇鍝乮d")
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
private Long topParentProductId;
- @ApiModelProperty("搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
+ @Schema(description = "搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
private String stockType;
- @ApiModelProperty("鍚堟牸搴撳瓨鏁伴噺")
+ @Schema(description = "鍚堟牸搴撳瓨鏁伴噺")
private BigDecimal qualifiedQuantity;
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樻暟閲�")
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻暟閲�")
private BigDecimal unQualifiedQuantity;
- @ApiModelProperty("鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
+ @Schema(description = "鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
private BigDecimal qualifiedLockedQuantity;
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
private BigDecimal unQualifiedLockedQuantity;
- @ApiModelProperty("鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
+ @Schema(description = "鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
private BigDecimal qualifiedUnLockedQuantity;
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
private BigDecimal unQualifiedUnLockedQuantity;
- @ApiModelProperty("鍚堟牸搴撳瓨ID")
+ @Schema(description = "鍚堟牸搴撳瓨ID")
private Long qualifiedId;
- @ApiModelProperty("涓嶅悎鏍煎簱瀛業D")
+ @Schema(description = "涓嶅悎鏍煎簱瀛業D")
private Long unQualifiedId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 1d9e2d9..8c4f036 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -12,7 +11,7 @@
@Data
@TableName("stock_in_record")
-@ApiModel("鍏ュ簱绠＄悊")
+@Schema(name = "鍏ュ簱绠＄悊")
public class StockInRecord {
private static final long serialVersionUID = 1L;
@@ -22,44 +21,44 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鍏ュ簱鎵规")
+ @Schema(description = "鍏ュ簱鎵规")
private String inboundBatches;
- @ApiModelProperty(value = "鍏ュ簱鏁伴噺")
+ @Schema(description = "鍏ュ簱鏁伴噺")
private BigDecimal stockInNum;
- @ApiModelProperty(value = "璁板綍绫诲瀷 鏋氫妇")
+ @Schema(description = "璁板綍绫诲瀷 鏋氫妇")
private String recordType;
- @ApiModelProperty(value = "璁板綍ID ")
+ @Schema(description = "璁板綍ID ")
private Long recordId;
- @ApiModelProperty(value = "浜у搧瑙勬牸ID")
+ @Schema(description = "浜у搧瑙勬牸ID")
private Long productModelId;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
+ @Schema(description = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
private String type;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
index 1bcc7bd..b1a6a7d 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -26,19 +25,19 @@
@Getter
@Setter
@TableName("stock_inventory")
-@ApiModel(value = "StockInventory瀵硅薄", description = "搴撳瓨琛�")
+@Schema(name = "StockInventory瀵硅薄", description = "搴撳瓨琛�")
public class StockInventory implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭id")
+ @Schema(description = "涓婚敭id")
private Long id;
- @ApiModelProperty("瑙勬牸id")
+ @Schema(description = "瑙勬牸id")
@NotBlank(message = "涓嶈兘涓虹┖")
private Long productModelId;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal qualitity;
@TableField(fill = FieldFill.INSERT)
@@ -46,24 +45,24 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鐗堟湰鍙�")
+ @Schema(description = "鐗堟湰鍙�")
private Integer version;
- @ApiModelProperty("琚鍗曢攣瀹氭暟閲�")
+ @Schema(description = "琚鍗曢攣瀹氭暟閲�")
private BigDecimal lockedQuantity;
- @ApiModelProperty("棰勮鏁伴噺")
+ @Schema(description = "棰勮鏁伴噺")
private BigDecimal warnNum;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
index bc14ae0..a47cb19 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("stock_out_record")
-@ApiModel(value = "StockOutRecord瀵硅薄", description = "鍑哄簱璁板綍琛�")
+@Schema(name = "StockOutRecord瀵硅薄", description = "鍑哄簱璁板綍琛�")
public class StockOutRecord implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,45 +30,45 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏ュ簱鎵规")
+ @Schema(description = "鍏ュ簱鎵规")
private String outboundBatches;
- @ApiModelProperty("鍏ュ簱鏁伴噺")
+ @Schema(description = "鍏ュ簱鏁伴噺")
private BigDecimal stockOutNum;
- @ApiModelProperty("鍏ュ簱鏉ユ簮id")
+ @Schema(description = "鍏ュ簱鏉ユ簮id")
private Long recordId;
- @ApiModelProperty("鍏ュ簱绫诲瀷")
+ @Schema(description = "鍏ュ簱绫诲瀷")
private String recordType;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
+ @Schema(description = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
private String type;
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java b/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
index 4e5c05c..4e1e0f5 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,18 +24,18 @@
@Getter
@Setter
@TableName("stock_uninventory")
-@ApiModel(value = "StockUninventory瀵硅薄", description = "涓嶅悎鏍煎簱瀛樿〃")
+@Schema(name = "StockUninventory瀵硅薄", description = "涓嶅悎鏍煎簱瀛樿〃")
public class StockUninventory implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭id")
+ @Schema(description = "涓婚敭id")
private Long id;
- @ApiModelProperty("瑙勬牸id")
+ @Schema(description = "瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal qualitity;
@TableField(fill = FieldFill.INSERT)
@@ -44,22 +43,22 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
- @ApiModelProperty("鐗堟湰鍙�")
+ @Schema(description = "鐗堟湰鍙�")
private Integer version;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("琚鍗曢攣瀹氭暟閲�")
+ @Schema(description = "琚鍗曢攣瀹氭暟閲�")
private BigDecimal lockedQuantity;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomDto.java
index 1488a3d..1a98275 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyBom;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,9 +9,9 @@
@Data
public class TechnologyBomDto extends TechnologyBom {
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String productModelName;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java
index cb2228a..ca2b439 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyBomStructure;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,16 +11,16 @@
@EqualsAndHashCode(callSuper = true)
public class TechnologyBomStructureDto extends TechnologyBomStructure {
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String operationName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("浜у搧ID")
+ @Schema(description = "浜у搧ID")
private Long productId;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
private String tempId;
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationDto.java
index 21305a4..3012eca 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationDto.java
@@ -1,12 +1,12 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyOperation;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel(value = "TechnologyOperationDto瀵硅薄", description = "宸ュ簭鏌ヨ鍙傛暟")
+@Schema(name = "TechnologyOperationDto瀵硅薄", description = "宸ュ簭鏌ヨ鍙傛暟")
public class TechnologyOperationDto extends TechnologyOperation {
}
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationParamDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationParamDto.java
index d28ab87..bebeb62 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationParamDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyOperationParamDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyOperationParam;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,21 +9,21 @@
@EqualsAndHashCode(callSuper = true)
public class TechnologyOperationParamDto extends TechnologyOperationParam {
- @ApiModelProperty("鍙傛暟缂栫爜")
+ @Schema(description = "鍙傛暟缂栫爜")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷")
+ @Schema(description = "鍙傛暟绫诲瀷")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingDto.java
index d725056..fbe1b89 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingDto.java
@@ -1,22 +1,21 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyRouting;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel(value = "TechnologyRoutingDto瀵硅薄", description = "宸ヨ壓璺嚎鏌ヨ鍙傛暟")
+@Schema(name = "TechnologyRoutingDto瀵硅薄", description = "宸ヨ壓璺嚎鏌ヨ鍙傛暟")
public class TechnologyRoutingDto extends TechnologyRouting {
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍚嶇О")
+ @Schema(description = "瑙勬牸鍚嶇О")
private String model;
- @ApiModelProperty("BOM缂栧彿")
+ @Schema(description = "BOM缂栧彿")
private String bomNo;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
index f2d9c90..87c0517 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
@@ -1,16 +1,15 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel(value = "TechnologyRoutingOperationDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鏌ヨ鍙傛暟")
+@Schema(name = "TechnologyRoutingOperationDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鏌ヨ鍙傛暟")
public class TechnologyRoutingOperationDto extends TechnologyRoutingOperation {
- @ApiModelProperty("宸ヨ壓璺嚎id锛堝吋瀹规棫鍙傛暟 routeId锛�")
+ @Schema(description = "宸ヨ壓璺嚎id锛堝吋瀹规棫鍙傛暟 routeId锛�")
private Long routeId;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamDto.java
index dbaabe3..becfa96 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamDto.java
@@ -1,12 +1,12 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyRoutingOperationParam;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "TechnologyRoutingOperationParamDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟鏌ヨ鍙傛暟")
+@Schema(name = "TechnologyRoutingOperationParamDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟鏌ヨ鍙傛暟")
public class TechnologyRoutingOperationParamDto extends TechnologyRoutingOperationParam {
}
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamSyncDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamSyncDto.java
index 3432738..e7deb3d 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamSyncDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationParamSyncDto.java
@@ -1,16 +1,15 @@
package com.ruoyi.technology.bean.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
-@ApiModel(value = "TechnologyRoutingOperationParamSyncDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟鍚屾鍙傛暟")
+@Schema(name = "TechnologyRoutingOperationParamSyncDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟鍚屾鍙傛暟")
public class TechnologyRoutingOperationParamSyncDto {
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭id")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭id")
private Long technologyRoutingOperationId;
- @ApiModelProperty("鏄惁瑕嗙洊褰撳墠宸ュ簭宸插瓨鍦ㄥ弬鏁帮紝榛樿true")
+ @Schema(description = "鏄惁瑕嗙洊褰撳墠宸ュ簭宸插瓨鍦ㄥ弬鏁帮紝榛樿true")
private Boolean replaceExisting;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomStructureVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomStructureVo.java
index fc6ecbb..e41540d 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomStructureVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomStructureVo.java
@@ -1,7 +1,7 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyBomStructure;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,16 +11,16 @@
@EqualsAndHashCode(callSuper = true)
public class TechnologyBomStructureVo extends TechnologyBomStructure {
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String operationName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("浜у搧ID")
+ @Schema(description = "浜у搧ID")
private Long productId;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
private List<TechnologyBomStructureVo> children;
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java
index 019bc22..c81e401 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java
@@ -1,15 +1,15 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyBom;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class TechnologyBomVo extends TechnologyBom {
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String productModelName;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationParamVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationParamVo.java
index 2345455..e079697 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationParamVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationParamVo.java
@@ -1,7 +1,7 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyOperationParam;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,21 +9,21 @@
@EqualsAndHashCode(callSuper = true)
public class TechnologyOperationParamVo extends TechnologyOperationParam {
- @ApiModelProperty("鍙傛暟缂栫爜")
+ @Schema(description = "鍙傛暟缂栫爜")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷")
+ @Schema(description = "鍙傛暟绫诲瀷")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java
index 68a1fab..1433990 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java
@@ -1,12 +1,12 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyOperation;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel(value = "TechnologyOperationVo瀵硅薄", description = "宸ュ簭杩斿洖瀵硅薄")
+@Schema(name = "TechnologyOperationVo瀵硅薄", description = "宸ュ簭杩斿洖瀵硅薄")
public class TechnologyOperationVo extends TechnologyOperation {
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationParamVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationParamVo.java
index 9f60e38..4fb8620 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationParamVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationParamVo.java
@@ -1,12 +1,12 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperationParam;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "TechnologyRoutingOperationParamVo瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟杩斿洖瀵硅薄")
+@Schema(name = "TechnologyRoutingOperationParamVo瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟杩斿洖瀵硅薄")
public class TechnologyRoutingOperationParamVo extends TechnologyRoutingOperationParam {
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
index 5d27f2a..a75cdfa 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
@@ -1,28 +1,27 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel(value = "TechnologyRoutingOperationVo瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭杩斿洖瀵硅薄")
+@Schema(name = "TechnologyRoutingOperationVo瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭杩斿洖瀵硅薄")
public class TechnologyRoutingOperationVo extends TechnologyRoutingOperation {
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String technologyOperationName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍚嶇О")
+ @Schema(description = "瑙勬牸鍚嶇О")
private String model;
- @ApiModelProperty("瑙勬牸鍚嶇О")
+ @Schema(description = "瑙勬牸鍚嶇О")
private String specificationName;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingVo.java
index aa67cd4..b0763db 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingVo.java
@@ -1,22 +1,21 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyRouting;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel(value = "TechnologyRoutingVo瀵硅薄", description = "宸ヨ壓璺嚎杩斿洖瀵硅薄")
+@Schema(name = "TechnologyRoutingVo瀵硅薄", description = "宸ヨ壓璺嚎杩斿洖瀵硅薄")
public class TechnologyRoutingVo extends TechnologyRouting {
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍚嶇О")
+ @Schema(description = "瑙勬牸鍚嶇О")
private String model;
- @ApiModelProperty("BOM缂栧彿")
+ @Schema(description = "BOM缂栧彿")
private String bomNo;
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java
index 08dfcf4..2f2a90f 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java
@@ -11,8 +11,8 @@
import com.ruoyi.technology.bean.vo.TechnologyBomVo;
import com.ruoyi.technology.pojo.TechnologyBom;
import com.ruoyi.technology.service.TechnologyBomService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,42 +24,42 @@
@RestController
@RequestMapping("/technologyBom")
@RequiredArgsConstructor
-@Api(tags = "鍩虹BOM")
+@Tag(name = "鍩虹BOM")
public class TechnologyBomController {
private final TechnologyBomService technologyBomService;
@GetMapping("/listPage")
@Log(title = "Technology BOM page", businessType = BusinessType.OTHER)
- @ApiOperation("BOM鍒嗛〉鏌ヨ")
+ @Operation(summary = "BOM鍒嗛〉鏌ヨ")
public R<IPage<TechnologyBomVo>> listPage(Page<TechnologyBomDto> page, TechnologyBomDto technologyBomDto) {
return R.ok(technologyBomService.listPage(page, technologyBomDto));
}
@PostMapping("/add")
@Log(title = "Add technology BOM", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板BOM")
+ @Operation(summary = "鏂板BOM")
public R add(@RequestBody TechnologyBom technologyBom) {
return technologyBomService.add(technologyBom);
}
@PutMapping("/update")
@Log(title = "Update technology BOM", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼BOM")
+ @Operation(summary = "淇敼BOM")
public R update(@RequestBody TechnologyBom technologyBom) {
return technologyBomService.update(technologyBom);
}
@DeleteMapping("/batchDelete")
@Log(title = "Delete technology BOM", businessType = BusinessType.DELETE)
- @ApiOperation("鎵归噺鍒犻櫎BOM")
+ @Operation(summary = "鎵归噺鍒犻櫎BOM")
public R batchDelete(@RequestBody List<Long> ids) {
return R.ok(technologyBomService.batchDelete(ids));
}
@GetMapping("/getByModel")
@Log(title = "List BOM by model", businessType = BusinessType.OTHER)
- @ApiOperation("鏍规嵁瑙勬牸鏌ヨBOM")
+ @Operation(summary = "鏍规嵁瑙勬牸鏌ヨBOM")
public R<List<TechnologyBomVo>> getByModel(Long productModelId) {
return R.ok(technologyBomService.listByModel(productModelId));
}
@@ -67,14 +67,14 @@
@PostMapping("/uploadBom")
@PreAuthorize("@ss.hasPermi('product:bom:import')")
@Log(title = "鏍规嵁Excel瀵煎叆BOM", businessType = BusinessType.IMPORT)
- @ApiOperation("鏍规嵁Excel瀵煎叆BOM")
+ @Operation(summary = "鏍规嵁Excel瀵煎叆BOM")
public R uploadBom(@RequestParam("file") MultipartFile file) {
return technologyBomService.uploadBom(file);
}
@PostMapping("/exportBom")
@PreAuthorize("@ss.hasPermi('product:bom:export')")
- @ApiOperation("瀵煎嚭BOM鏂囦欢")
+ @Operation(summary = "瀵煎嚭BOM鏂囦欢")
@Log(title = "瀵煎嚭BOM鏂囦欢", businessType = BusinessType.EXPORT)
public void exportBom(HttpServletResponse response, @RequestParam Integer bomId) {
technologyBomService.exportBom(response, bomId);
@@ -82,7 +82,7 @@
@GetMapping("/downloadTemplate")
@Log(title = "涓嬭浇BOM瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
- @ApiOperation("涓嬭浇BOM瀵煎叆妯℃澘")
+ @Operation(summary = "涓嬭浇BOM瀵煎叆妯℃澘")
public void importTemplate(HttpServletResponse response) {
ExcelUtil<BomImportDto> excelUtil = new ExcelUtil<>(BomImportDto.class);
excelUtil.importTemplateExcel(response, "BOM瀵煎叆妯℃澘");
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java
index 3655e0e..b95c3a7 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java
@@ -4,8 +4,8 @@
import com.ruoyi.technology.bean.dto.TechnologyBomStructureDto;
import com.ruoyi.technology.bean.vo.TechnologyBomStructureVo;
import com.ruoyi.technology.service.TechnologyBomStructureService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -14,19 +14,19 @@
@RestController
@RequestMapping("/technologyBomStructure")
@RequiredArgsConstructor
-@Api(tags = "BOM缁撴瀯")
+@Tag(name = "BOM缁撴瀯")
public class TechnologyBomStructureController {
private final TechnologyBomStructureService technologyBomStructureService;
@PostMapping
- @ApiOperation("鏂板鎴栦慨鏀笲OM缁撴瀯")
+ @Operation(summary = "鏂板鎴栦慨鏀笲OM缁撴瀯")
public R addOrUpdate(@RequestBody TechnologyBomStructureDto technologyBomStructureDto) {
return R.ok(technologyBomStructureService.addTechnologyBomStructure(technologyBomStructureDto));
}
@GetMapping("/listByBomId/{bomId}")
- @ApiOperation("鏍规嵁BOM鏌ヨ缁撴瀯鏍�")
+ @Operation(summary = "鏍规嵁BOM鏌ヨ缁撴瀯鏍�")
public R<List<TechnologyBomStructureVo>> listByBomId(@PathVariable("bomId") Long bomId) {
return R.ok(technologyBomStructureService.listByBomId(bomId));
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java
index f730aae..c24c93f 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationController.java
@@ -8,15 +8,15 @@
import com.ruoyi.technology.bean.dto.TechnologyOperationDto;
import com.ruoyi.technology.bean.vo.TechnologyOperationVo;
import com.ruoyi.technology.service.TechnologyOperationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
-@Api(tags = "宸ュ簭绠＄悊")
+@Tag(name = "宸ュ簭绠＄悊")
@RequestMapping("/technologyOperation")
@RequiredArgsConstructor
public class TechnologyOperationController {
@@ -25,34 +25,34 @@
@GetMapping("/listPage")
@Log(title = "Technology operation page", businessType = BusinessType.OTHER)
- @ApiOperation("宸ュ簭鍒嗛〉鏌ヨ")
+ @Operation(summary = "宸ュ簭鍒嗛〉鏌ヨ")
public R<IPage<TechnologyOperationVo>> listPage(Page<TechnologyOperationDto> page, TechnologyOperationDto technologyOperationDto) {
return R.ok(technologyOperationService.listPage(page, technologyOperationDto));
}
@PostMapping("/add")
@Log(title = "Add technology operation", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板宸ュ簭")
+ @Operation(summary = "鏂板宸ュ簭")
public R add(@RequestBody TechnologyOperationDto technologyOperationDto) {
return technologyOperationService.add(technologyOperationDto);
}
@PutMapping("/update")
@Log(title = "Update technology operation", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼宸ュ簭")
+ @Operation(summary = "淇敼宸ュ簭")
public R update(@RequestBody com.ruoyi.technology.pojo.TechnologyOperation technologyOperation) {
return R.ok(technologyOperationService.updateById(technologyOperation));
}
@DeleteMapping("/batchDelete")
@Log(title = "Delete technology operation", businessType = BusinessType.DELETE)
- @ApiOperation("鎵归噺鍒犻櫎宸ュ簭")
+ @Operation(summary = "鎵归噺鍒犻櫎宸ュ簭")
public R batchDelete(@RequestBody List<Long> ids) {
return R.ok(technologyOperationService.batchDelete(ids));
}
@GetMapping("/list")
- @ApiOperation("鏌ヨ鍏ㄩ儴宸ュ簭")
+ @Operation(summary = "鏌ヨ鍏ㄩ儴宸ュ簭")
public R<List<TechnologyOperationVo>> list() {
return R.ok(technologyOperationService.listVo());
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
index c9eff23..061a50c 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
@@ -8,8 +8,8 @@
import com.ruoyi.technology.bean.vo.TechnologyOperationParamVo;
import com.ruoyi.technology.pojo.TechnologyOperationParam;
import com.ruoyi.technology.service.TechnologyOperationParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,27 +17,27 @@
@RestController
@RequestMapping("/technologyOperationParam")
-@Api(tags = "宸ュ簭鍙傛暟")
+@Tag(name = "宸ュ簭鍙傛暟")
@RequiredArgsConstructor
public class TechnologyOperationParamController {
private final TechnologyOperationParamService technologyOperationParamService;
@GetMapping("/list")
- @ApiOperation("宸ュ簭鍙傛暟鍒楄〃鏌ヨ")
+ @Operation(summary = "宸ュ簭鍙傛暟鍒楄〃鏌ヨ")
public R<List<TechnologyOperationParamVo>> list(TechnologyOperationParamDto technologyOperationParamDto) {
return R.ok(technologyOperationParamService.listOperationParam(technologyOperationParamDto));
}
@PostMapping("/")
- @ApiOperation("鏂板鎴栦慨鏀瑰伐搴忓弬鏁�")
+ @Operation(summary = "鏂板鎴栦慨鏀瑰伐搴忓弬鏁�")
public R addOrUpdate(@RequestBody TechnologyOperationParam technologyOperationParam) {
return R.ok(technologyOperationParamService.saveTechnologyOperationParam(technologyOperationParam));
}
@DeleteMapping("/batchDelete/{id}")
@Log(title = "Delete technology operation param", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎宸ュ簭鍙傛暟")
+ @Operation(summary = "鍒犻櫎宸ュ簭鍙傛暟")
public AjaxResult batchDelete(@PathVariable("id") Long id) {
return AjaxResult.success(technologyOperationParamService.batchDelete(id));
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyParamController.java
index d16d514..3eb6a84 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyParamController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyParamController.java
@@ -8,22 +8,22 @@
import com.ruoyi.technology.bean.dto.TechnologyParamDto;
import com.ruoyi.technology.bean.vo.TechnologyParamVo;
import com.ruoyi.technology.service.TechnologyParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/technologyParam")
@RequiredArgsConstructor
-@Api(tags = "鍩虹鍙傛暟")
+@Tag(name = "鍩虹鍙傛暟")
public class TechnologyParamController {
private final TechnologyParamService technologyParamService;
@GetMapping("list")
@Log(title = "鍩虹鍙傛暟鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
- @ApiOperation("鍩虹鍙傛暟鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍩虹鍙傛暟鍒嗛〉鏌ヨ")
public R<IPage<TechnologyParamVo>> TechnologyParamDtoList(Page<TechnologyParamDto> page, TechnologyParamDto technologyParamDto) {
IPage<TechnologyParamVo> paramList = technologyParamService.baseParamList(page, technologyParamDto);
return R.ok(paramList);
@@ -31,21 +31,21 @@
@PostMapping("/add")
@Log(title = "鏂板鍩虹鍙傛暟", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板鍩虹鍙傛暟")
+ @Operation(summary = "鏂板鍩虹鍙傛暟")
public R TechnologyParamDtoAdd(@RequestBody TechnologyParamDto TechnologyParamDto) {
return R.ok(technologyParamService.addBaseParam(TechnologyParamDto));
}
@PutMapping("/edit")
@Log(title = "淇敼鍩虹鍙傛暟", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼鍩虹鍙傛暟")
+ @Operation(summary = "淇敼鍩虹鍙傛暟")
public R TechnologyParamDtoEdit(@RequestBody TechnologyParamDto TechnologyParamDto) {
return R.ok(technologyParamService.updateBaseParam(TechnologyParamDto));
}
@DeleteMapping("/remove/{ids}")
@Log(title = "鍒犻櫎鍩虹鍙傛暟", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎鍩虹鍙傛暟")
+ @Operation(summary = "鍒犻櫎鍩虹鍙傛暟")
public R TechnologyParamDtoRemove(@PathVariable Long[] ids) {
return R.ok(technologyParamService.deleteBaseParamByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
index e98d216..503f171 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
@@ -7,8 +7,8 @@
import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.service.TechnologyRoutingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +16,7 @@
@RestController
@RequestMapping("/technologyRouting")
-@Api(tags = "宸ヨ壓璺嚎")
+@Tag(name = "宸ヨ壓璺嚎")
@RequiredArgsConstructor
public class TechnologyRoutingController {
@@ -26,7 +26,7 @@
* 鍒嗛〉鏌ヨ宸ヨ壓璺嚎銆�
*/
@GetMapping("/page")
- @ApiOperation("宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
+ @Operation(summary = "宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
public R<IPage<TechnologyRoutingVo>> page(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
return R.ok(technologyRoutingService.pageTechnologyRouting(page, technologyRoutingDto));
}
@@ -35,7 +35,7 @@
* 鏌ヨ宸ヨ壓璺嚎璇︽儏銆�
*/
@GetMapping("/{id}")
- @ApiOperation("宸ヨ壓璺嚎璇︽儏")
+ @Operation(summary = "宸ヨ壓璺嚎璇︽儏")
public R<TechnologyRoutingVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingService.getTechnologyRoutingInfo(id));
}
@@ -44,7 +44,7 @@
* 鏂板宸ヨ壓璺嚎銆�
*/
@PostMapping
- @ApiOperation("鏂板宸ヨ壓璺嚎")
+ @Operation(summary = "鏂板宸ヨ壓璺嚎")
public R add(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.saveTechnologyRouting(technologyRouting));
}
@@ -53,7 +53,7 @@
* 淇敼宸ヨ壓璺嚎銆�
*/
@PutMapping
- @ApiOperation("淇敼宸ヨ壓璺嚎")
+ @Operation(summary = "淇敼宸ヨ壓璺嚎")
public R edit(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.updateTechnologyRouting(technologyRouting));
}
@@ -62,7 +62,7 @@
* 鎵归噺鍒犻櫎宸ヨ壓璺嚎銆�
*/
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
+ @Operation(summary = "鍒犻櫎宸ヨ壓璺嚎")
public R remove(@RequestBody List<Long> ids) {
return R.ok(technologyRoutingService.removeTechnologyRouting(ids));
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
index d8cc6a2..37868f8 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
@@ -7,8 +7,8 @@
import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingOperationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -16,44 +16,44 @@
@RestController
@RequestMapping("/technologyRoutingOperation")
-@Api(tags = "宸ヨ壓璺嚎宸ュ簭")
+@Tag(name = "宸ヨ壓璺嚎宸ュ簭")
@RequiredArgsConstructor
public class TechnologyRoutingOperationController {
private final TechnologyRoutingOperationService technologyRoutingOperationService;
@GetMapping("/page")
- @ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
+ @Operation(summary = "宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
public R<IPage<TechnologyRoutingOperationVo>> page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
return R.ok(technologyRoutingOperationService.pageTechnologyRoutingOperation(page, technologyRoutingOperationDto));
}
@GetMapping("/list")
- @ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒楄〃")
+ @Operation(summary = "宸ヨ壓璺嚎宸ュ簭鍒楄〃")
public R<List<TechnologyRoutingOperationVo>> list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
return R.ok(technologyRoutingOperationService.listTechnologyRoutingOperation(technologyRoutingOperationDto));
}
@GetMapping("/{id}")
- @ApiOperation("宸ヨ壓璺嚎宸ュ簭璇︽儏")
+ @Operation(summary = "宸ヨ壓璺嚎宸ュ簭璇︽儏")
public R<TechnologyRoutingOperationVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingOperationService.getTechnologyRoutingOperationInfo(id));
}
@PostMapping("/add")
- @ApiOperation("鏂板宸ヨ壓璺嚎宸ュ簭")
+ @Operation(summary = "鏂板宸ヨ壓璺嚎宸ュ簭")
public R add(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
return R.ok(technologyRoutingOperationService.saveTechnologyRoutingOperation(technologyRoutingOperation));
}
@PutMapping
- @ApiOperation("淇敼宸ヨ壓璺嚎宸ュ簭")
+ @Operation(summary = "淇敼宸ヨ壓璺嚎宸ュ簭")
public R edit(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
return R.ok(technologyRoutingOperationService.updateById(technologyRoutingOperation));
}
@DeleteMapping("/{id}")
- @ApiOperation("鍒犻櫎宸ヨ壓璺嚎宸ュ簭")
+ @Operation(summary = "鍒犻櫎宸ヨ壓璺嚎宸ュ簭")
public R remove(@PathVariable("id") Long id) {
return R.ok(technologyRoutingOperationService.removeTechnologyRoutingOperation(id));
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationParamController.java
index 568d96a..f685471 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationParamController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationParamController.java
@@ -8,8 +8,8 @@
import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationParamVo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperationParam;
import com.ruoyi.technology.service.TechnologyRoutingOperationParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,51 +17,51 @@
@RestController
@RequestMapping("/technologyRoutingOperationParam")
-@Api(tags = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+@Tag(name = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
@RequiredArgsConstructor
public class TechnologyRoutingOperationParamController {
private final TechnologyRoutingOperationParamService technologyRoutingOperationParamService;
@GetMapping("/page")
- @ApiOperation("鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒嗛〉鏌ヨ")
+ @Operation(summary = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒嗛〉鏌ヨ")
public R<IPage<TechnologyRoutingOperationParamVo>> page(Page<TechnologyRoutingOperationParamDto> page,
TechnologyRoutingOperationParamDto dto) {
return R.ok(technologyRoutingOperationParamService.pageTechnologyRoutingOperationParam(page, dto));
}
@GetMapping("/list")
- @ApiOperation("鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒楄〃")
+ @Operation(summary = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟鍒楄〃")
public R<List<TechnologyRoutingOperationParamVo>> list(TechnologyRoutingOperationParamDto dto) {
return R.ok(technologyRoutingOperationParamService.listTechnologyRoutingOperationParam(dto));
}
@GetMapping("/{id}")
- @ApiOperation("鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟璇︽儏")
+ @Operation(summary = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟璇︽儏")
public R<TechnologyRoutingOperationParamVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingOperationParamService.getTechnologyRoutingOperationParamInfo(id));
}
@PostMapping("/add")
- @ApiOperation("鏂板鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
public R<Boolean> add(@RequestBody TechnologyRoutingOperationParam technologyRoutingOperationParam) {
return R.ok(technologyRoutingOperationParamService.saveTechnologyRoutingOperationParam(technologyRoutingOperationParam));
}
@PutMapping
- @ApiOperation("淇敼鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+ @Operation(summary = "淇敼鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
public R<Boolean> edit(@RequestBody TechnologyRoutingOperationParam technologyRoutingOperationParam) {
return R.ok(technologyRoutingOperationParamService.saveTechnologyRoutingOperationParam(technologyRoutingOperationParam));
}
@DeleteMapping("/{id}")
- @ApiOperation("鍒犻櫎鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
+ @Operation(summary = "鍒犻櫎鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟")
public R<Boolean> remove(@PathVariable("id") Long id) {
return R.ok(technologyRoutingOperationParamService.removeTechnologyRoutingOperationParam(id));
}
@PostMapping("/sync")
- @ApiOperation("鎸夊伐鑹鸿矾绾垮伐搴忓悓姝ュ伐搴忓弬鏁�")
+ @Operation(summary = "鎸夊伐鑹鸿矾绾垮伐搴忓悓姝ュ伐搴忓弬鏁�")
public R<Integer> sync(@RequestBody TechnologyRoutingOperationParamSyncDto syncDto) {
return R.ok(technologyRoutingOperationParamService.syncTechnologyRoutingOperationParam(syncDto));
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyBom.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyBom.java
index dc4255c..3e77cd5 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyBom.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyBom.java
@@ -1,8 +1,7 @@
package com.ruoyi.technology.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -18,44 +17,44 @@
*/
@Data
@TableName("technology_bom")
-@ApiModel(value = "TechnologyBom瀵硅薄", description = "BOM琛�")
+@Schema(name = "TechnologyBom瀵硅薄", description = "BOM琛�")
public class TechnologyBom implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鐗堟湰鍙�")
+ @Schema(description = "鐗堟湰鍙�")
private String version;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓鑰�")
+ @Schema(description = "鍒涘缓鑰�")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("鏇存柊鑰�")
+ @Schema(description = "鏇存柊鑰�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("BOM缂栧彿")
+ @Schema(description = "BOM缂栧彿")
private String bomNo;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
index 7c4c841..0d1c99d 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
@@ -1,8 +1,7 @@
package com.ruoyi.technology.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -18,41 +17,41 @@
*/
@Data
@TableName("technology_bom_structure")
-@ApiModel(value = "TechnologyBomStructure瀵硅薄", description = "BOM浜у搧缁撴瀯琛�")
+@Schema(name = "TechnologyBomStructure瀵硅薄", description = "BOM浜у搧缁撴瀯琛�")
public class TechnologyBomStructure implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐖惰妭鐐笽D")
+ @Schema(description = "鐖惰妭鐐笽D")
private Long parentId;
- @ApiModelProperty("浜у搧id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long operationId;
- @ApiModelProperty("鍗曚綅浜у嚭闇�瑕佹暟閲�")
+ @Schema(description = "鍗曚綅浜у嚭闇�瑕佹暟閲�")
private BigDecimal unitQuantity;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal demandedQuantity;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("bom鐨刬d")
+ @Schema(description = "bom鐨刬d")
private Long bomId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java
index a047256..bac958f 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java
@@ -1,8 +1,7 @@
package com.ruoyi.technology.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -19,7 +18,7 @@
*/
@Data
@TableName("technology_operation")
-@ApiModel(value = "TechnologyOperation瀵硅薄", description = "宸ュ簭琛�")
+@Schema(name = "TechnologyOperation瀵硅薄", description = "宸ュ簭琛�")
public class TechnologyOperation implements Serializable {
private static final long serialVersionUID = 1L;
@@ -27,40 +26,40 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ヨ壓鍚嶇О")
+ @Schema(description = "宸ヨ壓鍚嶇О")
private String name;
- @ApiModelProperty("宸ヨ壓缂栧彿")
+ @Schema(description = "宸ヨ壓缂栧彿")
private String no;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("宸ヨ祫瀹氶")
+ @Schema(description = "宸ヨ祫瀹氶")
private BigDecimal salaryQuota;
- @ApiModelProperty("鏄惁璐ㄦ宸ュ簭")
+ @Schema(description = "鏄惁璐ㄦ宸ュ簭")
private Boolean isQuality;
- @ApiModelProperty("绫诲瀷 鍖哄垎璁℃椂鍜岃浠�")
+ @Schema(description = "绫诲瀷 鍖哄垎璁℃椂鍜岃浠�")
private Integer type;
- @ApiModelProperty("璁惧id")
+ @Schema(description = "璁惧id")
private String deviceLedgerId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyOperationParam.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyOperationParam.java
index 26913c7..e3d4015 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyOperationParam.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyOperationParam.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -19,21 +18,21 @@
*/
@Data
@TableName("technology_operation_param")
-@ApiModel(value = "TechnologyOperationParam瀵硅薄", description = "宸ュ簭鍙傛暟")
+@Schema(name = "TechnologyOperationParam瀵硅薄", description = "宸ュ簭鍙傛暟")
public class TechnologyOperationParam implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍩虹鍙傛暟琛╥d")
+ @Schema(description = "鍩虹鍙傛暟琛╥d")
private Long technologyParamId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("鏍囧噯鍊�")
+ @Schema(description = "鏍囧噯鍊�")
private String standardValue;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyParam.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyParam.java
index 2ebaea7..75d56cf 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyParam.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyParam.java
@@ -1,8 +1,7 @@
package com.ruoyi.technology.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -18,53 +17,53 @@
*/
@Data
@TableName("technology_param")
-@ApiModel(value = "TechnologyParam瀵硅薄", description = "鍩虹鍙傛暟琛�")
+@Schema(name = "TechnologyParam瀵硅薄", description = "鍩虹鍙傛暟琛�")
public class TechnologyParam implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
+ @Schema(description = "鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ @Schema(description = "鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private String createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("淇敼浜�")
+ @Schema(description = "淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java
index b56f1e0..31dab52 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java
@@ -1,8 +1,7 @@
package com.ruoyi.technology.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("technology_routing")
-@ApiModel(value = "TechnologyRouting瀵硅薄", description = "宸ヨ壓璺嚎琛�")
+@Schema(name = "TechnologyRouting瀵硅薄", description = "宸ヨ壓璺嚎琛�")
public class TechnologyRouting implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,31 +25,31 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("浜у搧id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty("鎻忚堪")
+ @Schema(description = "鎻忚堪")
private String description;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ヨ壓璺嚎缂栫爜")
+ @Schema(description = "宸ヨ壓璺嚎缂栫爜")
private String processRouteCode;
- @ApiModelProperty("鍏宠仈bom鐨刬d")
+ @Schema(description = "鍏宠仈bom鐨刬d")
private Integer bomId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
index ec2ef8b..3707062 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
@@ -1,8 +1,7 @@
package com.ruoyi.technology.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("technology_routing_operation")
-@ApiModel(value = "TechnologyRoutingOperation瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭琛�")
+@Schema(name = "TechnologyRoutingOperation瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭琛�")
public class TechnologyRoutingOperation implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,34 +25,34 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id")
private Long technologyRoutingId;
- @ApiModelProperty("浜у搧id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鎷栧姩鎺掑簭")
+ @Schema(description = "鎷栧姩鎺掑簭")
private Integer dragSort;
- @ApiModelProperty("鏄惁璐ㄦ宸ュ簭")
+ @Schema(description = "鏄惁璐ㄦ宸ュ簭")
private Boolean isQuality;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java
index 0e33d2f..2f3146a 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java
@@ -5,8 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -14,68 +13,68 @@
@Data
@TableName("technology_routing_operation_param")
-@ApiModel(value = "TechnologyRoutingOperationParam瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
+@Schema(name = "TechnologyRoutingOperationParam瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
public class TechnologyRoutingOperationParam implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
+ @Schema(description = "鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ @Schema(description = "鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private String createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("淇敼浜�")
+ @Schema(description = "淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("鍩虹鍙傛暟ID")
+ @Schema(description = "鍩虹鍙傛暟ID")
private Long paramId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("宸ュ簭鍙傛暟ID")
+ @Schema(description = "宸ュ簭鍙傛暟ID")
private Long technologyOperationParamId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭ID")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭ID")
private Long technologyRoutingOperationId;
- @ApiModelProperty("鏍囧噯鍊�")
+ @Schema(description = "鏍囧噯鍊�")
private String standardValue;
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
index 5df6ba7..7b51803 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
@@ -6,8 +6,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.DocumentClassification;
import com.ruoyi.warehouse.service.DocumentClassificationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,7 @@
import java.util.List;
@RestController
-@Api(tags = "鏂囨。鍒嗙被")
+@Tag(name = "鏂囨。鍒嗙被")
@RequestMapping("/warehouse/documentClassification")
@AllArgsConstructor
public class DocumentClassificationController extends BaseController {
@@ -28,21 +28,21 @@
}
@PostMapping("/add")
- @ApiOperation("鏂囨。鍒嗙被-娣诲姞")
+ @Operation(summary = "鏂囨。鍒嗙被-娣诲姞")
@Log(title = "鏂囨。鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody DocumentClassification documentClassification) {
return AjaxResult.success(documentClassificationService.save(documentClassification));
}
@PutMapping("/update")
- @ApiOperation("鏂囨。鍒嗙被-鏇存柊")
+ @Operation(summary = "鏂囨。鍒嗙被-鏇存柊")
@Log(title = "鏂囨。鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DocumentClassification documentClassification) {
return AjaxResult.success(documentClassificationService.updateById(documentClassification));
}
@DeleteMapping("/delete")
- @ApiOperation("鏂囨。鍒嗙被鍒犻櫎")
+ @Operation(summary = "鏂囨。鍒嗙被鍒犻櫎")
@Log(title = "鏂囨。鍒嗙被鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index f02118a..2a1c966 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -9,8 +9,8 @@
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
@@ -19,7 +19,7 @@
import java.util.List;
@RestController
-@Api(tags = "鏂囨。鍊熼槄绠＄悊")
+@Tag(name = "鏂囨。鍊熼槄绠＄悊")
@RequestMapping("/documentationBorrowManagement")
@AllArgsConstructor
public class DocumentationBorrowManagementController extends BaseController {
@@ -28,75 +28,75 @@
private DocumentationReturnManagementMapper documentationReturnManagementMapper;
@GetMapping("/listPage")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
}
@GetMapping("/list")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult list() {
return AjaxResult.success(documentationBorrowManagementService.listAll());
}
@GetMapping("/listPageReturn")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
}
@GetMapping("/getByDocumentationId/{id}")
- @ApiOperation("鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍")
+ @Operation(summary = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍")
@Log(title = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍", businessType = BusinessType.OTHER)
public AjaxResult getByDocumentationId(@PathVariable Long id) {
return AjaxResult.success(documentationBorrowManagementService.selectByDocumentationId(id));
}
@PostMapping("/add")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement));
}
@PutMapping("/revent")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
}
@PutMapping("/update")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鏇存柊")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
}
@PutMapping("/reventUpdate")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
}
@DeleteMapping ("/delete")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids));
}
@DeleteMapping ("/reventDelete")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult reventdelete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(documentationBorrowManagementService.reventDeleteByIds(ids));
}
@PostMapping("/export")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭", businessType = BusinessType.EXPORT)
public void export(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) {
documentationBorrowManagementService.export(response,documentationBorrowManagement);
}
@PostMapping("/exportrevent")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭", businessType = BusinessType.EXPORT)
public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
documentationBorrowManagementService.exportrevent(response,documentationReturnManagement);
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index ce45642..427396b 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -10,8 +10,8 @@
import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.service.DocumentationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,13 +22,13 @@
@RestController
@RequestMapping("/documentation")
-@Api(tags = "鏂囨。淇℃伅琛�")
+@Tag(name = "鏂囨。淇℃伅琛�")
@AllArgsConstructor
public class DocumentationController extends BaseController {
private DocumentationService documentationService;
@GetMapping("/listPage")
- @ApiOperation("鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, Documentation documentation) {
IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
@@ -36,7 +36,7 @@
}
@GetMapping("/list")
- @ApiOperation("鏂囨。淇℃伅琛ㄦ煡璇�")
+ @Operation(summary = "鏂囨。淇℃伅琛ㄦ煡璇�")
@Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
public AjaxResult list() {
List<DocumentationDto> list = documentationService.listAll();
@@ -44,21 +44,21 @@
}
@PostMapping("/add")
- @ApiOperation("鏂囨。淇℃伅琛�-娣诲姞")
+ @Operation(summary = "鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Documentation documentation) {
return AjaxResult.success(documentationService.save(documentation));
}
@PutMapping("/update")
- @ApiOperation("鏂囨。淇℃伅琛�-鏇存柊")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鏇存柊")
@Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Documentation documentation) {
return AjaxResult.success(documentationService.updateById(documentation));
}
@DeleteMapping("/delete")
- @ApiOperation("鏂囨。淇℃伅琛�-鍒犻櫎")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鍒犻櫎")
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -66,13 +66,13 @@
}
@PostMapping("/export")
- @ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
+ @Operation(summary = "鏂囨。淇℃伅琛�-瀵煎嚭")
@Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
public void export(HttpServletResponse response, Documentation documentation) {
documentationService.export(response, documentation);
}
- @ApiOperation("鏂囨。淇℃伅琛�-缁熻")
+ @Operation(summary = "鏂囨。淇℃伅琛�-缁熻")
@GetMapping("/overview")
public AjaxResult getOverviewStatistics() {
Map<String, Object> result = new HashMap<>();
@@ -83,13 +83,13 @@
return AjaxResult.success(result);
}
- @ApiOperation("鏂囨。淇℃伅琛�-鍒嗙被缁熻")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鍒嗙被缁熻")
@GetMapping("/category")
public AjaxResult getCategoryDistribution() {
return AjaxResult.success(documentationService.getCategoryDistribution());
}
- @ApiOperation("鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
@GetMapping("/status")
public AjaxResult getStatusDistribution() {
return AjaxResult.success(documentationService.getStatusDistribution());
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index eb6822d..7d80dd1 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -7,8 +7,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.WarehouseService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -16,42 +16,42 @@
import java.util.List;
@RestController
-@Api(tags = "浠撳簱")
+@Tag(name = "浠撳簱")
@RequestMapping("/warehouse")
@AllArgsConstructor
public class WarehouseController extends BaseController {
private WarehouseService warehouseService;
@GetMapping("/tree")
- @ApiOperation("浠撳簱-鏌ヨ鏍�")
+ @Operation(summary = "浠撳簱-鏌ヨ鏍�")
@Log(title = "浠撳簱-鏌ヨ鏍�", businessType = BusinessType.OTHER)
public AjaxResult listTree() {
return AjaxResult.success(warehouseService.findListTree());
}
@GetMapping("/list")
- @ApiOperation("浠撳簱-鏌ヨ")
+ @Operation(summary = "浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult list(Warehouse warehouse) {
return AjaxResult.success(warehouseService.findList(warehouse));
}
@PostMapping("/add")
- @ApiOperation("浠撳簱-娣诲姞")
+ @Operation(summary = "浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Warehouse warehouse) {
return AjaxResult.success(warehouseService.save(warehouse));
}
@PutMapping("/update")
- @ApiOperation("浠撳簱-鏇存柊")
+ @Operation(summary = "浠撳簱-鏇存柊")
@Log(title = "浠撳簱-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Warehouse warehouse) {
return AjaxResult.success(warehouseService.updateById(warehouse));
}
@DeleteMapping("/delete")
- @ApiOperation("浠撳簱-鍒犻櫎")
+ @Operation(summary = "浠撳簱-鍒犻櫎")
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index fa40a50..5aebb76 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -8,41 +8,41 @@
import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
-@Api(tags = "鍟嗗搧璐ф灦")
+@Tag(name = "鍟嗗搧璐ф灦")
@RequestMapping("/warehouse/goodsShelves")
@AllArgsConstructor
public class WarehouseGoodsShelvesController extends BaseController {
private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
@GetMapping("/listById")
- @ApiOperation("鍟嗗搧璐ф灦-鏌ヨ")
+ @Operation(summary = "鍟嗗搧璐ф灦-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
return AjaxResult.success(list);
}
@PostMapping("/add")
- @ApiOperation("鍟嗗搧璐ф灦-娣诲姞")
+ @Operation(summary = "鍟嗗搧璐ф灦-娣诲姞")
@Log(title = "鍟嗗搧璐ф灦-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
}
@PutMapping("/update")
- @ApiOperation("鍟嗗搧璐ф灦-鏇存柊")
+ @Operation(summary = "鍟嗗搧璐ф灦-鏇存柊")
@Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
return AjaxResult.success(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
}
@DeleteMapping("/delete")
- @ApiOperation("鍟嗗搧璐ф灦-鍒犻櫎")
+ @Operation(summary = "鍟嗗搧璐ф灦-鍒犻櫎")
@Log(title = "鍟嗗搧璐ф灦-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
index b4fb8fe..ed3ed06 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
@@ -7,8 +7,8 @@
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 io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,14 +17,14 @@
import java.util.List;
@RestController
-@Api(tags = "鍟嗗搧璐ф灦琛屽垪")
+@Tag(name = "鍟嗗搧璐ф灦琛屽垪")
@RequestMapping("/warehouse/goodsShelvesRowcol")
@AllArgsConstructor
public class WarehouseGoodsShelvesRowcolController extends BaseController {
private WarehouseGoodsShelvesRowcolService warehouseGoodsShelvesRowcolService;
@GetMapping("/list")
- @ApiOperation("鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
+ @Operation(summary = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult list(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
index 8fb893a..94880a3 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
@@ -2,7 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
index 4a9e617..bece83d 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
@@ -6,7 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -15,7 +15,7 @@
*/
@TableName(value ="document_classification")
@Data
-@ApiModel(value = "鏂囨。鍒嗙被琛�")
+@Schema(name = "鏂囨。鍒嗙被琛�")
public class DocumentClassification implements Serializable {
/**
*
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
index b4ec792..d9e85e4 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
@@ -8,8 +8,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -18,55 +17,55 @@
*/
@TableName(value ="documentation")
@Data
-@ApiModel(value = "鏂囨。淇℃伅琛�")
+@Schema(name = "鏂囨。淇℃伅琛�")
public class Documentation implements Serializable {
/**
*
*/
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "鏂囨。ID")
+ @Schema(description = "鏂囨。ID")
private Long id;
/**
* 绫诲埆鍚嶇Оid
*/
@Excel(name = "绫诲埆鍚嶇Оid")
- @ApiModelProperty(value = "绫诲埆鍚嶇Оid")
+ @Schema(description = "绫诲埆鍚嶇Оid")
private Long documentClassificationId;
/**
* 鏂囨。鍚嶇О
*/
@Excel(name = "鏂囨。鍚嶇О")
- @ApiModelProperty(value = "鏂囨。鍚嶇О")
+ @Schema(description = "鏂囨。鍚嶇О")
private String docName;
/**
* 鏂囨。缂栧彿
*/
@Excel(name = "鏂囨。缂栧彿")
- @ApiModelProperty(value = "鏂囨。缂栧彿")
+ @Schema(description = "鏂囨。缂栧彿")
private String docNumber;
/**
* 骞翠唤
*/
@Excel(name = "骞翠唤")
- @ApiModelProperty(value = "骞翠唤")
+ @Schema(description = "骞翠唤")
private Long year;
/**
* 璐ｄ换浜�
*/
@Excel(name = "璐ｄ换浜�")
- @ApiModelProperty(value = "璐ｄ换浜�")
+ @Schema(description = "璐ｄ换浜�")
private String responsiblePerson;
/**
* 鏂囨。鏀剧疆浣嶇疆
*/
@Excel(name = "鏂囨。鏀剧疆浣嶇疆")
- @ApiModelProperty(value = "鏂囨。鏀剧疆浣嶇疆")
+ @Schema(description = "鏂囨。鏀剧疆浣嶇疆")
private Long warehouseGoodsShelvesRowcolId;
/**
@@ -74,7 +73,7 @@
*/
@Excel(name = "鏂囨。鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @ApiModelProperty(value = "鏂囨。鏃ユ湡")
+ @Schema(description = "鏂囨。鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime docDate;
@@ -82,63 +81,63 @@
* 淇濈鏈熼檺
*/
@Excel(name = "淇濈鏈熼檺")
- @ApiModelProperty(value = "淇濈鏈熼檺")
+ @Schema(description = "淇濈鏈熼檺")
private Long retentionPeriod;
/**
* 淇濆瘑绾у埆
*/
@Excel(name = "淇濆瘑绾у埆")
- @ApiModelProperty(value = "淇濆瘑绾у埆")
+ @Schema(description = "淇濆瘑绾у埆")
private String securityLevel;
/**
* 浠芥暟
*/
@Excel(name = "浠芥暟")
- @ApiModelProperty(value = "浠芥暟")
+ @Schema(description = "浠芥暟")
private Long copyCount;
/**
* 椤垫暟
*/
@Excel(name = "椤垫暟")
- @ApiModelProperty(value = "椤垫暟")
+ @Schema(description = "椤垫暟")
private Long pageCount;
/**
* 鏂囨。绫诲埆
*/
@Excel(name = "鏂囨。绫诲埆")
- @ApiModelProperty(value = "鏂囨。绫诲埆")
+ @Schema(description = "鏂囨。绫诲埆")
private String docCategory;
/**
* 鏂囨。绉嶇被
*/
@Excel(name = "鏂囨。绉嶇被")
- @ApiModelProperty(value = "鏂囨。绉嶇被")
+ @Schema(description = "鏂囨。绉嶇被")
private String docType;
/**
* 绱ф�ョ▼搴�
*/
@Excel(name = "绱ф�ョ▼搴�")
- @ApiModelProperty(value = "绱ф�ョ▼搴�")
+ @Schema(description = "绱ф�ョ▼搴�")
private String urgencyLevel;
/**
* 鏂囨。鐘舵��
*/
@Excel(name = "鏂囨。鐘舵��")
- @ApiModelProperty(value = "鏂囨。鐘舵��")
+ @Schema(description = "鏂囨。鐘舵��")
private String docStatus;
/**
* 澶囨敞
*/
@Excel(name = "澶囨敞")
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
/**
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index b3a62f0..8887198 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -10,8 +10,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,7 +20,7 @@
*/
@TableName(value ="documentation_borrow_management")
@Data
-@ApiModel(value = "鏂囨。鍊熼槄琛�")
+@Schema(name = "鏂囨。鍊熼槄琛�")
public class DocumentationBorrowManagement extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -34,19 +33,19 @@
/**
* 鏂囨。id
*/
- @ApiModelProperty(value = "鏂囨。id")
+ @Schema(description = "鏂囨。id")
private Long documentationId;
/**
* 鍊熼槄浜�
*/
- @ApiModelProperty(value = "鍊熼槄浜�")
+ @Schema(description = "鍊熼槄浜�")
@Excel(name = "鍊熼槄浜�")
private String borrower;
/**
* 褰掕繕浜�
*/
- @ApiModelProperty(value = "褰掕繕浜�")
+ @Schema(description = "褰掕繕浜�")
@Excel(name = "褰掕繕浜�")
private String returner;
@@ -54,14 +53,14 @@
* 鍊熼槄鐩殑
*/
@Excel(name = "鍊熼槄鐩殑")
- @ApiModelProperty(value = "鍊熼槄鐩殑")
+ @Schema(description = "鍊熼槄鐩殑")
private String borrowPurpose;
/**
* 鍊熼槄鏃ユ湡
*/
- @ApiModelProperty(value = "鍊熼槄鏃ユ湡")
+ @Schema(description = "鍊熼槄鏃ユ湡")
@Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -70,7 +69,7 @@
/**
* 搴斿綊杩樻棩鏈�
*/
- @ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
+ @Schema(description = "搴斿綊杩樻棩鏈�")
@Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate dueReturnDate;
@@ -78,7 +77,7 @@
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
- @ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
+ @Schema(description = "瀹為檯褰掕繕鏃ユ湡")
@Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate returnDate;
@@ -86,14 +85,14 @@
/**
* 鍊熼槄鐘舵��
*/
- @ApiModelProperty(value = "鍊熼槄鐘舵��")
+ @Schema(description = "鍊熼槄鐘舵��")
@Excel(name = "鍊熼槄鐘舵��")
private String borrowStatus;
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remark;
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java
index 9a24896..72f94cc 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java
@@ -1,7 +1,7 @@
package com.ruoyi.warehouse.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
@@ -23,36 +23,36 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty(value = "鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty(value = "鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private Long fileSize;
- @ApiModelProperty(value = "鏂囨。ID")
+ @Schema(description = "鏂囨。ID")
@NotBlank(message = "鏂囨。id涓嶈兘涓虹┖!")
private Long documentationId;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
index 304cd8c..2887cda 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,7 +18,7 @@
*/
@TableName(value ="documentation_return_management")
@Data
-@ApiModel(value = "鏂囨。褰掕繕琛�")
+@Schema(name = "鏂囨。褰掕繕琛�")
public class DocumentationReturnManagement extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,7 +31,7 @@
/**
* 鏂囨。id
*/
- @ApiModelProperty(value = "鏂囨。id")
+ @Schema(description = "鏂囨。id")
private Long documentationId;
/**
* 鍊熼槄id
@@ -41,13 +40,13 @@
/**
* 鍊熼槄浜�
*/
- @ApiModelProperty(value = "鍊熼槄浜�")
+ @Schema(description = "鍊熼槄浜�")
@Excel(name = "鍊熼槄浜�")
private String borrower;
/**
* 褰掕繕浜�
*/
- @ApiModelProperty(value = "褰掕繕浜�")
+ @Schema(description = "褰掕繕浜�")
@Excel(name = "褰掕繕浜�")
private String returner;
@@ -55,14 +54,14 @@
* 鍊熼槄鐩殑
*/
@Excel(name = "鍊熼槄鐩殑")
- @ApiModelProperty(value = "鍊熼槄鐩殑")
+ @Schema(description = "鍊熼槄鐩殑")
private String borrowPurpose;
/**
* 鍊熼槄鏃ユ湡
*/
- @ApiModelProperty(value = "鍊熼槄鏃ユ湡")
+ @Schema(description = "鍊熼槄鏃ユ湡")
@Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -71,7 +70,7 @@
/**
* 搴斿綊杩樻棩鏈�
*/
- @ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
+ @Schema(description = "搴斿綊杩樻棩鏈�")
@Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate dueReturnDate;
@@ -79,7 +78,7 @@
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
- @ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
+ @Schema(description = "瀹為檯褰掕繕鏃ユ湡")
@Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate returnDate;
@@ -87,14 +86,14 @@
/**
* 鍊熼槄鐘舵��
*/
- @ApiModelProperty(value = "鍊熼槄鐘舵��")
+ @Schema(description = "鍊熼槄鐘舵��")
@Excel(name = "鍊熼槄鐘舵��")
private String borrowStatus;
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remark;
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
index f9403d5..780246a 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
@@ -6,7 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -15,7 +15,7 @@
*/
@TableName(value ="warehouse")
@Data
-@ApiModel
+@Schema
public class Warehouse implements Serializable {
/**
*
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
index 43cb073..32163ac 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
@@ -6,7 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -15,7 +15,7 @@
*/
@TableName(value ="warehouse_goods_shelves")
@Data
-@ApiModel
+@Schema
public class WarehouseGoodsShelves implements Serializable {
/**
*
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index 9038776..f2a0daa 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -6,7 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -15,7 +15,7 @@
*/
@TableName(value ="warehouse_goods_shelves_rowcol")
@Data
-@ApiModel(value = "浠撳簱璐ф灦灞傦紝鍒楄〃")
+@Schema(name = "浠撳簱璐ф灦灞傦紝鍒楄〃")
public class WarehouseGoodsShelvesRowcol implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index 5ee380b..be3933b 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -9,8 +9,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +26,7 @@
* @date : 2025/8/11 10:08
*/
@RestController
-@Api(tags = "鐢ㄦ按绠＄悊")
+@Tag(name = "鐢ㄦ按绠＄悊")
@RequestMapping("/waterRecord")
@AllArgsConstructor
public class WaterRecordController extends BaseController {
@@ -70,7 +70,7 @@
*/
@Log(title = "瀵煎叆鐢ㄦ按绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- @ApiOperation("瀵煎叆鐢ㄦ按绠＄悊")
+ @Operation(summary = "瀵煎叆鐢ㄦ按绠＄悊")
public AjaxResult importData(MultipartFile file) throws Exception {
return waterRecordService.importData(file);
}
@@ -80,7 +80,7 @@
*/
@Log(title = "瀵煎嚭鐢ㄦ按绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鐢ㄦ按绠＄悊")
+ @Operation(summary = "瀵煎嚭鐢ㄦ按绠＄悊")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
WaterRecord waterRecord = new WaterRecord();
diff --git a/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java b/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
index c7c8f29..a6e63e0 100644
--- a/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
+++ b/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("water_record")
-@ApiModel
+@Schema
public class WaterRecord {
@@ -30,21 +29,21 @@
/**
* 瑙勬牸鍨嬪彿
*/
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
@Excel(name = "瑙勬牸鍨嬪彿")
private String deviceModel;
/**
* 鐢ㄦ按绫诲瀷
*/
- @ApiModelProperty("鐢ㄦ按绫诲瀷")
+ @Schema(description = "鐢ㄦ按绫诲瀷")
@Excel(name = "鐢ㄦ按绫诲瀷", readConverterExp = "industrial=宸ヤ笟鐢ㄦ按,domestic=鐢熸椿鐢ㄦ按,fire=娑堥槻鐢ㄦ按,greening=缁垮寲鐢ㄦ按")
private String type;
/**
* 璁惧鍚嶇О
*/
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
@TableField(exist = false)
private String deviceName;
@@ -54,21 +53,21 @@
/**
* 棰濆畾娴侀噺
*/
- @ApiModelProperty("棰濆畾娴侀噺")
+ @Schema(description = "棰濆畾娴侀噺")
@Excel(name = "棰濆畾娴侀噺")
private String ratedRate;
/**
* 瀹為檯娴侀噺
*/
- @ApiModelProperty("瀹為檯娴侀噺")
+ @Schema(description = "瀹為檯娴侀噺")
@Excel(name = "瀹為檯娴侀噺")
private String actualTraffic;
/**
* 杩愯鏃堕棿
*/
- @ApiModelProperty("杩愯鏃堕棿")
+ @Schema(description = "杩愯鏃堕棿")
@Excel(name = "杩愯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -78,28 +77,28 @@
/**
* 褰撴棩鐢ㄦ按閲�
*/
- @ApiModelProperty("褰撴棩鐢ㄦ按閲�")
+ @Schema(description = "褰撴棩鐢ㄦ按閲�")
@Excel(name = "褰撴棩鐢ㄦ按閲�")
private String waterDay;
/**
* 姣忔棩闄愬埗姘撮噺
*/
- @ApiModelProperty("姣忔棩闄愬埗姘撮噺")
+ @Schema(description = "姣忔棩闄愬埗姘撮噺")
@Excel(name = "姣忔棩闄愬埗姘撮噺")
private String waterDayLimit;
/**
* 姘磋垂鍗曚环
*/
- @ApiModelProperty("姘磋垂鍗曚环")
+ @Schema(description = "姘磋垂鍗曚环")
@Excel(name = "姘磋垂鍗曚环")
private String waterPrice;
/**
* 澶囨敞
*/
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remarks;
/**
--
Gitblit v1.9.3