From cfe049492f81d2c650a2b17348593edbc5054498 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 18 三月 2026 07:52:44 +0800
Subject: [PATCH] #3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 8
rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/controller/AiGatewayController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java | 2
rsf-framework/pom.xml | 5
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Order.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/IpTools.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiPromptController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Station.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/JwtUtil.java | 2
rsf-framework/src/main/resources/templates/react-admin/Controller.txt | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveSowItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FileServerUtil.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportOne.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 4
pom.xml | 47 +
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiMcpMountController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java | 9
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisRuntimeService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateNodeController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpSseClient.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 5
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowInstanceController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java | 2
rsf-common/pom.xml | 50 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiPromptTemplateServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java | 6
rsf-open-api/src/main/resources/application-prod.yml | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/CheckOrder.java | 2
rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 33
rsf-server/src/main/java/com/vincent/rsf/server/ai/controller/AiController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpPayloadMapper.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/TokenAuthExampleController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpRegistryService.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/aspect/LogAspect.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/PdaRoleMenuController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/WarehouseRoleMenuController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiCallLogController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiRuntimeConfigService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/ConfigController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Task.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 28
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/utils/Http.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepTemplateController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceNodeController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/service/AppAuthService.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/AuthUtils.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java | 10
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/OperationRecordController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiParamController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/AiMcpProtocolController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java | 2
rsf-open-api/src/main/resources/logback-spring.xml | 26
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiDeviceSiteSummaryService.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Pallet.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiModelRouteRuntimeService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java | 7
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrderItem.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java | 10
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserLoginService.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java | 2
rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/service/AiGatewayService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java | 17
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpProtocolService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 14
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanScheduler.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/AppAuthExampleController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserLoginServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java | 4
rsf-server/src/main/resources/logback-spring.xml | 18
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SystemAuthUtils.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/ConfigServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java | 2
rsf-open-api/pom.xml | 8
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/ApiAuthExampleController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisPlanController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 10
rsf-server/src/main/java/com/vincent/rsf/server/common/security/JwtAuthenticationFilter.java | 10
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/filter/AppIdAuthenticationFilter.java | 10
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/security/PasswordEncoderConfig.java | 15
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiTaskSummaryService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/Http.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosticToolConfigController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/config/AiSchemaGuard.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 21
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Material.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferOrderController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java | 16
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/TokenUtils.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/HostController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BatchRegularController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiPromptRuntimeService.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiWarehouseSummaryService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemWorkingController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SubsystemFlowTemplateController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserLoginController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiApiFailureSummaryService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/RoleController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeRelaController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DeptController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiTextCompletionService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/service/RedisService.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/ApiSecurityConfig.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportList.java | 4
rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/GatewayBoot.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiSessionServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CustomerController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 27
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 10
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiRouteController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepInstanceController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContractController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiOperationRecordSummaryService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java | 77 +--
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepLogController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java | 105 ----
rsf-framework/src/main/resources/templates/react-antd/Controller.txt | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanRunnerService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java | 2
rsf-common/src/main/java/com/vincent/rsf/common/domain/BeanValidators.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisMcpRuntimeService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpHttpClient.java | 2
rsf-server/pom.xml | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiGatewayClient.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiChatStreamOrchestrator.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java | 2
rsf-server/src/main/resources/application-prod.yml | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/IsptHistoriesController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosticToolService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java | 13
238 files changed, 515 insertions(+), 590 deletions(-)
diff --git a/pom.xml b/pom.xml
index 828541a..a8ab56d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.3</version>
+ <version>3.5.10</version>
<relativePath/>
</parent>
@@ -27,10 +27,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <spring-cloud.version>2020.0.5</spring-cloud.version>
- <spring-boot.version>2.5.3</spring-boot.version>
- <jedis.version>2.9.0</jedis.version>
- <snakeyaml.version>1.33</snakeyaml.version>
+ <java.version>17</java.version>
+ <spring-cloud.version>2025.0.0</spring-cloud.version>
+ <spring-boot.version>3.5.10</spring-boot.version>
+ <druid.version>1.2.27</druid.version>
+ <springdoc.version>2.8.14</springdoc.version>
+ <jjwt.version>0.11.5</jjwt.version>
+ <jedis.version>5.2.0</jedis.version>
+ <fastjson.version>1.2.83</fastjson.version>
</properties>
<dependencies>
@@ -39,9 +43,13 @@
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>1.2.21</version>
+ <artifactId>druid-spring-boot-3-starter</artifactId>
+ <version>${druid.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -72,12 +80,27 @@
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <release>${java.version}</release>
+ <parameters>true</parameters>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/GatewayBoot.java b/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/GatewayBoot.java
index 652213e..473b564 100644
--- a/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/GatewayBoot.java
+++ b/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/GatewayBoot.java
@@ -1,6 +1,6 @@
package com.vincent.rsf.ai.gateway;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.SpringApplication;
diff --git a/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/controller/AiGatewayController.java b/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/controller/AiGatewayController.java
index f065ad0..5f72929 100644
--- a/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/controller/AiGatewayController.java
+++ b/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/controller/AiGatewayController.java
@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.charset.StandardCharsets;
diff --git a/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/service/AiGatewayService.java b/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/service/AiGatewayService.java
index 070bb04..74420e0 100644
--- a/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/service/AiGatewayService.java
+++ b/rsf-ai-gateway/src/main/java/com/vincent/rsf/ai/gateway/service/AiGatewayService.java
@@ -9,7 +9,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/rsf-common/pom.xml b/rsf-common/pom.xml
index 1409cae..c3ca113 100644
--- a/rsf-common/pom.xml
+++ b/rsf-common/pom.xml
@@ -17,8 +17,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<gson.version>2.11.0</gson.version>
- <fastjson.version>1.2.58</fastjson.version>
- <mysql-driver.version>5.1.47</mysql-driver.version>
</properties>
<dependencies>
@@ -46,8 +44,8 @@
<artifactId>jedis</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>com.ibeetl</groupId>
@@ -56,21 +54,25 @@
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-driver.version}</version>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.1</version>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+ <version>3.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-jsqlparser</artifactId>
+ <version>3.5.12</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
- <version>3.4.1</version>
+ <version>3.5.12</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -113,27 +115,29 @@
<artifactId>aspectjweaver</artifactId>
<version>1.9.19</version> <!-- 鐢ㄤ簬缁囧叆鍒囬潰 -->
</dependency>
- <!-- swagger -->
+ <!-- openapi -->
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>3.0.2</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<!-- jjwt -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-api</artifactId>
+ <version>${jjwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
- <version>0.11.2</version>
+ <version>${jjwt.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
- <version>0.11.2</version>
+ <version>${jjwt.version}</version>
+ <scope>runtime</scope>
</dependency>
<!-- 鍥惧舰楠岃瘉鐮� -->
@@ -160,8 +164,8 @@
<!-- druid -->
<dependency>
<groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>1.2.6</version>
+ <artifactId>druid-spring-boot-3-starter</artifactId>
+ <version>${druid.version}</version>
</dependency>
</dependencies>
diff --git a/rsf-common/src/main/java/com/vincent/rsf/common/domain/BeanValidators.java b/rsf-common/src/main/java/com/vincent/rsf/common/domain/BeanValidators.java
index 7d69cc5..d521d5d 100644
--- a/rsf-common/src/main/java/com/vincent/rsf/common/domain/BeanValidators.java
+++ b/rsf-common/src/main/java/com/vincent/rsf/common/domain/BeanValidators.java
@@ -4,9 +4,9 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
import java.util.List;
import java.util.Map;
import java.util.Set;
diff --git a/rsf-framework/pom.xml b/rsf-framework/pom.xml
index 5d80a0f..797eb71 100644
--- a/rsf-framework/pom.xml
+++ b/rsf-framework/pom.xml
@@ -24,9 +24,8 @@
<version>${spring-framework.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.46</version>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java b/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
index ab7132d..fc0c317 100644
--- a/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
+++ b/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
@@ -258,7 +258,7 @@
}
switch (this.sqlOsType) {
case MYSQL:
- Class.forName("com.mysql.jdbc.Driver").newInstance();
+ Class.forName("com.mysql.cj.jdbc.Driver").newInstance();
conn = DriverManager.getConnection("jdbc:mysql://"+url, username, password);
this.columns = getMysqlColumns(conn, table, true, sqlOsType);
break;
diff --git a/rsf-framework/src/main/resources/templates/react-admin/Controller.txt b/rsf-framework/src/main/resources/templates/react-admin/Controller.txt
index 6fd136c..1b2f2ca 100644
--- a/rsf-framework/src/main/resources/templates/react-admin/Controller.txt
+++ b/rsf-framework/src/main/resources/templates/react-admin/Controller.txt
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-framework/src/main/resources/templates/react-antd/Controller.txt b/rsf-framework/src/main/resources/templates/react-antd/Controller.txt
index c26764a..3688630 100644
--- a/rsf-framework/src/main/resources/templates/react-antd/Controller.txt
+++ b/rsf-framework/src/main/resources/templates/react-antd/Controller.txt
@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/rsf-open-api/pom.xml b/rsf-open-api/pom.xml
index 06209de..a3440c6 100644
--- a/rsf-open-api/pom.xml
+++ b/rsf-open-api/pom.xml
@@ -26,18 +26,18 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
- <version>0.11.5</version>
+ <version>${jjwt.version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
- <version>0.11.5</version>
+ <version>${jjwt.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
- <version>0.11.5</version>
+ <version>${jjwt.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -96,4 +96,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/aspect/LogAspect.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/aspect/LogAspect.java
index e840774..ee69d6c 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/aspect/LogAspect.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/aspect/LogAspect.java
@@ -20,9 +20,9 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.rmi.NoSuchObjectException;
import java.util.*;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/ApiSecurityConfig.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/ApiSecurityConfig.java
index 54491fd..bb8d52e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/ApiSecurityConfig.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/ApiSecurityConfig.java
@@ -5,7 +5,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
/**
* API瀹夊叏閰嶇疆绫�
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java
index 3597e5f..66878be 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java
@@ -13,8 +13,8 @@
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* WebMvc閰嶇疆, 鎷︽埅鍣ㄣ�佽祫婧愭槧灏勭瓑閮藉湪姝ら厤缃�
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java
index b0bc64c..2d60053 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java
@@ -12,7 +12,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
/**
* App璁よ瘉鎺у埗鍣�
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/ApiAuthExampleController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/ApiAuthExampleController.java
index 15cb949..2774cf4 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/ApiAuthExampleController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/ApiAuthExampleController.java
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/AppAuthExampleController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/AppAuthExampleController.java
index 37d71ef..ac62a37 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/AppAuthExampleController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/AppAuthExampleController.java
@@ -9,7 +9,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* App璁よ瘉浣跨敤绀轰緥鎺у埗鍣�
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/TokenAuthExampleController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/TokenAuthExampleController.java
index a531bea..61396b4 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/TokenAuthExampleController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/example/TokenAuthExampleController.java
@@ -11,8 +11,8 @@
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
index 091ef44..ce11bbe 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
@@ -18,8 +18,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
index 7ed83fc..5a33cc2 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
@@ -19,7 +19,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java
index 48fe4df..f380b29 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java
@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@Accessors(chain = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/CheckOrder.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/CheckOrder.java
index 890e41a..24e648d 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/CheckOrder.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/CheckOrder.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import java.util.List;
@Data
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java
index ea7e8ee..7eb60fc 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Customer.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java
index d857df2..788c35a 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import java.util.List;
@Data
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrderItem.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrderItem.java
index d2eeea6..e29a85e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrderItem.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrderItem.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Material.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Material.java
index bf93123..cdd5b2d 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Material.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Material.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportList.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportList.java
index 9ac67a5..ffa9d27 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportList.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportList.java
@@ -8,8 +8,8 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
import java.util.List;
/**
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportOne.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportOne.java
index 9d25f98..5e9099e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportOne.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MesReportOne.java
@@ -7,8 +7,8 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
/**
* 鎵樼洏淇℃伅鍚屾璇锋眰
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Order.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Order.java
index 5b733f6..d2477e6 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Order.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Order.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import java.util.List;
@Data
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java
index d49c20f..5e6cc7d 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java
@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Pallet.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Pallet.java
index 4e0a1a7..86a27c4 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Pallet.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Pallet.java
@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Station.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Station.java
index 905ba38..661373e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Station.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Station.java
@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java
index 8692c00..1c12d27 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Supplier.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Task.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Task.java
index 89f65be..a5cf1f1 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Task.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Task.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java
index 84f1aa2..4b23043 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java
@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java
index 5d0cb68..36e9e02 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java
@@ -6,7 +6,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/filter/AppIdAuthenticationFilter.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/filter/AppIdAuthenticationFilter.java
index e8134e6..6e7d149 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/filter/AppIdAuthenticationFilter.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/filter/AppIdAuthenticationFilter.java
@@ -9,11 +9,11 @@
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
-import javax.annotation.Resource;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/service/AppAuthService.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/service/AppAuthService.java
index 68ba1f7..73d4ffc 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/service/AppAuthService.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/service/AppAuthService.java
@@ -5,7 +5,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
/**
* App璁よ瘉鏈嶅姟
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/AuthUtils.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/AuthUtils.java
index b946476..90630f5 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/AuthUtils.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/AuthUtils.java
@@ -3,7 +3,7 @@
import com.vincent.rsf.openApi.entity.constant.Constants;
import com.vincent.rsf.openApi.entity.app.App;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* 璁よ瘉宸ュ叿绫�
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/TokenUtils.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/TokenUtils.java
index cbadad0..a5cc3dc 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/TokenUtils.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/security/utils/TokenUtils.java
@@ -9,7 +9,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import javax.crypto.SecretKey;
import java.util.Date;
import java.util.Map;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
index 4d823a4..cac9cbd 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
@@ -34,8 +34,8 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
index ab1644b..f5a4dd7 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
@@ -23,8 +23,8 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.*;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/utils/Http.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/utils/Http.java
index 84fcf23..a0e7b2d 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/utils/Http.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/utils/Http.java
@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.openApi.entity.constant.Constants;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
/**
diff --git a/rsf-open-api/src/main/resources/application-prod.yml b/rsf-open-api/src/main/resources/application-prod.yml
index 2fa7e46..9c850fa 100644
--- a/rsf-open-api/src/main/resources/application-prod.yml
+++ b/rsf-open-api/src/main/resources/application-prod.yml
@@ -9,7 +9,7 @@
mvc:
static-path-pattern: /**
datasource:
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
diff --git a/rsf-open-api/src/main/resources/logback-spring.xml b/rsf-open-api/src/main/resources/logback-spring.xml
index 2f3a24d..c6b8254 100644
--- a/rsf-open-api/src/main/resources/logback-spring.xml
+++ b/rsf-open-api/src/main/resources/logback-spring.xml
@@ -52,12 +52,10 @@
<charset>UTF-8</charset> <!-- 璁剧疆瀛楃闆� -->
</encoder>
<!-- 鎸囧畾鏃ュ織璁板綍鍣ㄧ殑鎷嗗垎褰掓。绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- 鏃ュ織褰掓。 -->
<fileNamePattern>${logback.logdir}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
+ <maxFileSize>100MB</maxFileSize>
<!--鏃ュ織鏂囦欢淇濈暀澶╂暟-->
<maxHistory>15</maxHistory>
</rollingPolicy>
@@ -82,12 +80,10 @@
<charset>UTF-8</charset>
</encoder>
<!-- 鎸囧畾鏃ュ織璁板綍鍣ㄧ殑鎷嗗垎褰掓。绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- 姣忓ぉ鏃ュ織褰掓。璺緞浠ュ強鏍煎紡 -->
<fileNamePattern>${logback.logdir}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
+ <maxFileSize>100MB</maxFileSize>
<!--鏃ュ織鏂囦欢淇濈暀澶╂暟-->
<maxHistory>15</maxHistory>
</rollingPolicy>
@@ -112,11 +108,9 @@
<charset>UTF-8</charset> <!-- 姝ゅ璁剧疆瀛楃闆� -->
</encoder>
<!-- 鎸囧畾鏃ュ織璁板綍鍣ㄧ殑鎷嗗垎褰掓。绛栫暐 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${logback.logdir}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
+ <maxFileSize>100MB</maxFileSize>
<!--鏃ュ織鏂囦欢淇濈暀澶╂暟-->
<maxHistory>15</maxHistory>
</rollingPolicy>
@@ -142,11 +136,9 @@
<charset>UTF-8</charset> <!-- 姝ゅ璁剧疆瀛楃闆� -->
</encoder>
<!--鎸囧畾鏃ュ織璁板綍鍣ㄧ殑鎷嗗垎褰掓。绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${logback.logdir}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
+ <maxFileSize>100MB</maxFileSize>
<!--鏃ュ織鏂囦欢淇濈暀澶╂暟-->
<maxHistory>15</maxHistory>
</rollingPolicy>
@@ -212,4 +204,4 @@
<!--</root>-->
<!--</springProfile>-->
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/rsf-server/pom.xml b/rsf-server/pom.xml
index a7a359a..87d51aa 100644
--- a/rsf-server/pom.xml
+++ b/rsf-server/pom.xml
@@ -17,7 +17,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <mysql-driver.version>5.1.47</mysql-driver.version>
</properties>
<dependencies>
<dependency>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/config/AiSchemaGuard.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/config/AiSchemaGuard.java
index 89cc622..eb8a033 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/config/AiSchemaGuard.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/config/AiSchemaGuard.java
@@ -2,8 +2,8 @@
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/controller/AiController.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/controller/AiController.java
index 49322ec..1b1506a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/controller/AiController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/controller/AiController.java
@@ -25,7 +25,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiGatewayClient.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiGatewayClient.java
index 53c9066..6899022 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiGatewayClient.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiGatewayClient.java
@@ -6,7 +6,7 @@
import com.vincent.rsf.server.ai.dto.GatewayChatRequest;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiModelRouteRuntimeService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiModelRouteRuntimeService.java
index b57fe3d..7317d4f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiModelRouteRuntimeService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiModelRouteRuntimeService.java
@@ -7,7 +7,7 @@
import lombok.Data;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashSet;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiPromptRuntimeService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiPromptRuntimeService.java
index 3b9ae62..3880aeb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiPromptRuntimeService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiPromptRuntimeService.java
@@ -9,7 +9,7 @@
import com.vincent.rsf.server.system.service.AiPromptTemplateService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiRuntimeConfigService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiRuntimeConfigService.java
index bf3ce00..9470cf6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiRuntimeConfigService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiRuntimeConfigService.java
@@ -6,7 +6,7 @@
import lombok.Data;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiTextCompletionService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiTextCompletionService.java
index 4a54c31..6699206 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiTextCompletionService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/AiTextCompletionService.java
@@ -4,7 +4,7 @@
import com.vincent.rsf.server.ai.dto.GatewayChatRequest;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
@Service
public class AiTextCompletionService {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiChatStreamOrchestrator.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiChatStreamOrchestrator.java
index fd6386f..0a12a39 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiChatStreamOrchestrator.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiChatStreamOrchestrator.java
@@ -18,7 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.util.ArrayList;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisMcpRuntimeService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisMcpRuntimeService.java
index 618ccaf..8dc4cdd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisMcpRuntimeService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisMcpRuntimeService.java
@@ -15,7 +15,7 @@
import com.vincent.rsf.server.ai.service.mcp.AiMcpRegistryService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanRunnerService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanRunnerService.java
index 5521c9e..21abcc7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanRunnerService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanRunnerService.java
@@ -14,7 +14,7 @@
import com.vincent.rsf.server.system.service.AiDiagnosisPlanService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.InterruptedIOException;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanScheduler.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanScheduler.java
index 4c42617..4a52f10 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanScheduler.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisPlanScheduler.java
@@ -6,7 +6,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisRuntimeService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisRuntimeService.java
index 4b65367..4dfa850 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisRuntimeService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosisRuntimeService.java
@@ -7,7 +7,7 @@
import com.vincent.rsf.server.system.service.AiDiagnosisRecordService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.Date;
@Service
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosticToolService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosticToolService.java
index 0f5b788..4525963 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosticToolService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/diagnosis/AiDiagnosticToolService.java
@@ -11,7 +11,7 @@
import com.vincent.rsf.server.system.service.AiDiagnosticToolConfigService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiSessionServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiSessionServiceImpl.java
index f87fc84..673c8fe 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiSessionServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiSessionServiceImpl.java
@@ -9,8 +9,8 @@
import com.vincent.rsf.server.ai.service.AiSessionService;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpHttpClient.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpHttpClient.java
index 9e662d5..c75ac0d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpHttpClient.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpHttpClient.java
@@ -8,7 +8,7 @@
import com.vincent.rsf.server.system.entity.AiMcpMount;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpPayloadMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpPayloadMapper.java
index f2725f2..1a495e3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpPayloadMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpPayloadMapper.java
@@ -9,7 +9,7 @@
import com.vincent.rsf.server.system.entity.AiMcpMount;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpProtocolService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpProtocolService.java
index 40922f4..d5fd036 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpProtocolService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpProtocolService.java
@@ -8,7 +8,7 @@
import com.vincent.rsf.server.ai.model.AiPromptContext;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpRegistryService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpRegistryService.java
index d4819eb..87ea316 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpRegistryService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpRegistryService.java
@@ -13,7 +13,7 @@
import com.vincent.rsf.server.system.service.AiMcpMountService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpSseClient.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpSseClient.java
index b987332..24c9d8a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpSseClient.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/mcp/AiMcpSseClient.java
@@ -10,7 +10,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiApiFailureSummaryService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiApiFailureSummaryService.java
index fdc0cd7..8e9ecc9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiApiFailureSummaryService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiApiFailureSummaryService.java
@@ -7,7 +7,7 @@
import com.vincent.rsf.server.system.service.AiCallLogService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiDeviceSiteSummaryService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiDeviceSiteSummaryService.java
index 152b5eb..a85398e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiDeviceSiteSummaryService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiDeviceSiteSummaryService.java
@@ -7,7 +7,7 @@
import com.vincent.rsf.server.manager.mapper.DeviceSiteMapper;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiOperationRecordSummaryService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiOperationRecordSummaryService.java
index 97202cf..fad2db3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiOperationRecordSummaryService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiOperationRecordSummaryService.java
@@ -7,7 +7,7 @@
import com.vincent.rsf.server.system.service.OperationRecordService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiTaskSummaryService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiTaskSummaryService.java
index 4c2f2ca..d144572 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiTaskSummaryService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiTaskSummaryService.java
@@ -9,7 +9,7 @@
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.*;
@Service
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiWarehouseSummaryService.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiWarehouseSummaryService.java
index 7bad7c1..1ecfa0a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiWarehouseSummaryService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/provider/AiWarehouseSummaryService.java
@@ -9,7 +9,7 @@
import com.vincent.rsf.server.manager.mapper.LocMapper;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
index d32c428..1f825d1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
@@ -19,8 +19,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
index b8bbb40..2da9d5b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
@@ -7,7 +7,7 @@
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
index 22f2bb7..a51c568 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
@@ -9,8 +9,8 @@
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java
index 0f8273e..c9bf70d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java
@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/AiMcpProtocolController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/AiMcpProtocolController.java
index f72725e..2abfe38 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/AiMcpProtocolController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/AiMcpProtocolController.java
@@ -10,7 +10,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
@RestController
@RequestMapping("/ai/mcp")
public class AiMcpProtocolController extends BaseController {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
index c6bf48c..5879f50 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
@@ -25,7 +25,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Date;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
index 9573cff..6353e1e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
@@ -16,7 +16,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
@Api(tags = "PDA鍏ュ簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index 98ed29c..ecf2739 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -24,7 +24,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.util.Objects;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index 1633053..9c4bdaa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -29,7 +29,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
index faf35ad..062c3a0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 18e18b1..df1b4d5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -13,7 +13,7 @@
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.entity.User;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index ed89c58..6116334 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -38,8 +38,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 5327f6f..928f371 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -24,7 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 7fa47c6..026b9bb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -21,9 +21,9 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
-import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.PurchaseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -61,7 +61,7 @@
@Autowired
private RemotesInfoProperties remotesInfoProperties;
@Autowired
- private AsnOrderService asnOrderService;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
@@ -160,13 +160,13 @@
//ASN鏄庣粏鍗曟嵁鍒嗙粍
Map<Long, List<WkOrderItem>> asnIds = wkOrderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getOrderId));
ids.forEach(id -> {
- int count = asnOrderService.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id));
+ long count = Optional.ofNullable(asnOrderMapper.selectCount(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id))).orElse(0L);
if (count == asnIds.get(id).size()) {
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 1))) {
+ if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 1)) <= 0) {
throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
} else {
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 2))) {
+ if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 2)) <= 0) {
throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index ee305da..c82f047 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -27,6 +27,7 @@
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.api.utils.SlaveProperties;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.mapper.LocItemMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -67,7 +68,7 @@
@Autowired
private LocServiceImpl locService;
@Autowired
- private LocItemService locItemService;
+ private LocItemMapper locItemMapper;
@Autowired
private SlaveProperties slaveProperties;
@Autowired
@@ -694,7 +695,7 @@
//鍏ュ簱闈犺繎鎽嗘斁
if (ioType == 1 && deviceBind.getBeSimilar().equals("1") && !Cools.isEmpty(matnr) && Cools.isEmpty(orgLoc)) {
if (nearRow != curRow) {
- List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getMatnrCode, matnr));
+ List<LocItem> locItems = locItemMapper.selectList(new LambdaQueryWrapper<LocItem>().eq(LocItem::getMatnrCode, matnr));
for (LocItem locItem : locItems) {
Loc loc1 = locService.getById(locItem.getLocId());
if (LocUtils.isShallowLoc(loc1.getCode())) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
index f842215..8557a37 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
@@ -16,7 +16,7 @@
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java
index eb6ed83..9e84cde 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java
@@ -18,9 +18,9 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Date;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
index 916a558..9457271 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
@@ -1,105 +1,36 @@
package com.vincent.rsf.server.common.config;
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-import io.swagger.annotations.Api;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.BeanPostProcessor;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
-import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.stream.Collectors;
-
@Configuration
-@EnableKnife4j
-@EnableOpenApi
public class SwaggerConfig {
- @Value("${spring.profiles.active}")
- private String active;
-
@Bean
- public Docket docket() {
- Docket docket = new Docket(DocumentationType.OAS_30)
- .apiInfo(apiInfo())
- .enable("dev".equals(active))
- .groupName("娴嬭瘯鍒嗙粍")
- .select()
- //apis锛� 娣诲姞swagger鎺ュ彛鎻愬彇鑼冨洿
- .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
- .paths(PathSelectors.any())
- .build();
-
- return docket;
+ public OpenAPI openAPI() {
+ return new OpenAPI()
+ .info(new Info()
+ .title("WMS鏍囩増1.0鐗堟湰鎺ュ彛鏂囨。")
+ .description("WMS鏍囩増1.0鐗堟湰鎺ュ彛鏂囨。,鎶�鏈爤涓昏鍖呮嫭锛歋pringBoot銆丷eact.js銆丮ySQL5.7")
+ .version("v1.0"));
}
@Bean
- public Docket erpDocket() {
- Docket docket = new Docket(DocumentationType.OAS_30)
- .apiInfo(apiInfo())
- .enable("dev".equals(active))
- .groupName("ERP鎺ュ彛瀵规帴")
- .select()
- .apis(RequestHandlerSelectors.basePackage("com.vincent.rsf.server.api.controller.erp"))
- .paths(PathSelectors.any())
- .build();
-
- return docket;
- }
-
- private ApiInfo apiInfo() {
- return new ApiInfoBuilder()
- .title("WMS鏍囩増1.0鐗堟湰鎺ュ彛鏂囨。")
- .description("WMS鏍囩増1.0鐗堟湰鎺ュ彛鏂囨。,鎶�鏈爤涓昏鍖呮嫭锛歋pringBoot銆丷eact.js銆丮ySQL5.7")
- .version("v1.0")
+ public GroupedOpenApi defaultApi() {
+ return GroupedOpenApi.builder()
+ .group("娴嬭瘯鍒嗙粍")
+ .pathsToMatch("/**")
.build();
}
@Bean
- public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
- return new BeanPostProcessor() {
-
- @Override
- public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
- customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
- }
- return bean;
- }
-
- private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
- List<T> copy = mappings.stream()
- .filter(mapping -> mapping.getPatternParser() == null)
- .collect(Collectors.toList());
- mappings.clear();
- mappings.addAll(copy);
- }
-
- @SuppressWarnings("unchecked")
- private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
- try {
- Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
- field.setAccessible(true);
- return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- throw new IllegalStateException(e);
- }
- }
- };
+ public GroupedOpenApi erpApi() {
+ return GroupedOpenApi.builder()
+ .group("ERP鎺ュ彛瀵规帴")
+ .packagesToScan("com.vincent.rsf.server.api.controller.erp")
+ .build();
}
-
}
-
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java
index cdae76a..0a515d2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java
@@ -10,8 +10,8 @@
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* WebMvc閰嶇疆, 鎷︽埅鍣ㄣ�佽祫婧愭槧灏勭瓑閮藉湪姝ら厤缃�
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
index 615ded5..8e69215 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
@@ -1,7 +1,5 @@
package com.vincent.rsf.server.common.constant;
-import io.swagger.models.auth.In;
-
/**
* 绯荤粺甯搁噺
* Created by vincent on 2019-10-29 15:55
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
index 329e27c..575973d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
@@ -12,7 +12,7 @@
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.*;
@@ -331,7 +331,7 @@
continue;
}
boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
- orders.add(new OrderItem(column, asc));
+ orders.add(asc ? OrderItem.asc(column) : OrderItem.desc(column));
}
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
index ac0c443..558bec6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/JwtAuthenticationFilter.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/JwtAuthenticationFilter.java
index ef1c726..87556dc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/JwtAuthenticationFilter.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/JwtAuthenticationFilter.java
@@ -20,11 +20,11 @@
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
-import javax.annotation.Resource;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/PasswordEncoderConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/PasswordEncoderConfig.java
new file mode 100644
index 0000000..15e1539
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/PasswordEncoderConfig.java
@@ -0,0 +1,15 @@
+package com.vincent.rsf.server.common.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class PasswordEncoderConfig {
+
+ @Bean
+ public PasswordEncoder passwordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
index ff2aaae..d38b9be 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
@@ -6,22 +6,20 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.access.AccessDeniedHandler;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
import java.io.IOException;
/**
@@ -30,8 +28,8 @@
*/
@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
+@EnableMethodSecurity(prePostEnabled = true)
+public class SecurityConfig {
public static final String[] FILTER_PATH = new String[] {
"/demo/**",
@@ -68,41 +66,26 @@
@Resource
private JwtAuthenticationFilter jwtAuthenticationFilter;
- @Override
- protected void configure(HttpSecurity http) throws Exception {
- http.authorizeRequests()
- .antMatchers(HttpMethod.OPTIONS, "/**")
- .permitAll()
- .antMatchers(HttpMethod.GET, "/file/**", "/captcha", "/")
- .permitAll()
- .antMatchers(FILTER_PATH)
- .permitAll()
- .anyRequest()
- .authenticated()
- .and()
- .sessionManagement()
- .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
- .and()
- .csrf()
- .disable()
- .cors()
- .and()
- .logout()
- .disable()
- .headers()
- .frameOptions()
- .disable()
- .and()
- .exceptionHandling()
- .accessDeniedHandler(jwtAccessDeniedHandler)
- .authenticationEntryPoint(jwtAuthenticationEntryPoint)
- .and()
- .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
- }
-
@Bean
- public BCryptPasswordEncoder bCryptPasswordEncoder() {
- return new BCryptPasswordEncoder();
+ public SecurityFilterChain securityFilterChain(org.springframework.security.config.annotation.web.builders.HttpSecurity http)
+ throws Exception {
+ http.authorizeHttpRequests(authorize -> authorize
+ .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+ .requestMatchers(HttpMethod.GET, "/file/**", "/captcha", "/").permitAll()
+ .requestMatchers(FILTER_PATH).permitAll()
+ .anyRequest().authenticated())
+ .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .csrf(csrf -> csrf.disable())
+ .cors(cors -> {
+ })
+ .logout(logout -> logout.disable())
+ .headers(headers -> headers.frameOptions(frameOptions -> frameOptions.disable()))
+ .exceptionHandling(exceptionHandling -> exceptionHandling
+ .accessDeniedHandler(jwtAccessDeniedHandler)
+ .authenticationEntryPoint(jwtAuthenticationEntryPoint))
+ .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+
+ return http.build();
}
// 娌℃湁璁块棶鏉冮檺寮傚父澶勭悊
@@ -112,6 +95,9 @@
@Override
public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException e)
throws IOException, ServletException {
+ if (response.isCommitted()) {
+ return;
+ }
CommonUtil.responseError(response, Constants.UNAUTHORIZED_CODE, Constants.UNAUTHORIZED_MSG, e.getMessage());
}
@@ -124,6 +110,9 @@
@Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
throws IOException, ServletException {
+ if (response.isCommitted()) {
+ return;
+ }
CommonUtil.responseError(response, Constants.UNAUTHENTICATED_CODE, Constants.UNAUTHENTICATED_MSG,
e.getMessage());
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java
index 87baa42..dfd01c5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/service/EmailService.java
@@ -12,8 +12,8 @@
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/service/RedisService.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/service/RedisService.java
index b145893..d6c0af5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/service/RedisService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/service/RedisService.java
@@ -50,7 +50,7 @@
try{
Jedis jedis = this.getPool().getResource();
- if(this.index != jedis.getDB().intValue()) {
+ if(this.index != jedis.getDB()) {
jedis.select(this.index);
}
return jedis;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java
index 2a7f9e2..b2efc35 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/CommonUtil.java
@@ -4,7 +4,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.constant.Constants;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -162,7 +162,14 @@
* @param error 閿欒淇℃伅
*/
public static void responseError(HttpServletResponse response, Integer code, String message, String error) {
+ if (response.isCommitted()) {
+ return;
+ }
+ response.resetBuffer();
+ response.setStatus(code);
+ response.setCharacterEncoding("UTF-8");
response.setContentType("application/json;charset=UTF-8");
+ addCrossHeaders(response);
try {
PrintWriter out = response.getWriter();
out.write(JSON.toJSONString(R.parse(code + "-" + message)));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
index 8b45899..8d81944 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
@@ -16,7 +16,7 @@
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FileServerUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FileServerUtil.java
index 548949c..6ba81c3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FileServerUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FileServerUtil.java
@@ -5,8 +5,8 @@
import org.apache.tika.Tika;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URLEncoder;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/Http.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/Http.java
index ce20b61..4e38183 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/Http.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/Http.java
@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.constant.Constants;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/IpTools.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/IpTools.java
index 927049d..d0a9ad6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/IpTools.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/IpTools.java
@@ -3,7 +3,7 @@
import com.vincent.rsf.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/JwtUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/JwtUtil.java
index 709d1a7..5493bd6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/JwtUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/JwtUtil.java
@@ -12,7 +12,7 @@
import io.jsonwebtoken.io.Encoders;
import io.jsonwebtoken.security.Keys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Key;
import java.util.Date;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java
index 7d3edb4..bc27793 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
index 3ba06c9..fcf243d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
index 1ba4d16..3846664 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
index c91ae3c..fafc96a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
index 5889103..68e7977 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
@@ -19,7 +19,7 @@
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BatchRegularController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BatchRegularController.java
index b08f2df..4e57ecd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BatchRegularController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BatchRegularController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffController.java
index 2ddfcb1..6155f93 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java
index ba5b385..4108af5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java
@@ -25,7 +25,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
index 0890885..bd78f87 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
@@ -28,7 +28,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index c4953c2..6bd99c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -21,7 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
index 49cbae8..b802114 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "寰�鏉ヤ紒涓�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
index d8ccf27..266bc21 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContractController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContractController.java
index bf91371..ac72305 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContractController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContractController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CustomerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CustomerController.java
index 8359c27..9dba8bb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CustomerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CustomerController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
index 111d74b..eb9a3c1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
@@ -33,7 +33,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
index 8d63180..1297352 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
@@ -30,7 +30,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java
index 579e7be..f13fe43 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceBindController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
index e57c73f..8f1c9d8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
@@ -24,7 +24,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/IsptHistoriesController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/IsptHistoriesController.java
index d8ca91c..fd0e44c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/IsptHistoriesController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/IsptHistoriesController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
index 3c13d20..e852561 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
index c1be3fc..cadefed 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "閫昏緫鍒嗗尯")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
index b031261..38e583e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
@@ -21,7 +21,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "搴撳尯鐗╂枡鍏崇郴缁戝畾")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
index 8f9e08b..7e99b1c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index e1cf247..70342d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -25,8 +25,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
index 7acbc81..f63ab4c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
@@ -27,7 +27,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java
index 9dae6b5..9752c14 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java
@@ -24,7 +24,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemWorkingController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemWorkingController.java
index a1478a7..8bd7e03 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemWorkingController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemWorkingController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
index 4952088..5c18563 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
@@ -23,7 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
index 7a4bb36..47f14bb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api("搴撳瓨璋冩暣鍗�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
index b273c77..f581a5c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
@@ -20,7 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "搴撲綅绫诲瀷")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeRelaController.java
index 09a366d..f7d19a8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeRelaController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
index cab6c7b..da3ab23 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
@@ -39,8 +39,8 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 2067080..c3b3557 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -27,7 +27,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index ff0cb65..52de614 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
index 2672972..e3e6a1b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
index 9d4c3a2..f2c7585 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -39,7 +39,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
index 457352c..fdbe4aa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
@@ -29,7 +29,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "鍑哄簱鍗曟槑缁�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
index ae34794..46cca17 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
@@ -25,7 +25,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseItemController.java
index 4f48be8..382449b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseItemController.java
@@ -20,7 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index dcff993..b45e11a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -27,7 +27,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Slf4j
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
index 74771cf..6131b6b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
@@ -23,7 +23,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "璐ㄦ鏄庣粏")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
index d371601..05140dd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogController.java
@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
index a14eab1..08afb30 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ReviseLogItemController.java
@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api("搴撳瓨璋冩暣鍘嗗彶")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java
index f20b179..6aa3adb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java
@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "璐т富")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
index 8f9ad32..16ada28 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "搴撳瓨淇℃伅")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
index cf40d82..bac70cc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "搴撳瓨鏄庣粏")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
index 365e798..7e8b86a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 1180e8e..4555699 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -27,7 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
index b9bbd68..4f45f25 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java
index 908568e..554dfb0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
index 6d6ec3a..b20f712 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java
index 9a2c374..162973e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java
@@ -26,7 +26,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api("璋冩嫈鍗�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferItemController.java
index d80f348..d20304f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferItemController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferOrderController.java
index b4be6ee..5e8accc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferOrderController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 7327dc6..ae8f987 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -26,7 +26,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
index 98d2963..4de3d07 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "缁勬嫋妗ｆ槑缁�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java
index bda2e6e..1381f7e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java
index 29d85bd..ca2dcf2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
index 0f52118..0f18db4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "浠撳簱搴撳尯")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index 51fa55c..f468a2d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -20,7 +20,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "搴撳尯搴撳瓨鏄庣粏")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index 123a6a8..24421bd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -22,7 +22,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "浠撳簱")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
index bb74603..3b47ed5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
@@ -32,7 +32,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
index 7c93adc..5058e62 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
index 8ffaf90..bd92063 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
index abd2969..eea1e6b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveRuleController.java
@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveSowItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveSowItemController.java
index 9904cc4..213eaa1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveSowItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveSowItemController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
index a10147c..59b6188 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
@@ -36,7 +36,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index c21ac86..91b3014 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -33,8 +33,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java
index 9ee2d9f..08b7c9b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java
@@ -4,8 +4,8 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index bb7b249..f28af94 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -114,7 +114,7 @@
* 鏉＄爜
*/
@ApiModelProperty(value = "鏉＄爜")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
private String barcode;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
index 624f1e2..c249379 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
@@ -110,7 +110,7 @@
* 鏉＄爜
*/
@ApiModelProperty(value = "鏉＄爜")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
private String barcode;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
index 3c3945e..d15d185 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
@@ -3,7 +3,7 @@
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment;
import cn.afterturn.easypoi.excel.annotation.Excel;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import lombok.experimental.Accessors;
import lombok.Data;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index 2b365c7..4b8227f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -22,7 +22,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
index b9eb2df..624248d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
@@ -202,7 +202,7 @@
}
//鏌ヨ缁堢偣鏄惁闇�瑕佽ˉ鍏呮瀹瑰櫒
String barcodeType = "barcode REGEXP '"+basContainer.getCodeType()+"'";
- int count = locService.count(new LambdaQueryWrapper<Loc>()
+ long count = locService.count(new LambdaQueryWrapper<Loc>()
.apply(barcodeType)
.in(Loc::getUseStatus, new ArrayList<>(Arrays.asList(
LocStsType.LOC_STS_TYPE_D.type,
@@ -213,7 +213,7 @@
.eq(Loc::getStatus, 1)
.orderByDesc(Loc::getId));
if (!Cools.isEmpty(count) && count<autoOutCount){
- CONTAINER_IDS.put(barcodeType, autoOutCount-count);
+ CONTAINER_IDS.put(barcodeType, Math.toIntExact(autoOutCount - count));
}
}
} catch (Exception e){
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index ec25964..93e5287 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -23,10 +23,10 @@
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -50,7 +50,7 @@
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements AsnOrderItemService {
@Autowired
- private AsnOrderService asnOrderMapper;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
private FieldsService fieldsService;
@@ -61,15 +61,10 @@
private MatnrService matnrService;
@Autowired
- private AsnOrderItemService asnOrderItemService;
-
- @Autowired
private CompanysService companysService;
@Autowired
private DictDataService dictDataService;
- @Autowired
- private AsnOrderService asnOrderService;
@Override
public R generateBarcode(List<Long> orders) {
@@ -109,7 +104,7 @@
throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
- WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
+ WkOrder order = asnOrderMapper.selectOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
if (!Objects.isNull(order)) {
sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�");
throw new CoolException(sbFaild.toString());
@@ -138,7 +133,7 @@
.setCreateBy(loginUserId)
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
- if (!asnOrderMapper.save(order)) {
+ if (asnOrderMapper.insert(order) <= 0) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<WkOrderItem> items = new ArrayList<>();
@@ -200,17 +195,17 @@
}
items.add(orderItem);
- if (!asnOrderItemService.save(orderItem)) {
+ if (!this.save(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
}
}
if (!items.isEmpty()) {
// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
double anfme = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
- if (!asnOrderMapper.update(new LambdaUpdateWrapper<WkOrder>()
+ if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>()
// .set(AsnOrder::getQty, qty)
.set(WkOrder::getAnfme, anfme)
- .eq(WkOrder::getId, order.getId()))) {
+ .eq(WkOrder::getId, order.getId())) <= 0) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
@@ -252,7 +247,7 @@
wkOrderItem.setId(originalId);
wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName());
- WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString()));
+ WkOrder wkOrder = asnOrderMapper.selectById(Long.parseLong(params.get("orderId").toString()));
if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛屽崟鎹笉瀛樺湪锛侊紒");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
index a6e2119..9afaedf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
@@ -7,13 +7,13 @@
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderLogMapper;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.AsnOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
- private AsnOrderService asnOrderService;
+ private AsnOrderMapper asnOrderMapper;
/**
* @author Ryan
* @description 缁х画鏀惰揣
@@ -52,12 +52,12 @@
.setDeleted(0)
.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
- WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode()));
+ WkOrder wkOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode()));
if (!Objects.isNull(wkOrder)) {
throw new CoolException("鏀惰揣鍗曟嵁宸叉坊鍔狅紝鍒锋柊鍚庡啀鎿嶄綔锛侊紒");
}
- if (!asnOrderService.saveOrUpdate(order)) {
+ if (asnOrderMapper.insert(order) <= 0) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<AsnOrderItemLog> itemLogs = asnOrderItemLogService
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 4508bcd..6f1592b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -7,7 +7,6 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
-import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.controller.dto.DashboardDto;
@@ -18,6 +17,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
+import com.vincent.rsf.server.manager.mapper.TaskMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -29,7 +29,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.text.DateFormat;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
@@ -46,8 +46,6 @@
@Service("asnOrderService")
public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements AsnOrderService {
- @Autowired
- private ReceiveMsgService receiveMsgService;
@Autowired
private ReportMsgService reportMsgService;
@@ -66,9 +64,7 @@
@Autowired
private PurchaseItemService purchaseItemService;
@Autowired
- private AsnOrderService asnOrderService;
- @Autowired
- private TaskService taskService;
+ private TaskMapper taskMapper;
@Override
public boolean notifyInspect(List<WkOrder> orders) {
@@ -426,7 +422,7 @@
dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());
//鑾峰彇鎵ц涓换鍔℃暟閲�
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<>());
+ List<Task> tasks = taskMapper.selectList(new LambdaQueryWrapper<>());
if (!tasks.isEmpty()) {
dto.setTaskQty(tasks.size());
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index 9b371cd..aadcdc3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -45,8 +45,6 @@
private LocServiceImpl locService;
@Autowired
private TaskItemServiceImpl taskItemService;
- @Autowired
- private CheckOrderService checkOrderService;
/**
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java
index 0a64954..5557492 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeliveryItemServiceImpl.java
@@ -11,11 +11,11 @@
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.DeliveryTemplate;
import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.manager.mapper.DeliveryMapper;
import com.vincent.rsf.server.manager.mapper.DeliveryItemMapper;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.DeliveryItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.DeliveryService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -34,14 +34,11 @@
public class DeliveryItemServiceImpl extends ServiceImpl<DeliveryItemMapper, DeliveryItem> implements DeliveryItemService {
@Autowired
- private DeliveryService deliveryService;
+ private DeliveryMapper deliveryMapper;
@Autowired
private MatnrService matnrService;
@Autowired
private CompanysService companysService;
- @Autowired
- private DeliveryItemService deliveryItemService;
-
/**
* excel DO鍗曞鍏�
*
@@ -65,7 +62,7 @@
throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
DeliveryTemplate template = listMap.get(key).stream().findFirst().get();
- Delivery order = deliveryService.getOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, key));
+ Delivery order = deliveryMapper.selectOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, key));
if (!Objects.isNull(order)) {
sbFaild.append(template.getDoCode()).append(",宸叉坊鍔狅紒锛�");
throw new CoolException(sbFaild.toString());
@@ -93,7 +90,7 @@
.setAnfme(Double.parseDouble(template.getAnfme()))
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId);
- if (!deliveryService.save(order)) {
+ if (deliveryMapper.insert(order) <= 0) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<DeliveryItem> items = new ArrayList<>();
@@ -148,15 +145,15 @@
}
items.add(orderItem);
- if (!deliveryItemService.save(orderItem)) {
+ if (!this.save(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
}
}
if (!items.isEmpty()) {
Double anfme = items.stream().mapToDouble(DeliveryItem::getAnfme).sum();
- if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
+ if (deliveryMapper.update(null, new LambdaUpdateWrapper<Delivery>()
.set(Delivery::getAnfme, anfme)
- .eq(Delivery::getId, order.getId()))) {
+ .eq(Delivery::getId, order.getId())) <= 0) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 64ef61b..2bdd486 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -12,7 +12,10 @@
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.LocItemMapper;
+import com.vincent.rsf.server.manager.mapper.TaskMapper;
+import com.vincent.rsf.server.manager.mapper.WaveMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -23,6 +26,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,19 +41,18 @@
@Autowired
private LocService locService;
@Autowired
- private TaskService taskService;
+ private TaskMapper taskMapper;
@Autowired
private TaskItemService taskItemService;
@Autowired
- private LocItemService locItemService;
- @Autowired
private DeviceSiteService deviceSiteService;
@Autowired
+ @Lazy
private WcsService wcsService;
@Autowired
- private OutStockService outStockService;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
- private WaveService waveService;
+ private WaveMapper waveMapper;
@Autowired
private BasStationService basStationService;
@Autowired
@@ -122,7 +125,7 @@
throw new CoolException("绌哄鍣ㄥ嚭搴擄紒锛佸叾浠栫被鍨嬫棤鏁堬紝杩涘叆绫诲瀷锛�"+map.getType());
}
- if (!taskService.save(task)) {
+ if (taskMapper.insert(task) <= 0) {
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
}
@@ -155,10 +158,10 @@
if (!Objects.isNull(map.getSourceId())) {
if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
order = new WkOrder();
- wave = waveService.getById(map.getSourceId());
+ wave = waveMapper.selectById(map.getSourceId());
} else {
wave = new Wave();
- order = outStockService.getById(map.getSourceId());
+ order = asnOrderMapper.selectById(map.getSourceId());
}
} else {
wave = new Wave();
@@ -258,7 +261,7 @@
task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
}
- if (!taskService.save(task)) {
+ if (taskMapper.insert(task) <= 0) {
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
@@ -286,11 +289,11 @@
if (!Objects.isNull(moveTask.getId())) {
moveTask.setParentId(task.getId()).setSort(moveTask.getSort() + 1);
- if (!taskService.saveOrUpdate(moveTask)) {
+ if ((Objects.isNull(moveTask.getId()) ? taskMapper.insert(moveTask) : taskMapper.updateById(moveTask)) <= 0) {
throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
}
task.setParentId(moveTask.getId());
- if (!taskService.updateById(task)) {
+ if (taskMapper.updateById(task) <= 0) {
throw new CoolException("涓讳换鍔″叧鑱斿け璐ワ紒锛�");
}
}
@@ -327,7 +330,7 @@
taskItems.add(taskItem);
Double qty = Math.round((item.getWorkQty() + item.getOutQty()) * 10000) / 10000.0;
- LocItem locItem = locItemService.getById(item.getId());
+ LocItem locItem = this.getById(item.getId());
if (Objects.isNull(locItem)) {
throw new CoolException("搴撳瓨淇℃伅涓嶅瓨鍦紒");
}
@@ -344,7 +347,7 @@
}
item.setUpdateBy(loginUserId).setUpdateTime(new Date());
- if (!locItemService.updateById(item)) {
+ if (!this.updateById(item)) {
throw new CoolException("搴撳瓨淇℃伅淇敼澶辫触锛侊紒");
}
@@ -510,11 +513,11 @@
.setBarcode(orgLoc.getBarcode())
.setMemo(map.getMemo());
- if (!taskService.save(task)) {
+ if (taskMapper.insert(task) <= 0) {
throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
}
- List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
+ List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
if (!locItems.isEmpty()) {
List<TaskItem> taskItems = new ArrayList<>();
for (LocItem item : locItems) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index 3bc2a89..f15800f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -42,9 +42,6 @@
private LocAreaService locAreaService;
@Autowired
private LocTypeRelaMapper locTypeRelaMapper;
- @Autowired
- private LocService locService;
-
@Override
public R modifyLocs(LocModifyParams locs) {
if (locs.getId().isEmpty()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
index 3e8dd93..367fd19 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
@@ -22,10 +22,10 @@
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.Matnr;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
-import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -48,11 +48,9 @@
public class OutStockItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements OutStockItemService {
@Autowired
- private OutStockService outStockService;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
private MatnrService matnrService;
- @Autowired
- private OutStockItemService outStockItemService;
/**
* @param
@@ -107,7 +105,7 @@
Map<String, List<OutStockTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(OutStockTemplate::getCode));
for (String key : listMap.keySet()) {
OutStockTemplate template = listMap.get(key).stream().findFirst().get();
- WkOrder wkOrder = outStockService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode()));
+ WkOrder wkOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode()));
if (!Objects.isNull(wkOrder)) {
continue;
}
@@ -119,7 +117,7 @@
.setCreateBy(loginUserId)
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
- if (!outStockService.save(order)) {
+ if (asnOrderMapper.insert(order) <= 0) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<WkOrderItem> items = new ArrayList<>();
@@ -143,15 +141,15 @@
orderItem.setMaktx(matnr.getName()).setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
}
items.add(orderItem);
- if (!outStockItemService.saveBatch(items)) {
+ if (!this.saveBatch(items)) {
throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
}
}
if (!items.isEmpty()) {
double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
- if (!outStockService.update(new LambdaUpdateWrapper<WkOrder>()
+ if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>()
.set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) {
+ .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId())) <= 0) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 26d7550..1cecd7f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -67,8 +67,6 @@
@Autowired
private OutStockItemService outStockItemService;
@Autowired
- private OutStockService outStockService;
- @Autowired
private WaveRuleService waveRuleService;
@Autowired
private LocItemService locItemService;
@@ -633,7 +631,7 @@
return LocUtils.isShallowLoc(item.getLocCode()) ? 1 : 0;
}).reversed()).collect(Collectors.toList());
- WkOrder wkOrder = outStockService.getById(outId);
+ WkOrder wkOrder = this.getById(outId);
if (Cools.isEmpty(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -729,7 +727,7 @@
Double sum = itemList.stream().mapToDouble(OutStockToTaskParams::getOutQty).sum();
//鏇存柊鍑哄簱鍗曟槑缁嗗強涓诲崟
- WkOrder outOrder = outStockService.getById(outId);
+ WkOrder outOrder = this.getById(outId);
if (Objects.isNull(outOrder)) {
throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -737,7 +735,7 @@
outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val);
- if (!outStockService.updateById(outOrder)) {
+ if (!this.updateById(outOrder)) {
throw new CoolException("鍑哄簱鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index ccf2f5b..0f1d5f6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -10,10 +10,10 @@
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
+import com.vincent.rsf.server.manager.mapper.QlyInspectMapper;
import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.QlyInspectResultService;
-import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
@@ -31,14 +31,12 @@
public class QlyIsptItemServiceImpl extends ServiceImpl<QlyIsptItemMapper, QlyIsptItem> implements QlyIsptItemService {
@Autowired
- private QlyInspectService qlyInspectService;
+ private QlyInspectMapper qlyInspectMapper;
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
private QlyInspectResultService qlyInspectResultService;
- @Autowired
- private QlyIsptItemService qlyIsptItemService;
@Autowired
private WarehouseAreasItemServiceImpl warehouseAreasItemService;
@Autowired
@@ -103,7 +101,7 @@
Double isptQty = isptRelt.stream().mapToDouble(QlyInspectResult::getAnfme).sum();
- if (!qlyIsptItemService.update(new LambdaUpdateWrapper<QlyIsptItem>()
+ if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>()
.set(QlyIsptItem::getUpdateBy, loginUserId)
.set(QlyIsptItem::getAnfme, isptQty)
.eq(QlyIsptItem::getId, item.getId()))) {
@@ -139,7 +137,7 @@
.in(QlyInspectResult::getIsptId, isptIds));
Double sum = items.stream().mapToDouble(QlyInspectResult::getAnfme).sum();
if (sum.compareTo(0.00) > 0) {
- qlyInspectService.update(new LambdaUpdateWrapper<QlyInspect>()
+ qlyInspectMapper.update(null, new LambdaUpdateWrapper<QlyInspect>()
.set(QlyInspect::getIsptQty, sum)
.set(QlyInspect::getUpdateBy, loginUserId)
.eq(QlyInspect::getId, isptItem.stream().findFirst().get().getIspectId()));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java
index 96e8de7..31eeb9d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java
@@ -2,11 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.ReviseLogItemParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CommonExceStatus;
+import com.vincent.rsf.server.manager.mapper.ReviseLogMapper;
import com.vincent.rsf.server.manager.mapper.ReviseLogItemMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,13 +22,11 @@
public class ReviseLogItemServiceImpl extends ServiceImpl<ReviseLogItemMapper, ReviseLogItem> implements ReviseLogItemService {
@Autowired
- private ReviseLogService reviseLogService;
+ private ReviseLogMapper reviseLogMapper;
@Autowired
private LocItemService locItemService;
@Autowired
private LocService locService;
- @Autowired
- private ReviseLogItemService reviseLogItemService;
@Autowired
private LocReviseService locReviseService;
@@ -43,7 +40,7 @@
@Override
@Transactional(timeout = 60, rollbackFor = Exception.class)
public List<ReviseLogItem> itemSave(ReviseLogItemParams reviseLogItem, Long userId) {
- ReviseLog reviseLog = reviseLogService.getById(reviseLogItem.getReviseLogId());
+ ReviseLog reviseLog = reviseLogMapper.selectById(reviseLogItem.getReviseLogId());
if (Objects.isNull(reviseLog)) {
throw new RuntimeException("搴撳瓨鍘嗗彶鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -97,12 +94,12 @@
// }
});
- List<ReviseLog> list = reviseLogService.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, reviseLog.getReviseId()));
+ List<ReviseLog> list = reviseLogMapper.selectList(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, reviseLog.getReviseId()));
if (Objects.isNull(list)) {
throw new RuntimeException("鏁版嵁閿欒锛氬簱瀛樿皟鏁村崟涓嶅瓨鍦紒锛�");
}
List<Long> reviseIds = list.stream().map(ReviseLog::getId).collect(Collectors.toList());
- List<ReviseLogItem> logItems = reviseLogItemService.list(new LambdaQueryWrapper<ReviseLogItem>()
+ List<ReviseLogItem> logItems = this.list(new LambdaQueryWrapper<ReviseLogItem>()
.in(ReviseLogItem::getReviseLogId, reviseIds));
Double anfems = logItems.stream().mapToDouble(ReviseLogItem::getAnfme).sum();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java
index cf0dc60..0626675 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java
@@ -30,9 +30,6 @@
private LocReviseService locReviseService;
@Autowired
- private ReviseLogService reviseLogService;
-
- @Autowired
private LocItemService locItemService;
@Autowired
@@ -67,7 +64,7 @@
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId)
.setReviseCode(locRevise.getCode());
- if (!reviseLogService.save(reviseLog)) {
+ if (!this.save(reviseLog)) {
throw new CoolException("璋冩暣鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
@@ -113,7 +110,7 @@
if (!revise.getExceStatus().equals(CommonExceStatus.COMMON_EXCE_STATUS_EXCE_ING.val)) {
throw new CoolException("鍗曟嵁鐘舵�佹湭鎵ц鎴栧凡瀹屾垚锛屾棤娉曟墽琛屽畬鎴愭搷浣滐紒锛�");
}
- List<ReviseLog> logs = reviseLogService.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, revise.getId()));
+ List<ReviseLog> logs = this.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, revise.getId()));
if (logs.isEmpty()) {
throw new CoolException("搴撳瓨鏃ュ織涓嶅瓨鍦紒锛�");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index ad46b89..5d85c74 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -44,6 +44,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -97,10 +98,9 @@
@Autowired
private BasStationService basStationService;
@Autowired
- private TaskService taskService;
- @Autowired
private LocItemWorkingService locItemWorkingService;
@Autowired
+ @Lazy
private WcsService wcsService;
@Autowired
private OutStockService outStockService;
@@ -109,6 +109,7 @@
@Autowired
private CheckOrderItemService checkOrderItemService;
@Autowired
+ @Lazy
private CheckOrderService checkOrderService;
@Autowired
private CheckDiffService checkDiffService;
@@ -123,6 +124,7 @@
@Autowired
private RemotesInfoProperties.RcsApi rcsApi;
@Autowired
+ @Lazy
private FlowStepInstanceService flowStepInstanceService;
@Autowired
private RemotesInfoProperties.WmsOpenApi wmsOpenApi;
@@ -791,14 +793,14 @@
@Transactional(rollbackFor = Exception.class)
public Task taskToTop(Long id, Long loginUserId) throws Exception {
List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
+ Task tasks = this.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
if (Objects.isNull(tasks)) {
throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
}
//鍒ゆ柇娴呭簱浣嶄换鍔★紝淇敼浠诲姟浼樺厛绾�
modiftyTaskSort(tasks, loginUserId);
- if (!taskService.updateById(tasks)) {
+ if (!this.updateById(tasks)) {
throw new CoolException("缃《澶辫触锛侊紒");
}
return null;
@@ -963,7 +965,7 @@
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
}
if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
- Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
+ Task serviceOne = this.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getOrgLoc, loc.getCode())
.or()
.eq(Task::getTargLoc, loc.getCode()));
@@ -1184,7 +1186,7 @@
locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);
- if (!taskService.updateById(task)) {
+ if (!this.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -1241,7 +1243,7 @@
locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);
- if (!taskService.updateById(task)) {
+ if (!this.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
// 鐩樼偣鍐嶅叆搴撲换鍔＄粨鏉燂細灏嗗叧鑱旂殑鐩樼偣宸紓鍗曠疆涓哄凡瀹℃牳
@@ -1255,7 +1257,7 @@
*/
@Override
public void markCheckDiffApprovedWhenCheckInDone(Task checkInTask) {
- Task outTask = taskService.getOne(new LambdaQueryWrapper<Task>()
+ Task outTask = this.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getBarcode, checkInTask.getBarcode())
.eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type)
.last("limit 1"));
@@ -1333,7 +1335,7 @@
throw new CoolException("绉诲簱鐩爣搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- Task outTask = taskService.getById(task.getParentId());
+ Task outTask = this.getById(task.getParentId());
if (!Objects.isNull(outTask)) {
LocToTaskParams params = new LocToTaskParams();
params.setOrgLoc(task.getOrgLoc()).setSiteNo(task.getOrgSite());
@@ -2215,7 +2217,7 @@
return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ List<Task> tasks = this.list(new LambdaQueryWrapper<Task>()
.in(Task::getId, ids)
.in(Task::getTaskStatus, integers)
.orderByDesc(Task::getSort));
@@ -2229,7 +2231,7 @@
}
}
- taskService.pubTaskToWcs(tasks);
+ this.pubTaskToWcs(tasks);
return R.ok();
}
@@ -2355,7 +2357,7 @@
throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
- if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
.set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -2379,7 +2381,7 @@
throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
- if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
.set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
index d3168c2..2f42587 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
@@ -42,8 +42,6 @@
@Autowired
private TransferOrderService transferOrderService;
@Autowired
- private TransferService transferService;
- @Autowired
private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
@@ -334,7 +332,7 @@
transferOrderService.remove(new LambdaQueryWrapper<TransferOrder>().in(TransferOrder::getTransferId, list));
}
- transferService.removeByIds(list);
+ this.removeByIds(list);
transferItemService.remove(new LambdaQueryWrapper<TransferItem>().in(TransferItem::getTransferId, list));
return true;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 26810ba..552d605 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -8,6 +8,7 @@
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.WaitPakinMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,7 @@
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,11 +28,9 @@
@Autowired
- private AsnOrderService asnOrderService;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
private AsnOrderItemService asnOrderItemService;
- @Autowired
- private WaitPakinService waitPakinService;
@Autowired
private WaitPakinItemService waitPakinItemService;
@Autowired
@@ -38,10 +38,9 @@
@Autowired
private LocService locService;
@Autowired
- private TaskService taskService;
- @Autowired
private TaskItemService taskItemService;
@Autowired
+ @Lazy
private AgvService agvService;
@@ -63,7 +62,7 @@
throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
}
// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
- WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ WaitPakin pakin = this.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
if (!Objects.isNull(pakin)) {
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
@@ -129,7 +128,7 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(warehouseAreasItems.getMatnrCode());
- WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ WkOrder order = asnOrderMapper.selectById(warehouseAreasItems.getAsnId());
if (!Objects.isNull(order)) {
pakinItem.setType(null == order.getType() ? null : order.getType())
.setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
@@ -189,7 +188,7 @@
if (StringUtils.isBlank(waitPakin.getBarcode())) {
throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
}
- WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ WaitPakin pakin = this.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
if (!Objects.isNull(pakin)) {
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
@@ -227,7 +226,7 @@
throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
}
// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
- WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ WaitPakin pakin = this.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
if (!Objects.isNull(pakin)) {
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
@@ -282,7 +281,7 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(warehouseAreasItems.getMatnrCode());
- WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ WkOrder order = asnOrderMapper.selectById(warehouseAreasItems.getAsnId());
if (!Objects.isNull(order)) {
pakinItem.setType(null == order.getType() ? null : order.getType())
.setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
@@ -348,7 +347,7 @@
public synchronized WaitPakin unBind(WaitPakinParam param) {
String barcode = param.getBarcode();
if (StringUtils.isNotBlank(barcode)) {
- WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
+ WaitPakin waitPakins = this.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
if (Objects.isNull(waitPakins)) {
throw new CoolException("缁勬墭涓嶅瓨鍦紒锛�");
}
@@ -408,13 +407,13 @@
double anfmes = paramItems.stream().mapToDouble(PakinItem::getReceiptQty).sum();
// double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();
if (waitPakins.getAnfme().compareTo(anfmes) <= 0) {
- if (!waitPakinService.removeById(waitPakins.getId())) {
+ if (!this.removeById(waitPakins.getId())) {
throw new CoolException("缁勬墭鍒犻櫎澶辫触锛侊紒");
}
} else {
Double anfme = Math.round((waitPakins.getAnfme() - anfmes) * 10000) / 10000.0;
waitPakins.setAnfme(anfme);
- if (!waitPakinService.updateById(waitPakins)) {
+ if (!this.updateById(waitPakins)) {
throw new CoolException("缁勬墭鏁版嵁淇敼澶辫触锛侊紒");
}
}
@@ -471,7 +470,7 @@
}
}
- if (!waitPakinService.removeByIds(pakinIds)) {
+ if (!this.removeByIds(pakinIds)) {
return R.error("Delete Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index d3cbe6e..b3ad570 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -41,17 +41,11 @@
@Autowired
private WaveItemService waveItemService;
@Autowired
- private TaskService taskService;
- @Autowired
private TaskItemService taskItemService;
@Autowired
private LocItemService locItemService;
@Autowired
private LocService locService;
- @Autowired
- private OutStockService outStockService;
- @Autowired
- private WaveService waveService;
@Autowired
private WaveRuleServiceImpl waveRuleService;
@Autowired
@@ -124,7 +118,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
List<Long> WaveIds = JSONArray.parseArray(JSON.toJSONString(map.get("ids")), Long.class);
- List<Wave> waves = waveService.listByIds(WaveIds);
+ List<Wave> waves = this.listByIds(WaveIds);
if (Objects.isNull(waves)) {
throw new CoolException("鏁版嵁閿欒锛� 娉㈡涓嶅瓨鍦紒锛�");
}
@@ -170,7 +164,7 @@
wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
}
wave.setMemo("-->搴撳瓨涓嶈冻");
- waveService.updateById(wave);
+ this.updateById(wave);
return R.ok();
}
try {
@@ -209,7 +203,7 @@
Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
Double v = Math.round((wave.getWorkQty() + sum) * 1000000) / 1000000.0;
if (wave.getAnfme().compareTo(v) == 0) {
- if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+ if (!this.update(new LambdaUpdateWrapper<Wave>()
.set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
.set(Wave::getWorkQty, v)
.set(Wave::getUpdateBy, loginUserId)
@@ -219,7 +213,7 @@
throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
} else {
- if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+ if (!this.update(new LambdaUpdateWrapper<Wave>()
.set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
.set(Wave::getWorkQty, v)
.set(Wave::getUpdateBy, loginUserId)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiCallLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiCallLogController.java
index 60bbb51..2ac4438 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiCallLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiCallLogController.java
@@ -11,7 +11,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisController.java
index e551620..132ac19 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisController.java
@@ -11,7 +11,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Map;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisPlanController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisPlanController.java
index 4897e48..ce5cd78 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisPlanController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosisPlanController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosticToolConfigController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosticToolConfigController.java
index c6c7629..bedc27a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosticToolConfigController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiDiagnosticToolConfigController.java
@@ -14,7 +14,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiMcpMountController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiMcpMountController.java
index f81e885..4c20d76 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiMcpMountController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiMcpMountController.java
@@ -20,7 +20,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiParamController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiParamController.java
index bf5abf4..28dbc42 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiParamController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiParamController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiPromptController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiPromptController.java
index 5760719..0f254bc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiPromptController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiPromptController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiRouteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiRouteController.java
index 354e5f8..697011f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiRouteController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AiRouteController.java
@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index 42158ed..e5859c5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -33,8 +33,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/ConfigController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/ConfigController.java
index b3cac37..602db9d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/ConfigController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/ConfigController.java
@@ -19,7 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DeptController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DeptController.java
index 5ac2d13..65029b5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DeptController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DeptController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
index c59f89d..3aced09 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
index 406112e..ddc135f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictTypeController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java
index aa3f0b8..87ef40f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java
@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "鍔ㄦ�佹墿灞曞瓧娈�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java
index d11a47b..5368d9d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowInstanceController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowInstanceController.java
index 90ef901..905eead 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowInstanceController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowInstanceController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepInstanceController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepInstanceController.java
index 9bdb720..009c694 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepInstanceController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepInstanceController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepLogController.java
index 140a3bf..54fdf6c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepLogController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepTemplateController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepTemplateController.java
index 2c58660..b059393 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepTemplateController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepTemplateController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/HostController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/HostController.java
index 27ce8de..acc0247 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/HostController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/HostController.java
@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java
index 42a4f05..3805881 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java
@@ -18,7 +18,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/OperationRecordController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/OperationRecordController.java
index cd6b5d3..5d6f839 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/OperationRecordController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/OperationRecordController.java
@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/PdaRoleMenuController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/PdaRoleMenuController.java
index 3c2ce26..4b689ff 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/PdaRoleMenuController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/PdaRoleMenuController.java
@@ -21,7 +21,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/RoleController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/RoleController.java
index e5107af..a97568b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/RoleController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/RoleController.java
@@ -20,7 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java
index 3c83ab0..31f6784 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java
index e7bbce4..b1627a1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SerialRuleItemController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SubsystemFlowTemplateController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SubsystemFlowTemplateController.java
index 6d26dce..b43c97d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SubsystemFlowTemplateController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/SubsystemFlowTemplateController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java
index f4b6aa4..0600c7d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceNodeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceNodeController.java
index abbb42e..d5ac709 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceNodeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskInstanceNodeController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateController.java
index 1bdebb9..c4a6b46 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
index 86b0b49..cff621a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateNodeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateNodeController.java
index 23f2fc7..9ed090a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateNodeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateNodeController.java
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java
index 86b77e8..35c9f52 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java
@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
index 6d1744d..c18368a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
@@ -24,7 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserLoginController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserLoginController.java
index ea390c8..908cf47 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserLoginController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserLoginController.java
@@ -15,7 +15,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/WarehouseRoleMenuController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/WarehouseRoleMenuController.java
index 51ffba4..45c0709 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/WarehouseRoleMenuController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/WarehouseRoleMenuController.java
@@ -26,7 +26,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserLoginService.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserLoginService.java
index ffe05a3..2a2385e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserLoginService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserLoginService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.server.system.entity.UserLogin;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public interface UserLoginService extends IService<UserLogin> {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java
index 841efd0..908e44f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiDiagnosisPlanServiceImpl.java
@@ -6,9 +6,11 @@
import com.vincent.rsf.server.system.entity.AiDiagnosisPlan;
import com.vincent.rsf.server.system.mapper.AiDiagnosisPlanMapper;
import com.vincent.rsf.server.system.service.AiDiagnosisPlanService;
-import org.springframework.scheduling.support.CronSequenceGenerator;
+import org.springframework.scheduling.support.CronExpression;
import org.springframework.stereotype.Service;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
@@ -42,7 +44,9 @@
if (!validateCron(cronExpr)) {
return null;
}
- return new CronSequenceGenerator(cronExpr.trim()).next(after == null ? new Date() : after);
+ ZonedDateTime next = CronExpression.parse(cronExpr.trim())
+ .next((after == null ? new Date() : after).toInstant().atZone(ZoneId.systemDefault()));
+ return next == null ? null : Date.from(next.toInstant());
}
@Override
@@ -50,7 +54,7 @@
if (cronExpr == null || cronExpr.trim().isEmpty()) {
return false;
}
- return CronSequenceGenerator.isValidExpression(cronExpr.trim());
+ return CronExpression.isValidExpression(cronExpr.trim());
}
@Override
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiPromptTemplateServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiPromptTemplateServiceImpl.java
index acf0eea..50a7241 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiPromptTemplateServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/AiPromptTemplateServiceImpl.java
@@ -9,7 +9,7 @@
import com.vincent.rsf.server.system.service.AiPromptTemplateService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.Date;
import java.util.List;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/ConfigServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/ConfigServiceImpl.java
index c6ae6c2..b2e15ea 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/ConfigServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/ConfigServiceImpl.java
@@ -14,7 +14,7 @@
import com.vincent.rsf.server.system.service.ConfigService;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.util.Date;
import java.util.List;
import java.util.Map;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserLoginServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserLoginServiceImpl.java
index fd71a1b..e4c9669 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserLoginServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserLoginServiceImpl.java
@@ -8,7 +8,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
@Service("userLoginService")
public class UserLoginServiceImpl extends ServiceImpl<UserLoginMapper, UserLogin> implements UserLoginService {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
index 0c9d279..e69a7ef 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
@@ -11,10 +11,10 @@
import com.vincent.rsf.server.system.service.RoleMenuService;
import com.vincent.rsf.server.system.service.UserRoleService;
import com.vincent.rsf.server.system.service.UserService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.List;
@Service("userService")
@@ -25,7 +25,7 @@
@Resource
private RoleMenuService roleMenuService;
@Resource
- private BCryptPasswordEncoder bCryptPasswordEncoder;
+ private PasswordEncoder passwordEncoder;
@Override
public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
@@ -69,12 +69,12 @@
@Override
public boolean comparePassword(String dbPassword, String inputPassword) {
- return bCryptPasswordEncoder.matches(inputPassword, dbPassword);
+ return passwordEncoder.matches(inputPassword, dbPassword);
}
@Override
public String encodePassword(String password) {
- return password == null ? null : bCryptPasswordEncoder.encode(password);
+ return password == null ? null : passwordEncoder.encode(password);
}
@Override
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SystemAuthUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SystemAuthUtils.java
index 3d53062..28381df 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SystemAuthUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SystemAuthUtils.java
@@ -22,7 +22,7 @@
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.util.Objects;
@Component
diff --git a/rsf-server/src/main/resources/application-prod.yml b/rsf-server/src/main/resources/application-prod.yml
index 86bec2e..e3a2ecf 100644
--- a/rsf-server/src/main/resources/application-prod.yml
+++ b/rsf-server/src/main/resources/application-prod.yml
@@ -9,7 +9,7 @@
mvc:
static-path-pattern: /**
datasource:
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
diff --git a/rsf-server/src/main/resources/logback-spring.xml b/rsf-server/src/main/resources/logback-spring.xml
index f72c762..a3983d0 100644
--- a/rsf-server/src/main/resources/logback-spring.xml
+++ b/rsf-server/src/main/resources/logback-spring.xml
@@ -22,12 +22,10 @@
<!--info绾у埆-->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_PATH}/info.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <maxFileSize>10MB</maxFileSize>
<maxHistory>10</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>10MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
@@ -41,12 +39,10 @@
<level>ERROR</level>
</filter>
<file>${LOG_PATH}/error.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <maxFileSize>10MB</maxFileSize>
<maxHistory>10</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>10MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
@@ -59,4 +55,4 @@
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
--
Gitblit v1.9.1