From a4f07b2a0ddb6c210e05afbbb491feeb466203e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:15:50 +0800
Subject: [PATCH] #V3重大更新，升级JDK17，升级SpirngBoot3.5.1
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java | 10
src/main/webapp/views/basStationOpt/basStationOpt_detail.html | 2
src/main/java/com/zy/asrs/controller/ApiLogController.java | 34
src/main/webapp/views/userLogin/userLogin.html | 2
src/main/java/com/zy/asrs/controller/LocMastController.java | 36
src/main/java/com/zy/asrs/task/PlannerScheduler.java | 4
src/main/java/com/zy/common/entity/Parameter.java | 4
src/main/webapp/views/userLogin/userLogin_detail.html | 2
src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java | 2
src/main/webapp/views/basCrnp/basCrnp_detail.html | 2
src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java | 8
src/main/java/com/zy/asrs/controller/BasDualCrnpController.java | 32
src/main/java/com/zy/system/mapper/LicenseInfosMapper.java | 2
src/main/java/com/zy/asrs/service/BasCrnpService.java | 2
src/main/java/com/zy/asrs/task/WrkMastScheduler.java | 20
src/main/webapp/views/basWrkStatus/basWrkStatus_detail.html | 2
src/main/java/com/zy/asrs/service/impl/HttpRequestLogServiceImpl.java | 2
src/main/webapp/views/basRgvOpt/basRgvOpt.html | 2
src/main/webapp/views/basCrnpErr/basCrnpErr.html | 2
src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java | 2
src/main/java/com/zy/system/entity/UserLogin.java | 10
src/main/resources/templates/Entity.txt | 2
src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java | 2
src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java | 2
src/main/java/com/zy/ai/service/impl/LlmCallLogServiceImpl.java | 4
src/main/java/com/zy/asrs/utils/Utils.java | 44
src/main/java/com/zy/system/service/LicenseInfosService.java | 2
src/main/webapp/views/basRgvErrLog/basRgvErrLog_detail.html | 2
src/main/java/com/zy/system/mapper/OperateLogMapper.java | 2
src/main/webapp/views/basDevp/basDevp.html | 2
src/main/java/com/zy/asrs/entity/BasOutArea.java | 8
src/main/webapp/views/basLocSts/basLocSts.html | 2
src/main/java/com/zy/asrs/service/BasMapService.java | 2
src/main/java/com/zy/system/mapper/HostMapper.java | 2
src/main/webapp/views/basRgvErr/basRgvErr_detail.html | 2
src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java | 32
src/main/java/com/zy/core/plugin/FakeProcess.java | 36
src/main/java/com/zy/asrs/controller/HttpRequestLogController.java | 34
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 2
src/main/webapp/views/watch/console.html | 2
src/main/java/com/zy/asrs/controller/BasLocStsController.java | 34
src/main/java/com/zy/system/controller/UserController.java | 36
src/main/webapp/views/deviceConfig/deviceConfig_detail.html | 2
src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java | 2
src/main/webapp/views/config/config_detail.html | 2
src/main/java/com/zy/asrs/mapper/BasRgvMapper.java | 2
src/main/java/com/zy/asrs/service/impl/BasCrnpOptServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 18
src/main/java/com/zy/system/controller/HostController.java | 28
src/main/java/com/zy/asrs/controller/BasRgvController.java | 32
src/main/java/com/zy/asrs/service/BasOutAreaService.java | 2
src/main/resources/templates/Mapper.txt | 2
src/main/resources/templates/ServiceImpl.txt | 2
src/main/java/com/core/generators/CoolGenerator.java | 12
src/main/java/com/zy/asrs/controller/BasRgvOptController.java | 34
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 34
src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java | 4
src/main/webapp/views/permission/permission_detail.html | 2
src/main/java/com/zy/asrs/service/BasWrkIotypeService.java | 2
src/main/java/com/zy/asrs/service/DeviceDataLogService.java | 2
src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java | 2
src/main/java/com/zy/asrs/service/BasRgvErrLogService.java | 2
src/main/java/com/zy/asrs/service/DeviceConfigService.java | 2
src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html | 2
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 2
src/main/java/com/zy/ai/mapper/LlmCallLogMapper.java | 2
src/main/java/com/zy/asrs/controller/DualCrnController.java | 4
src/main/java/com/zy/system/controller/UserLoginController.java | 28
src/main/java/com/zy/asrs/entity/BasDevp.java | 8
src/main/java/com/zy/common/web/BaseController.java | 24
src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java | 32
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 2
src/main/java/com/zy/system/entity/Permission.java | 10
pom.xml | 80 +
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 32
src/main/java/com/zy/ai/service/LlmRouteConfigService.java | 2
src/main/java/com/zy/system/mapper/ConfigMapper.java | 2
src/main/webapp/views/basMap/basMap.html | 2
src/main/java/com/zy/asrs/entity/WrkLastno.java | 12
src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/BasCrnpOptController.java | 34
src/main/java/com/zy/asrs/service/BasOutStationAreaService.java | 2
src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java | 4
src/main/java/com/zy/core/config/SystemConfigInitializer.java | 6
src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java | 2
src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java | 2
src/main/java/com/zy/ai/utils/AiUtils.java | 10
src/main/webapp/views/locMap/locMap.html | 2
src/main/java/com/zy/system/service/OperateLogService.java | 2
src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html | 2
src/main/java/com/zy/common/web/RouterController.java | 2
src/main/java/com/zy/asrs/service/impl/BasCrnpErrServiceImpl.java | 2
src/main/java/com/zy/system/service/RoleService.java | 2
src/main/java/com/zy/system/entity/OperateLog.java | 10
src/main/java/com/zy/asrs/mapper/BasCrnpErrMapper.java | 2
src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java | 2
src/main/java/com/zy/system/service/RolePermissionService.java | 2
src/main/webapp/views/locMast/locMast_detail.html | 2
src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java | 2
src/main/java/com/zy/asrs/service/BasDualCrnpService.java | 2
src/main/java/com/zy/system/service/impl/HostServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/BasLocSts.java | 12
src/main/resources/application.yml | 15
src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java | 16
src/main/webapp/views/basCrnpErrLog/basCrnpErrLog.html | 2
src/main/java/com/zy/system/entity/Resource.java | 10
src/main/java/com/zy/common/config/AdminInterceptor.java | 22
src/main/java/com/zy/system/service/UserService.java | 2
src/main/resources/templates/Service.txt | 2
src/main/java/com/zy/ai/service/impl/LlmRouteConfigServiceImpl.java | 2
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 10
src/main/java/com/zy/system/service/HostService.java | 2
src/main/webapp/views/basCrnpOpt/basCrnpOpt.html | 2
src/main/java/com/zy/system/service/impl/UserServiceImpl.java | 2
src/main/java/com/zy/asrs/service/BasStationOptService.java | 2
src/main/java/com/zy/system/controller/ConfigController.java | 44
src/main/java/com/zy/asrs/service/impl/BasStationDeviceServiceImpl.java | 2
src/main/java/com/zy/core/network/real/ZyStationRealConnect.java | 4
src/main/webapp/views/resource/resource.html | 2
src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java | 10
src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java | 2
src/main/java/com/zy/asrs/controller/BasCrnpErrLogController.java | 32
src/main/java/com/zy/asrs/mapper/ApiLogMapper.java | 2
src/main/java/com/zy/asrs/service/impl/DeviceConfigServiceImpl.java | 2
src/main/webapp/views/role/role_detail.html | 2
src/main/java/com/zy/asrs/controller/BasRgvErrController.java | 32
src/main/java/com/zy/asrs/service/impl/BasOutAreaServiceImpl.java | 2
src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java | 4
src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java | 2
src/main/java/com/zy/system/service/ConfigService.java | 2
src/main/webapp/views/watch/console_pixijs.html | 2
src/main/java/com/zy/system/mapper/RolePermissionMapper.java | 2
src/main/java/com/zy/asrs/service/BasStationDeviceService.java | 2
src/main/java/com/zy/system/controller/OperateLogController.java | 28
src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java | 4
src/main/java/com/zy/common/config/AspectConfig.java | 8
src/main/java/com/zy/ai/service/LlmRoutingService.java | 12
src/main/webapp/views/user/user.html | 2
src/main/java/com/zy/asrs/entity/BasMap.java | 8
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 2
src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java | 2
src/main/java/com/zy/system/mapper/ResourceMapper.java | 2
src/main/webapp/views/role/role.html | 2
src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 32
src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java | 22
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 2
src/main/java/com/zy/asrs/mapper/BasOutAreaMapper.java | 2
src/main/webapp/views/config/config.html | 2
src/main/java/com/zy/common/utils/Http.java | 2
src/main/webapp/views/basCrnpOpt/basCrnpOpt_detail.html | 2
src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java | 6
src/main/webapp/views/basWrkStatus/basWrkStatus.html | 2
src/main/java/com/zy/asrs/controller/BasCrnpErrController.java | 32
src/main/java/com/zy/core/task/InitLocMapScheduler.java | 4
src/main/webapp/views/ai/llm_config.html | 2
src/main/java/com/zy/asrs/service/BasCrnpOptService.java | 2
src/main/java/com/zy/asrs/service/BasLocStsService.java | 2
src/main/java/com/zy/system/mapper/ApiMapper.java | 2
src/main/java/com/zy/asrs/entity/HttpRequestLog.java | 8
src/main/java/com/zy/asrs/service/impl/BasWrkIotypeServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/DeviceLogController.java | 2
src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java | 16
src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/BasCrnpErrLogServiceImpl.java | 2
src/main/webapp/views/index.html | 4
src/main/java/com/zy/asrs/service/ApiLogService.java | 2
src/main/java/com/zy/asrs/entity/DeviceConfig.java | 8
src/main/java/com/zy/system/service/PermissionService.java | 2
src/main/java/com/zy/ai/mapper/LlmRouteConfigMapper.java | 2
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2
src/main/java/com/zy/asrs/service/BasCrnpErrService.java | 2
src/main/java/com/core/config/CoolBaseConfig.java | 10
src/main/java/com/zy/asrs/controller/OpenController.java | 26
src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java | 2
src/main/java/com/zy/asrs/service/BasCrnpErrLogService.java | 2
src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java | 12
src/main/java/com/zy/common/web/FileController.java | 2
src/main/java/com/zy/ai/service/LlmCallLogService.java | 2
src/main/webapp/views/password.html | 2
src/main/java/com/zy/asrs/controller/StationController.java | 8
src/main/java/com/zy/system/service/RoleResourceService.java | 2
src/main/webapp/views/watch/stationColorConfig.html | 2
src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java | 2
src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java | 2
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2
src/main/java/com/zy/ai/mcp/controller/McpController.java | 2
src/main/java/com/zy/asrs/controller/NotifyReportController.java | 18
src/main/java/com/zy/asrs/service/LocMastService.java | 2
src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java | 2
src/main/webapp/views/ai/diagnosis.html | 2
src/main/webapp/views/basStationDevice/basStationDevice.html | 2
src/main/java/com/zy/system/mapper/UserMapper.java | 2
src/main/java/com/zy/asrs/service/BasRgvErrService.java | 2
src/main/webapp/views/basRgvOpt/basRgvOpt_detail.html | 2
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 36
src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html | 2
src/main/java/com/zy/asrs/entity/BasCrnp.java | 8
src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java | 2
src/main/java/com/zy/asrs/service/WrkMastLogService.java | 2
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 4
src/main/java/com/zy/system/mapper/RoleMapper.java | 2
src/main/java/com/zy/ai/service/LlmChatService.java | 239 ++++
src/main/java/com/zy/common/web/AuthController.java | 74
src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java | 2
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 6
src/main/webapp/views/watch/console_html.html | 2
src/main/java/com/zy/system/service/impl/ApiServiceImpl.java | 2
src/main/java/com/zy/Boot.java | 2
src/main/webapp/views/basLocSts/basLocSts_detail.html | 2
src/main/java/com/zy/asrs/controller/BasRgvErrLogController.java | 32
src/main/java/com/zy/system/timer/LicenseTimer.java | 2
src/main/webapp/views/wrkLastno/wrkLastno_detail.html | 2
src/main/java/com/zy/system/entity/Api.java | 8
src/main/java/com/zy/system/service/UserLoginService.java | 2
src/main/java/com/zy/ai/entity/LlmCallLog.java | 8
src/main/java/com/zy/common/service/CommonService.java | 36
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 10
src/main/webapp/views/debugParam/debugParam.html | 2
src/main/java/com/zy/asrs/entity/BasRgvErr.java | 12
src/main/java/com/zy/system/mapper/UserLoginMapper.java | 2
src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java | 2
src/main/java/com/zy/system/controller/RoleController.java | 38
src/main/webapp/views/httpRequestLog/httpRequestLog.html | 2
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 34
src/main/java/com/zy/asrs/utils/NotifyUtils.java | 8
src/main/java/com/zy/asrs/entity/BasDualCrnp.java | 8
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 12
src/main/java/com/zy/asrs/mapper/DeviceConfigMapper.java | 2
src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java | 2
src/main/webapp/views/basDualCrnp/basDualCrnp.html | 2
src/main/java/com/zy/asrs/entity/BasStationDevice.java | 8
src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html | 2
src/main/webapp/views/operateLog/operateLog.html | 2
src/main/java/com/zy/ai/controller/LlmRouteConfigController.java | 30
src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html | 2
src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java | 2
src/main/java/com/zy/system/entity/RoleResource.java | 8
src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java | 2
src/main/java/com/zy/asrs/service/BasWrkStatusService.java | 2
src/main/java/com/zy/common/utils/NavigateSolution.java | 6
src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html | 2
src/main/java/com/zy/common/utils/NavigateUtils.java | 10
src/main/java/com/zy/asrs/service/BasDevpService.java | 2
src/main/java/com/zy/core/utils/WmsOperateUtils.java | 22
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 34
src/main/java/com/zy/asrs/mapper/HttpRequestLogMapper.java | 2
src/main/java/com/zy/asrs/service/BasStationService.java | 2
src/main/webapp/views/basRgv/basRgv.html | 2
src/main/webapp/views/deviceConfig/deviceConfig.html | 2
src/main/java/com/zy/asrs/mapper/BasRgvErrLogMapper.java | 2
src/main/java/com/zy/asrs/mapper/BasOutStationAreaMapper.java | 2
src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html | 2
src/main/java/com/zy/asrs/entity/BasRgvErrLog.java | 16
src/main/webapp/views/wrkLastno/wrkLastno.html | 2
src/main/java/com/zy/system/entity/Config.java | 6
src/main/webapp/views/deviceLogs/deviceLogs.html | 2
src/main/java/com/zy/asrs/controller/BasStationOptController.java | 34
src/main/java/com/zy/asrs/entity/BasStationOpt.java | 10
src/main/webapp/views/locMast/locMast.html | 2
src/main/java/com/zy/asrs/service/impl/BasWrkStatusServiceImpl.java | 2
src/main/java/com/zy/system/entity/LicenseInfos.java | 8
src/main/java/com/zy/ai/controller/LlmCallLogController.java | 14
src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java | 4
src/main/java/com/zy/system/entity/Role.java | 8
src/main/java/com/zy/core/network/real/ZyRgvRealConnect.java | 2
src/main/java/com/zy/system/service/ApiService.java | 2
src/main/resources/templates/Controller.txt | 36
src/main/webapp/views/permission/permission.html | 2
src/main/java/com/zy/asrs/controller/CrnController.java | 8
src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java | 32
src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java | 2
src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/ApiLog.java | 8
src/main/java/com/zy/asrs/controller/BasStationDeviceController.java | 18
src/main/java/com/zy/asrs/mapper/BasCrnpOptMapper.java | 2
src/main/java/com/zy/asrs/service/HttpRequestLogService.java | 2
src/main/java/com/zy/asrs/entity/DeviceDataLog.java | 8
src/main/java/com/zy/common/i18n/RequestLocaleInterceptor.java | 10
src/main/java/com/zy/asrs/controller/DeviceConfigController.java | 32
src/main/webapp/views/basStation/basStation_detail.html | 2
src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html | 2
src/main/java/com/zy/system/service/ResourceService.java | 2
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java | 34
src/main/webapp/views/basRgvErrLog/basRgvErrLog.html | 2
src/main/webapp/views/apiLog/apiLog.html | 2
src/main/java/com/zy/system/entity/User.java | 12
src/main/webapp/views/basCrnpErr/basCrnpErr_detail.html | 2
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 12
src/main/java/com/zy/asrs/service/BasRgvService.java | 2
src/main/java/com/zy/core/thread/impl/ZyRgvThread.java | 10
src/main/java/com/zy/asrs/controller/BasStationController.java | 32
src/main/java/com/zy/asrs/mapper/BasStationMapper.java | 2
src/main/java/com/zy/asrs/entity/BasCrnpOpt.java | 10
src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java | 2
src/main/java/com/zy/core/plugin/XiaosongProcess.java | 8
src/main/java/com/zy/asrs/service/NotifyAsyncService.java | 2
src/main/java/com/zy/asrs/controller/BasOutStationAreaController.java | 18
src/main/java/com/zy/asrs/mapper/BasCrnpErrLogMapper.java | 2
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2
src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java | 2
src/main/webapp/views/basRgv/basRgv_detail.html | 2
src/main/java/com/zy/asrs/entity/BasOutStationArea.java | 8
src/main/java/com/zy/asrs/entity/LocMast.java | 14
src/main/java/com/zy/asrs/service/impl/BasRgvErrLogServiceImpl.java | 2
src/main/webapp/views/basRgvErr/basRgvErr.html | 2
src/main/java/com/zy/asrs/service/BasRgvOptService.java | 2
src/main/java/com/zy/system/mapper/RoleResourceMapper.java | 2
src/main/webapp/views/role/role_power_detail.html | 2
src/main/webapp/views/basCrnp/basCrnp.html | 2
src/main/java/com/zy/system/service/impl/RoleServiceImpl.java | 2
src/main/webapp/views/wrkMast/wrkMast.html | 2
src/main/java/com/zy/asrs/service/impl/StationCycleCapacityServiceImpl.java | 6
src/main/java/com/zy/system/config/LicenseSchemaInitializer.java | 2
src/main/webapp/views/basOutStationArea/basOutStationArea.html | 2
src/main/java/com/zy/asrs/controller/BasDevpController.java | 34
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 2
src/main/webapp/views/basWrkIotype/basWrkIotype.html | 2
src/main/java/com/zy/asrs/service/impl/BasOutStationAreaServiceImpl.java | 2
src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java | 26
src/main/java/com/zy/asrs/task/NotifyScheduler.java | 14
src/main/java/com/zy/asrs/mapper/BasStationDeviceMapper.java | 2
src/main/java/com/zy/core/ServerBootstrap.java | 22
src/main/java/com/zy/system/controller/HomeController.java | 6
src/main/webapp/views/basMap/basMap_detail.html | 2
src/main/java/com/zy/core/plugin/NormalProcess.java | 8
src/main/webapp/views/detail.html | 2
src/main/webapp/views/wrkMastLog/wrkMastLog.html | 2
src/main/java/com/zy/asrs/entity/BasCrnpErr.java | 12
src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java | 2
src/main/java/com/zy/system/controller/ApiController.java | 28
src/main/java/com/zy/system/entity/Host.java | 8
src/main/webapp/views/login.html | 2
src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java | 2
src/main/java/com/zy/system/controller/PermissionController.java | 28
src/main/java/com/zy/asrs/entity/BasRgv.java | 8
src/main/webapp/views/user/user_detail.html | 2
src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java | 2
src/main/java/com/zy/system/controller/ResourceController.java | 36
src/main/java/com/zy/asrs/controller/BasMapController.java | 50
src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java | 2
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 34
src/main/java/com/zy/asrs/controller/WrkMastController.java | 14
src/main/webapp/views/basStationOpt/basStationOpt.html | 2
src/main/java/com/zy/asrs/mapper/BasMapMapper.java | 2
src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java | 2
src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html | 2
src/main/java/com/zy/asrs/entity/BasStation.java | 8
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java | 2
src/main/java/com/zy/ai/entity/LlmRouteConfig.java | 8
src/main/java/com/zy/system/entity/RolePermission.java | 12
src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java | 2
src/main/webapp/views/httpRequestLog/httpRequestLog_detail.html | 2
src/main/java/com/zy/asrs/controller/RgvController.java | 6
src/main/java/com/zy/asrs/entity/WrkMast.java | 24
src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java | 2
src/main/webapp/views/basStation/basStation.html | 2
src/main/java/com/zy/asrs/service/WrkLastnoService.java | 2
src/main/java/com/zy/system/mapper/PermissionMapper.java | 2
src/main/webapp/views/basDevp/basDevp_detail.html | 2
src/main/webapp/views/operateLog/operateLog_detail.html | 2
src/main/java/com/zy/asrs/controller/ConsoleController.java | 30
src/main/java/com/zy/common/config/RedisConfig.java | 3
src/main/webapp/views/notifyReport/notifyReport.html | 2
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java | 8
src/main/webapp/views/basCrnpErrLog/basCrnpErrLog_detail.html | 2
src/main/java/com/zy/asrs/entity/BasRgvOpt.java | 10
370 files changed, 1,795 insertions(+), 1,520 deletions(-)
diff --git a/pom.xml b/pom.xml
index ee6148a..dece7d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.14</version>
+ <version>3.5.10</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.zy</groupId>
@@ -14,13 +14,29 @@
<packaging>war</packaging>
<properties>
- <java.version>1.8</java.version>
- <mysql-driver.version>5.1.47</mysql-driver.version>
- <mybatis-plus.version>2.3.2</mybatis-plus.version>
+ <java.version>17</java.version>
+ <maven.compiler.release>${java.version}</maven.compiler.release>
+ <mybatis-plus.version>3.5.14</mybatis-plus.version>
<fastjson.version>1.2.83</fastjson.version>
- <springfox.version>2.7.0</springfox.version>
<ortools.version>9.10.4067</ortools.version>
+ <lombok.version>1.18.38</lombok.version>
+ <mssql-jdbc.version>12.10.0.jre11</mssql-jdbc.version>
+ <swagger-annotations.version>1.6.16</swagger-annotations.version>
+ <springdoc.version>2.8.9</springdoc.version>
+ <spring-ai.version>1.1.2</spring-ai.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.ai</groupId>
+ <artifactId>spring-ai-bom</artifactId>
+ <version>${spring-ai.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
@@ -37,18 +53,22 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</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>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
- <version>8.2.2.jre8</version>
+ <version>${mssql-jdbc.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-jsqlparser</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
@@ -57,19 +77,14 @@
<version>${fastjson.version}</version>
</dependency>
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${springfox.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${springfox.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>swagger-bootstrap-ui</artifactId>
- <version>1.8.9</version>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
@@ -84,7 +99,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.16.22</version>
+ <version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -131,6 +146,10 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework.ai</groupId>
+ <artifactId>spring-ai-openai</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.ortools</groupId>
<artifactId>ortools-java</artifactId>
<version>${ortools.version}</version>
@@ -141,12 +160,29 @@
<finalName>wcs</finalName>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <release>${maven.compiler.release}</release>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
<!-- <configuration>-->
<!-- <webResources>-->
<!-- <resource>-->
diff --git a/src/main/java/com/core/config/CoolBaseConfig.java b/src/main/java/com/core/config/CoolBaseConfig.java
index c6af983..39c791f 100644
--- a/src/main/java/com/core/config/CoolBaseConfig.java
+++ b/src/main/java/com/core/config/CoolBaseConfig.java
@@ -1,6 +1,8 @@
package com.core.config;
-import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.core.common.SnowflakeIdWorker;
import com.core.common.SpringUtils;
import org.springframework.context.annotation.Bean;
@@ -10,8 +12,10 @@
public class CoolBaseConfig {
@Bean
- public PaginationInterceptor paginationInterceptor() {
- return new PaginationInterceptor();
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+ return interceptor;
}
@Bean
diff --git a/src/main/java/com/core/generators/CoolGenerator.java b/src/main/java/com/core/generators/CoolGenerator.java
index 8bf9fec..6e4ebfd 100644
--- a/src/main/java/com/core/generators/CoolGenerator.java
+++ b/src/main/java/com/core/generators/CoolGenerator.java
@@ -205,7 +205,7 @@
String jdbcUrl = url;
switch (sqlOsType) {
case MYSQL:
- Class.forName("com.mysql.jdbc.Driver");
+ Class.forName("com.mysql.cj.jdbc.Driver");
if (!jdbcUrl.startsWith("jdbc:mysql://")) {
jdbcUrl = "jdbc:mysql://" + jdbcUrl;
}
@@ -359,14 +359,14 @@
imports.add("import com.core.common.SpringUtils;");
}
if (hasTableId) {
- imports.add("import com.baomidou.mybatisplus.annotations.TableId;");
- imports.add("import com.baomidou.mybatisplus.enums.IdType;");
+ imports.add("import com.baomidou.mybatisplus.annotation.TableId;");
+ imports.add("import com.baomidou.mybatisplus.annotation.IdType;");
}
if (hasTableLogic) {
- imports.add("import com.baomidou.mybatisplus.annotations.TableLogic;");
+ imports.add("import com.baomidou.mybatisplus.annotation.TableLogic;");
}
if (hasTableField) {
- imports.add("import com.baomidou.mybatisplus.annotations.TableField;");
+ imports.add("import com.baomidou.mybatisplus.annotation.TableField;");
}
if (hasDate) {
imports.add("import java.text.SimpleDateFormat;");
@@ -483,7 +483,7 @@
builder.append(" ").append(column.getForeignKey()).append("Service service = SpringUtils.getBean(")
.append(column.getForeignKey()).append("Service.class);\n");
builder.append(" ").append(column.getForeignKey()).append(" ")
- .append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append(" = service.selectById(this.")
+ .append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append(" = service.getById(this.")
.append(field).append(");\n");
builder.append(" if (!Cools.isEmpty(").append(GeneratorUtils.firstCharConvert(column.getForeignKey()))
.append(")){\n");
diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index a616580..5cd68ee 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/src/main/java/com/zy/Boot.java
@@ -9,7 +9,7 @@
@EnableAsync
@EnableScheduling
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.zy", "com.core"})
public class Boot extends SpringBootServletInitializer {
public static void main(String[] args) {
diff --git a/src/main/java/com/zy/ai/controller/LlmCallLogController.java b/src/main/java/com/zy/ai/controller/LlmCallLogController.java
index 20670cb..17d9fba 100644
--- a/src/main/java/com/zy/ai/controller/LlmCallLogController.java
+++ b/src/main/java/com/zy/ai/controller/LlmCallLogController.java
@@ -1,7 +1,7 @@
package com.zy.ai.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.ai.entity.LlmCallLog;
@@ -25,7 +25,7 @@
@RequestParam(required = false) Integer success,
@RequestParam(required = false) Long routeId,
@RequestParam(required = false) String traceId) {
- EntityWrapper<LlmCallLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<LlmCallLog> wrapper = new QueryWrapper<>();
if (!isBlank(scene)) {
wrapper.eq("scene", scene.trim());
}
@@ -38,8 +38,8 @@
if (!isBlank(traceId)) {
wrapper.eq("trace_id", traceId.trim());
}
- wrapper.orderBy("id", false);
- return R.ok(llmCallLogService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(llmCallLogService.page(new Page<>(curr, limit), wrapper));
}
@PostMapping("/delete/auth")
@@ -48,14 +48,14 @@
if (id == null) {
return R.error("id涓嶈兘涓虹┖");
}
- llmCallLogService.deleteById(id);
+ llmCallLogService.removeById(id);
return R.ok();
}
@PostMapping("/clear/auth")
@ManagerAuth
public R clear() {
- llmCallLogService.delete(new EntityWrapper<LlmCallLog>());
+ llmCallLogService.remove(new QueryWrapper<LlmCallLog>());
return R.ok();
}
diff --git a/src/main/java/com/zy/ai/controller/LlmRouteConfigController.java b/src/main/java/com/zy/ai/controller/LlmRouteConfigController.java
index 43c7453..d99e0a5 100644
--- a/src/main/java/com/zy/ai/controller/LlmRouteConfigController.java
+++ b/src/main/java/com/zy/ai/controller/LlmRouteConfigController.java
@@ -1,6 +1,6 @@
package com.zy.ai.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -33,9 +33,9 @@
@GetMapping("/list/auth")
@ManagerAuth
public R list() {
- EntityWrapper<LlmRouteConfig> wrapper = new EntityWrapper<>();
- wrapper.orderBy("priority", true).orderBy("id", true);
- List<LlmRouteConfig> list = llmRouteConfigService.selectList(wrapper);
+ QueryWrapper<LlmRouteConfig> wrapper = new QueryWrapper<>();
+ wrapper.orderBy(true, true, "priority").orderBy(true, true, "id");
+ List<LlmRouteConfig> list = llmRouteConfigService.list(wrapper);
return R.ok(list);
}
@@ -52,9 +52,9 @@
if (config.getId() == null) {
llmRoutingService.fillAndNormalize(config, true);
- llmRouteConfigService.insert(config);
+ llmRouteConfigService.save(config);
} else {
- LlmRouteConfig db = llmRouteConfigService.selectById(config.getId());
+ LlmRouteConfig db = llmRouteConfigService.getById(config.getId());
if (db == null) {
return R.error("閰嶇疆涓嶅瓨鍦�");
}
@@ -87,7 +87,7 @@
if (id == null) {
return R.error("id涓嶈兘涓虹┖");
}
- llmRouteConfigService.deleteById(id);
+ llmRouteConfigService.removeById(id);
llmRoutingService.evictCache();
return R.ok();
}
@@ -98,7 +98,7 @@
if (id == null) {
return R.error("id涓嶈兘涓虹┖");
}
- LlmRouteConfig cfg = llmRouteConfigService.selectById(id);
+ LlmRouteConfig cfg = llmRouteConfigService.getById(id);
if (cfg == null) {
return R.error("閰嶇疆涓嶅瓨鍦�");
}
@@ -121,7 +121,7 @@
}
Map<String, Object> data = llmRoutingService.testRoute(config);
if (Boolean.TRUE.equals(data.get("ok")) && config.getId() != null) {
- LlmRouteConfig db = llmRouteConfigService.selectById(config.getId());
+ LlmRouteConfig db = llmRouteConfigService.getById(config.getId());
if (db != null) {
db.setCooldownUntil(null);
db.setConsecutiveFailCount(0);
@@ -136,9 +136,9 @@
@GetMapping("/export/auth")
@ManagerAuth
public R exportConfig() {
- EntityWrapper<LlmRouteConfig> wrapper = new EntityWrapper<>();
- wrapper.orderBy("priority", true).orderBy("id", true);
- List<LlmRouteConfig> list = llmRouteConfigService.selectList(wrapper);
+ QueryWrapper<LlmRouteConfig> wrapper = new QueryWrapper<>();
+ wrapper.orderBy(true, true, "priority").orderBy(true, true, "id");
+ List<LlmRouteConfig> list = llmRouteConfigService.list(wrapper);
List<Map<String, Object>> routes = new ArrayList<>();
if (list != null) {
for (LlmRouteConfig cfg : list) {
@@ -216,12 +216,12 @@
}
if (replace) {
- llmRouteConfigService.delete(new EntityWrapper<LlmRouteConfig>());
+ llmRouteConfigService.remove(new QueryWrapper<LlmRouteConfig>());
}
HashMap<Long, LlmRouteConfig> dbById = new HashMap<>();
if (!replace) {
- List<LlmRouteConfig> current = llmRouteConfigService.selectList(new EntityWrapper<>());
+ List<LlmRouteConfig> current = llmRouteConfigService.list(new QueryWrapper<>());
if (current != null) {
for (LlmRouteConfig item : current) {
if (item != null && item.getId() != null) {
@@ -269,7 +269,7 @@
cfg.setLastUsedTime(null);
cfg.setLastError(null);
llmRoutingService.fillAndNormalize(cfg, true);
- llmRouteConfigService.insert(cfg);
+ llmRouteConfigService.save(cfg);
inserted++;
}
diff --git a/src/main/java/com/zy/ai/entity/LlmCallLog.java b/src/main/java/com/zy/ai/entity/LlmCallLog.java
index bf11dc1..faf169d 100644
--- a/src/main/java/com/zy/ai/entity/LlmCallLog.java
+++ b/src/main/java/com/zy/ai/entity/LlmCallLog.java
@@ -1,9 +1,9 @@
package com.zy.ai.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/com/zy/ai/entity/LlmRouteConfig.java b/src/main/java/com/zy/ai/entity/LlmRouteConfig.java
index 418ccb9..d120c4d 100644
--- a/src/main/java/com/zy/ai/entity/LlmRouteConfig.java
+++ b/src/main/java/com/zy/ai/entity/LlmRouteConfig.java
@@ -1,9 +1,9 @@
package com.zy.ai.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/com/zy/ai/mapper/LlmCallLogMapper.java b/src/main/java/com/zy/ai/mapper/LlmCallLogMapper.java
index 8ebdc95..1bd2536 100644
--- a/src/main/java/com/zy/ai/mapper/LlmCallLogMapper.java
+++ b/src/main/java/com/zy/ai/mapper/LlmCallLogMapper.java
@@ -1,6 +1,6 @@
package com.zy.ai.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.ai.entity.LlmCallLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/ai/mapper/LlmRouteConfigMapper.java b/src/main/java/com/zy/ai/mapper/LlmRouteConfigMapper.java
index 7397da0..6c929c9 100644
--- a/src/main/java/com/zy/ai/mapper/LlmRouteConfigMapper.java
+++ b/src/main/java/com/zy/ai/mapper/LlmRouteConfigMapper.java
@@ -1,6 +1,6 @@
package com.zy.ai.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.ai.entity.LlmRouteConfig;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/ai/mcp/controller/McpController.java b/src/main/java/com/zy/ai/mcp/controller/McpController.java
index fad580d..3d8cf18 100644
--- a/src/main/java/com/zy/ai/mcp/controller/McpController.java
+++ b/src/main/java/com/zy/ai/mcp/controller/McpController.java
@@ -13,7 +13,7 @@
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.util.*;
@Slf4j
diff --git a/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java b/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
index 4cf371b..5b65c21 100644
--- a/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
+++ b/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.ai.entity.DeviceConfigsData;
import com.zy.ai.log.AiLogAppender;
import com.zy.ai.mcp.service.WcsDataFacade;
@@ -49,14 +49,14 @@
@Override
public Object getCrnDeviceStatus(JSONObject args) {
List<Integer> deviceNoList = optIntList(args, "crnNos");
- EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<>();
if (deviceNoList != null && deviceNoList.size() > 0) {
wrapper.in("crn_no", deviceNoList);
}
JSONObject data = new JSONObject();
List<Object> deviceList = new ArrayList<>();
- List<BasCrnp> basCrnps = basCrnpService.selectList(wrapper);
+ List<BasCrnp> basCrnps = basCrnpService.list(wrapper);
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
@@ -72,7 +72,7 @@
@Override
public Object getStationDeviceStatus(JSONObject args) {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
JSONObject data = new JSONObject();
List<Object> stationList = new ArrayList<>();
@@ -100,14 +100,14 @@
@Override
public Object getRgvDeviceStatus(JSONObject args) {
List<Integer> deviceNoList = optIntList(args, "rgvNos");
- EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
if (deviceNoList != null && deviceNoList.size() > 0) {
wrapper.in("rgv_no", deviceNoList);
}
JSONObject data = new JSONObject();
List<Object> deviceList = new ArrayList<>();
- List<BasRgv> basRgvs = basRgvService.selectList(wrapper);
+ List<BasRgv> basRgvs = basRgvService.list(wrapper);
for (BasRgv basRgv : basRgvs) {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basRgv.getRgvNo());
if (rgvThread == null) {
@@ -128,7 +128,7 @@
List<Integer> taskNos = optIntList(args, "taskNos");
int limit = optInt(args, "limit", 200);
- EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
if (taskNos != null && taskNos.size() > 0) {
wrapper.in("wrk_no", taskNos);
}
@@ -141,7 +141,7 @@
wrapper.eq("rgv_no", rgvNo);
}
- List<WrkMast> tasks = wrkMastService.selectList(wrapper);
+ List<WrkMast> tasks = wrkMastService.list(wrapper);
JSONObject data = new JSONObject();
data.put("tasks", tasks);
return data;
@@ -162,24 +162,24 @@
List<DeviceConfigsData> deviceConfigsDataList = new ArrayList<>();
List<Integer> crnNoList = optIntList(args, "crnNos");
- EntityWrapper<BasCrnp> crnWrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnp> crnWrapper = new QueryWrapper<>();
if (crnNoList != null && crnNoList.size() > 0) {
crnWrapper.in("crn_no", crnNoList);
}
List<Integer> rgvNoList = optIntList(args, "rgvNos");
- EntityWrapper<BasRgv> rgvWrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> rgvWrapper = new QueryWrapper<>();
if (rgvNoList != null && rgvNoList.size() > 0) {
rgvWrapper.in("rgv_no", rgvNoList);
}
List<Integer> devpNoList = optIntList(args, "devpNos");
- EntityWrapper<BasDevp> devpWrapper = new EntityWrapper<>();
+ QueryWrapper<BasDevp> devpWrapper = new QueryWrapper<>();
if (devpNoList != null && devpNoList.size() > 0) {
devpWrapper.in("devp_no", devpNoList);
}
- List<BasCrnp> basCrnps = basCrnpService.selectList(crnWrapper);
+ List<BasCrnp> basCrnps = basCrnpService.list(crnWrapper);
for (BasCrnp basCrnp : basCrnps) {
DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
deviceConfigsData.setDeviceNo(basCrnp.getCrnNo());
@@ -188,7 +188,7 @@
deviceConfigsDataList.add(deviceConfigsData);
}
- List<BasRgv> basRgvs = basRgvService.selectList(rgvWrapper);
+ List<BasRgv> basRgvs = basRgvService.list(rgvWrapper);
for (BasRgv basRgv : basRgvs) {
DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
deviceConfigsData.setDeviceNo(basRgv.getRgvNo());
@@ -197,7 +197,7 @@
deviceConfigsDataList.add(deviceConfigsData);
}
- List<BasDevp> basDevps = basDevpService.selectList(devpWrapper);
+ List<BasDevp> basDevps = basDevpService.list(devpWrapper);
for (BasDevp basDevp : basDevps) {
DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
deviceConfigsData.setDeviceNo(basDevp.getDevpNo());
@@ -213,7 +213,7 @@
@Override
public Object getSystemConfig(JSONObject args) {
JSONObject data = new JSONObject();
- List<Config> systemConfigList = configService.selectList(new EntityWrapper<Config>().notIn("dingdingReportUrl"));
+ List<Config> systemConfigList = configService.list(new QueryWrapper<Config>().ne("code", "dingdingReportUrl"));
data.put("systemConfigs", systemConfigList);
return data;
}
@@ -321,4 +321,4 @@
}
return list;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/zy/ai/service/LlmCallLogService.java b/src/main/java/com/zy/ai/service/LlmCallLogService.java
index 8d83871..2f7ea72 100644
--- a/src/main/java/com/zy/ai/service/LlmCallLogService.java
+++ b/src/main/java/com/zy/ai/service/LlmCallLogService.java
@@ -1,6 +1,6 @@
package com.zy.ai.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.ai.entity.LlmCallLog;
public interface LlmCallLogService extends IService<LlmCallLog> {
diff --git a/src/main/java/com/zy/ai/service/LlmChatService.java b/src/main/java/com/zy/ai/service/LlmChatService.java
index 3e25561..c92ede3 100644
--- a/src/main/java/com/zy/ai/service/LlmChatService.java
+++ b/src/main/java/com/zy/ai/service/LlmChatService.java
@@ -9,16 +9,23 @@
import com.zy.ai.entity.LlmRouteConfig;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.ai.openai.api.OpenAiApi;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientResponseException;
import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
import reactor.core.publisher.Flux;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -257,8 +264,15 @@
drain.setDaemon(true);
drain.start();
- streamFlux(route, routeReq).subscribe(payload -> {
+ boolean springAiStreaming = canUseSpringAi(routeReq);
+ Flux<String> streamSource = springAiStreaming ? streamFluxWithSpringAi(route, routeReq) : streamFlux(route, routeReq);
+ streamSource.subscribe(payload -> {
if (payload == null || payload.isEmpty()) return;
+ if (springAiStreaming) {
+ queue.offer(payload);
+ appendLimited(outputBuffer, payload);
+ return;
+ }
String[] events = payload.split("\\r?\\n\\r?\\n");
for (String part : events) {
String s = part;
@@ -350,7 +364,26 @@
.doOnError(ex -> log.error("璋冪敤 LLM 娴佸紡澶辫触, route={}", route.tag(), ex));
}
+ private Flux<String> streamFluxWithSpringAi(ResolvedRoute route, ChatCompletionRequest req) {
+ OpenAiApi api = buildOpenAiApi(route);
+ OpenAiApi.ChatCompletionRequest springReq = buildSpringAiRequest(route, req, true);
+ return api.chatCompletionStream(springReq)
+ .flatMapIterable(chunk -> chunk == null || chunk.choices() == null ? List.<OpenAiApi.ChatCompletionChunk.ChunkChoice>of() : chunk.choices())
+ .map(OpenAiApi.ChatCompletionChunk.ChunkChoice::delta)
+ .filter(Objects::nonNull)
+ .map(this::extractSpringAiContent)
+ .filter(text -> text != null && !text.isEmpty())
+ .doOnError(ex -> log.error("璋冪敤 Spring AI 娴佸紡澶辫触, route={}", route.tag(), ex));
+ }
+
private CompletionCallResult callCompletion(ResolvedRoute route, ChatCompletionRequest req) {
+ if (canUseSpringAi(req)) {
+ return callCompletionWithSpringAi(route, req);
+ }
+ return callCompletionWithWebClient(route, req);
+ }
+
+ private CompletionCallResult callCompletionWithWebClient(ResolvedRoute route, ChatCompletionRequest req) {
WebClient client = WebClient.builder().baseUrl(route.baseUrl).build();
RawCompletionResult raw = client.post()
.uri("/chat/completions")
@@ -370,6 +403,16 @@
throw new LlmRouteException(raw.statusCode, raw.payload);
}
return new CompletionCallResult(raw.statusCode, raw.payload, parseCompletion(raw.payload));
+ }
+
+ private CompletionCallResult callCompletionWithSpringAi(ResolvedRoute route, ChatCompletionRequest req) {
+ OpenAiApi api = buildOpenAiApi(route);
+ OpenAiApi.ChatCompletionRequest springReq = buildSpringAiRequest(route, req, false);
+ ResponseEntity<OpenAiApi.ChatCompletion> entity = api.chatCompletionEntity(springReq);
+ OpenAiApi.ChatCompletion body = entity.getBody();
+ return new CompletionCallResult(entity.getStatusCode().value(),
+ body == null ? null : JSON.toJSONString(body),
+ toLegacyResponse(body));
}
private ChatCompletionRequest applyRoute(ChatCompletionRequest req, ResolvedRoute route, boolean stream) {
@@ -416,6 +459,10 @@
return quota ? route.switchOnQuota : route.switchOnError;
}
+ private boolean canUseSpringAi(ChatCompletionRequest req) {
+ return req != null && (req.getTools() == null || req.getTools().isEmpty());
+ }
+
private void markSuccess(ResolvedRoute route) {
if (route.id != null) {
llmRoutingService.markSuccess(route.id);
@@ -438,14 +485,32 @@
}
return "status=" + e.statusCode + ", body=" + body;
}
+ if (ex instanceof RestClientResponseException) {
+ RestClientResponseException e = (RestClientResponseException) ex;
+ String body = e.getResponseBodyAsString();
+ if (body != null && body.length() > 240) {
+ body = body.substring(0, 240);
+ }
+ return "status=" + e.getStatusCode().value() + ", body=" + body;
+ }
+ if (ex instanceof WebClientResponseException) {
+ WebClientResponseException e = (WebClientResponseException) ex;
+ String body = e.getResponseBodyAsString();
+ if (body != null && body.length() > 240) {
+ body = body.substring(0, 240);
+ }
+ return "status=" + e.getStatusCode().value() + ", body=" + body;
+ }
return ex.getMessage() == null ? ex.toString() : ex.getMessage();
}
private boolean isQuotaExhausted(Throwable ex) {
- if (!(ex instanceof LlmRouteException)) return false;
- LlmRouteException e = (LlmRouteException) ex;
- if (e.statusCode == 429) return true;
- String text = (e.body == null ? "" : e.body).toLowerCase();
+ Integer status = statusCodeOf(ex);
+ if (status != null && status == 429) {
+ return true;
+ }
+ String text = responseBodyOf(ex);
+ text = text == null ? "" : text.toLowerCase(Locale.ROOT);
return text.contains("insufficient_quota")
|| text.contains("quota")
|| text.contains("浣欓")
@@ -591,12 +656,24 @@
if (ex instanceof LlmRouteException) {
return ((LlmRouteException) ex).statusCode;
}
+ if (ex instanceof RestClientResponseException) {
+ return ((RestClientResponseException) ex).getStatusCode().value();
+ }
+ if (ex instanceof WebClientResponseException) {
+ return ((WebClientResponseException) ex).getStatusCode().value();
+ }
return null;
}
private String responseBodyOf(Throwable ex) {
if (ex instanceof LlmRouteException) {
return cut(((LlmRouteException) ex).body, LOG_TEXT_LIMIT);
+ }
+ if (ex instanceof RestClientResponseException) {
+ return cut(((RestClientResponseException) ex).getResponseBodyAsString(), LOG_TEXT_LIMIT);
+ }
+ if (ex instanceof WebClientResponseException) {
+ return cut(((WebClientResponseException) ex).getResponseBodyAsString(), LOG_TEXT_LIMIT);
}
return null;
}
@@ -619,6 +696,158 @@
return ex == null ? null : ex.getClass().getSimpleName();
}
+ private OpenAiApi buildOpenAiApi(ResolvedRoute route) {
+ return OpenAiApi.builder()
+ .baseUrl(route.baseUrl)
+ .apiKey(route.apiKey)
+ .build();
+ }
+
+ private OpenAiApi.ChatCompletionRequest buildSpringAiRequest(ResolvedRoute route,
+ ChatCompletionRequest req,
+ boolean stream) {
+ HashMap<String, Object> extraBody = new HashMap<>();
+ if (route.thinkingEnabled || req.getThinking() != null) {
+ HashMap<String, Object> thinking = new HashMap<>();
+ thinking.put("type", req.getThinking() != null && req.getThinking().getType() != null
+ ? req.getThinking().getType()
+ : "enable");
+ extraBody.put("thinking", thinking);
+ }
+ return new OpenAiApi.ChatCompletionRequest(
+ toSpringAiMessages(req.getMessages()),
+ route.model,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ req.getMax_tokens(),
+ null,
+ 1,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ stream,
+ stream ? OpenAiApi.ChatCompletionRequest.StreamOptions.INCLUDE_USAGE : null,
+ req.getTemperature(),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ extraBody.isEmpty() ? null : extraBody
+ );
+ }
+
+ private List<OpenAiApi.ChatCompletionMessage> toSpringAiMessages(List<ChatCompletionRequest.Message> messages) {
+ ArrayList<OpenAiApi.ChatCompletionMessage> result = new ArrayList<>();
+ if (messages == null) {
+ return result;
+ }
+ for (ChatCompletionRequest.Message message : messages) {
+ if (message == null) {
+ continue;
+ }
+ result.add(new OpenAiApi.ChatCompletionMessage(
+ message.getContent(),
+ toSpringAiRole(message.getRole())
+ ));
+ }
+ return result;
+ }
+
+ private OpenAiApi.ChatCompletionMessage.Role toSpringAiRole(String role) {
+ if (role == null) {
+ return OpenAiApi.ChatCompletionMessage.Role.USER;
+ }
+ switch (role.trim().toLowerCase(Locale.ROOT)) {
+ case "system":
+ return OpenAiApi.ChatCompletionMessage.Role.SYSTEM;
+ case "assistant":
+ return OpenAiApi.ChatCompletionMessage.Role.ASSISTANT;
+ case "tool":
+ return OpenAiApi.ChatCompletionMessage.Role.TOOL;
+ default:
+ return OpenAiApi.ChatCompletionMessage.Role.USER;
+ }
+ }
+
+ private ChatCompletionResponse toLegacyResponse(OpenAiApi.ChatCompletion completion) {
+ if (completion == null) {
+ return null;
+ }
+ ChatCompletionResponse response = new ChatCompletionResponse();
+ response.setId(completion.id());
+ response.setCreated(completion.created());
+ response.setObjectName(completion.object());
+ if (completion.usage() != null) {
+ ChatCompletionResponse.Usage usage = new ChatCompletionResponse.Usage();
+ usage.setPromptTokens(completion.usage().promptTokens());
+ usage.setCompletionTokens(completion.usage().completionTokens());
+ usage.setTotalTokens(completion.usage().totalTokens());
+ response.setUsage(usage);
+ }
+ if (completion.choices() != null) {
+ ArrayList<ChatCompletionResponse.Choice> choices = new ArrayList<>();
+ for (OpenAiApi.ChatCompletion.Choice choice : completion.choices()) {
+ ChatCompletionResponse.Choice item = new ChatCompletionResponse.Choice();
+ item.setIndex(choice.index());
+ if (choice.finishReason() != null) {
+ item.setFinishReason(choice.finishReason().name().toLowerCase(Locale.ROOT));
+ }
+ item.setMessage(toLegacyMessage(choice.message()));
+ choices.add(item);
+ }
+ response.setChoices(choices);
+ }
+ return response;
+ }
+
+ private ChatCompletionRequest.Message toLegacyMessage(OpenAiApi.ChatCompletionMessage message) {
+ if (message == null) {
+ return null;
+ }
+ ChatCompletionRequest.Message result = new ChatCompletionRequest.Message();
+ result.setContent(extractSpringAiContent(message));
+ if (message.role() != null) {
+ result.setRole(message.role().name().toLowerCase(Locale.ROOT));
+ }
+ result.setName(message.name());
+ result.setTool_call_id(message.toolCallId());
+ return result;
+ }
+
+ private String extractSpringAiContent(OpenAiApi.ChatCompletionMessage message) {
+ if (message == null || message.rawContent() == null) {
+ return null;
+ }
+ Object content = message.rawContent();
+ if (content instanceof String) {
+ return (String) content;
+ }
+ if (content instanceof List) {
+ try {
+ @SuppressWarnings("unchecked")
+ List<OpenAiApi.ChatCompletionMessage.MediaContent> media =
+ (List<OpenAiApi.ChatCompletionMessage.MediaContent>) content;
+ return OpenAiApi.getTextContent(media);
+ } catch (ClassCastException ignore) {
+ }
+ }
+ return String.valueOf(content);
+ }
+
private String cut(String text, int maxLen) {
if (text == null) return null;
String clean = text.replace("\r", " ");
diff --git a/src/main/java/com/zy/ai/service/LlmRouteConfigService.java b/src/main/java/com/zy/ai/service/LlmRouteConfigService.java
index 4bf082e..c9500af 100644
--- a/src/main/java/com/zy/ai/service/LlmRouteConfigService.java
+++ b/src/main/java/com/zy/ai/service/LlmRouteConfigService.java
@@ -1,6 +1,6 @@
package com.zy.ai.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.ai.entity.LlmRouteConfig;
public interface LlmRouteConfigService extends IService<LlmRouteConfig> {
diff --git a/src/main/java/com/zy/ai/service/LlmRoutingService.java b/src/main/java/com/zy/ai/service/LlmRoutingService.java
index 96c4805..673babb 100644
--- a/src/main/java/com/zy/ai/service/LlmRoutingService.java
+++ b/src/main/java/com/zy/ai/service/LlmRoutingService.java
@@ -1,6 +1,6 @@
package com.zy.ai.service;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.ai.entity.LlmRouteConfig;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -86,7 +86,7 @@
public void markSuccess(Long routeId) {
if (routeId == null) return;
try {
- LlmRouteConfig db = llmRouteConfigService.selectById(routeId);
+ LlmRouteConfig db = llmRouteConfigService.getById(routeId);
if (db == null) return;
db.setSuccessCount(nvl(db.getSuccessCount()) + 1);
db.setConsecutiveFailCount(0);
@@ -102,7 +102,7 @@
public void markFailure(Long routeId, String errorText, boolean enterCooldown, Integer cooldownSeconds) {
if (routeId == null) return;
try {
- LlmRouteConfig db = llmRouteConfigService.selectById(routeId);
+ LlmRouteConfig db = llmRouteConfigService.getById(routeId);
if (db == null) return;
Date now = new Date();
db.setFailCount(nvl(db.getFailCount()) + 1);
@@ -155,9 +155,9 @@
if (now < cacheExpireAt && allRouteCache != null) {
return allRouteCache;
}
- EntityWrapper<LlmRouteConfig> wrapper = new EntityWrapper<>();
- wrapper.orderBy("priority", true).orderBy("id", true);
- List<LlmRouteConfig> list = llmRouteConfigService.selectList(wrapper);
+ QueryWrapper<LlmRouteConfig> wrapper = new QueryWrapper<>();
+ wrapper.orderBy(true, true, "priority").orderBy(true, true, "id");
+ List<LlmRouteConfig> list = llmRouteConfigService.list(wrapper);
if (list == null) {
allRouteCache = Collections.emptyList();
} else {
diff --git a/src/main/java/com/zy/ai/service/impl/LlmCallLogServiceImpl.java b/src/main/java/com/zy/ai/service/impl/LlmCallLogServiceImpl.java
index 0a4e3ac..7b411b2 100644
--- a/src/main/java/com/zy/ai/service/impl/LlmCallLogServiceImpl.java
+++ b/src/main/java/com/zy/ai/service/impl/LlmCallLogServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.ai.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.ai.entity.LlmCallLog;
import com.zy.ai.mapper.LlmCallLogMapper;
import com.zy.ai.service.LlmCallLogService;
@@ -19,7 +19,7 @@
return;
}
try {
- insert(logItem);
+ save(logItem);
} catch (Exception e) {
String msg = e.getMessage() == null ? "" : e.getMessage();
if (msg.contains("doesn't exist") || msg.contains("涓嶅瓨鍦�")) {
diff --git a/src/main/java/com/zy/ai/service/impl/LlmRouteConfigServiceImpl.java b/src/main/java/com/zy/ai/service/impl/LlmRouteConfigServiceImpl.java
index 0315c11..d974af9 100644
--- a/src/main/java/com/zy/ai/service/impl/LlmRouteConfigServiceImpl.java
+++ b/src/main/java/com/zy/ai/service/impl/LlmRouteConfigServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.ai.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.ai.entity.LlmRouteConfig;
import com.zy.ai.mapper.LlmRouteConfigMapper;
import com.zy.ai.service.LlmRouteConfigService;
diff --git a/src/main/java/com/zy/ai/utils/AiUtils.java b/src/main/java/com/zy/ai/utils/AiUtils.java
index 5c5c83b..367be8c 100644
--- a/src/main/java/com/zy/ai/utils/AiUtils.java
+++ b/src/main/java/com/zy/ai/utils/AiUtils.java
@@ -1,7 +1,7 @@
package com.zy.ai.utils;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.ai.entity.DeviceConfigsData;
import com.zy.ai.entity.DeviceRealTimeData;
import com.zy.ai.entity.WcsDiagnosisRequest;
@@ -51,13 +51,13 @@
List<String> logs = AiLogAppender.getRecentLogs(logLimit);
request.setLogs(logs);
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
request.setTasks(wrkMasts);
List<DeviceRealTimeData> deviceRealTimeDataList = new ArrayList<>();
List<DeviceConfigsData> deviceConfigsDataList = new ArrayList<>();
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
@@ -98,7 +98,7 @@
deviceConfigsDataList.add(deviceConfigsData);
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -145,7 +145,7 @@
request.setDeviceRealtimeData(deviceRealTimeDataList);
request.setDeviceConfigs(deviceConfigsDataList);
- List<Config> systemConfigList = configService.selectList(new EntityWrapper<Config>().notIn("dingdingReportUrl"));
+ List<Config> systemConfigList = configService.list(new QueryWrapper<Config>().ne("code", "dingdingReportUrl"));
request.setSystemConfigs(systemConfigList);
return request;
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 36ed259..837ff43 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -1,9 +1,9 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -29,7 +29,7 @@
@RequestMapping(value = "/apiLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(apiLogService.selectById(String.valueOf(id)));
+ return R.ok(apiLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/apiLog/list/auth")
@@ -40,17 +40,17 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<ApiLog> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(ApiLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));} else {
+ wrapper.orderBy(true, false, "create_time");
}
- return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(apiLogService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -66,7 +66,7 @@
@RequestMapping(value = "/apiLog/add/auth")
@ManagerAuth
public R add(ApiLog apiLog) {
- apiLogService.insert(apiLog);
+ apiLogService.save(apiLog);
return R.ok();
}
@@ -84,7 +84,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- apiLogService.deleteById(id);
+ apiLogService.removeById(id);
}
return R.ok();
}
@@ -92,20 +92,20 @@
@RequestMapping(value = "/apiLog/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<ApiLog> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("apiLog"));
convert(map, wrapper);
- List<ApiLog> list = apiLogService.selectList(wrapper);
+ List<ApiLog> list = apiLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/apiLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<ApiLog> wrapper = new QueryWrapper<>();
wrapper.like("uuid", condition);
- Page<ApiLog> page = apiLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<ApiLog> page = apiLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (ApiLog apiLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -119,8 +119,8 @@
@RequestMapping(value = "/apiLog/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<ApiLog> wrapper = new EntityWrapper<ApiLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != apiLogService.selectOne(wrapper)){
+ QueryWrapper<ApiLog> wrapper = new QueryWrapper<ApiLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != apiLogService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(ApiLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index f5328fc..6e96010 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnpService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basCrnp/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basCrnpService.selectById(String.valueOf(id)));
+ return R.ok(basCrnpService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basCrnp/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasCrnp.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basCrnpService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basCrnpService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basCrnp/add/auth")
@ManagerAuth
public R add(BasCrnp basCrnp) {
- basCrnpService.insert(basCrnp);
+ basCrnpService.save(basCrnp);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basCrnpService.deleteById(id);
+ basCrnpService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basCrnp/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnp"));
convert(map, wrapper);
- List<BasCrnp> list = basCrnpService.selectList(wrapper);
+ List<BasCrnp> list = basCrnpService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basCrnpQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<>();
wrapper.like("crn_no", condition);
- Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasCrnp> page = basCrnpService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasCrnp basCrnp : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basCrnp/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnpService.selectOne(wrapper)){
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<BasCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basCrnpService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnp.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpErrController.java b/src/main/java/com/zy/asrs/controller/BasCrnpErrController.java
index 04690e5..583eb18 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpErrController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpErrController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasCrnpErr;
import com.zy.asrs.service.BasCrnpErrService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basCrnpErr/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basCrnpErrService.selectById(String.valueOf(id)));
+ return R.ok(basCrnpErrService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basCrnpErr/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasCrnpErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpErr> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasCrnpErr.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basCrnpErrService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basCrnpErrService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basCrnpErr/add/auth")
@ManagerAuth
public R add(BasCrnpErr basCrnpErr) {
- basCrnpErrService.insert(basCrnpErr);
+ basCrnpErrService.save(basCrnpErr);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basCrnpErrService.deleteById(id);
+ basCrnpErrService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basCrnpErr/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasCrnpErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpErr> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnpErr"));
convert(map, wrapper);
- List<BasCrnpErr> list = basCrnpErrService.selectList(wrapper);
+ List<BasCrnpErr> list = basCrnpErrService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basCrnpErrQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasCrnpErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpErr> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasCrnpErr> page = basCrnpErrService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasCrnpErr> page = basCrnpErrService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasCrnpErr basCrnpErr : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basCrnpErr/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasCrnpErr> wrapper = new EntityWrapper<BasCrnpErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnpErrService.selectOne(wrapper)){
+ QueryWrapper<BasCrnpErr> wrapper = new QueryWrapper<BasCrnpErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basCrnpErrService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnpErr.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpErrLogController.java b/src/main/java/com/zy/asrs/controller/BasCrnpErrLogController.java
index 24349d3..895059b 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpErrLogController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasCrnpErrLog;
import com.zy.asrs.service.BasCrnpErrLogService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basCrnpErrLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basCrnpErrLogService.selectById(String.valueOf(id)));
+ return R.ok(basCrnpErrLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basCrnpErrLog/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasCrnpErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpErrLog> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasCrnpErrLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basCrnpErrLogService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basCrnpErrLogService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basCrnpErrLog/add/auth")
@ManagerAuth
public R add(BasCrnpErrLog basCrnpErrLog) {
- basCrnpErrLogService.insert(basCrnpErrLog);
+ basCrnpErrLogService.save(basCrnpErrLog);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basCrnpErrLogService.deleteById(id);
+ basCrnpErrLogService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basCrnpErrLog/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasCrnpErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpErrLog> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnpErrLog"));
convert(map, wrapper);
- List<BasCrnpErrLog> list = basCrnpErrLogService.selectList(wrapper);
+ List<BasCrnpErrLog> list = basCrnpErrLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basCrnpErrLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasCrnpErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpErrLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasCrnpErrLog> page = basCrnpErrLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasCrnpErrLog> page = basCrnpErrLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasCrnpErrLog basCrnpErrLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basCrnpErrLog/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasCrnpErrLog> wrapper = new EntityWrapper<BasCrnpErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnpErrLogService.selectOne(wrapper)){
+ QueryWrapper<BasCrnpErrLog> wrapper = new QueryWrapper<BasCrnpErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basCrnpErrLogService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnpErrLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpOptController.java b/src/main/java/com/zy/asrs/controller/BasCrnpOptController.java
index 473754e..72ffa87 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpOptController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasCrnpOpt;
import com.zy.asrs.service.BasCrnpOptService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basCrnpOpt/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basCrnpOptService.selectById(String.valueOf(id)));
+ return R.ok(basCrnpOptService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basCrnpOpt/list/auth")
@@ -38,16 +38,16 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasCrnpOpt.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("send_time", false);
- return R.ok(basCrnpOptService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ wrapper.orderBy(true, false, "send_time");
+ return R.ok(basCrnpOptService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -63,7 +63,7 @@
@RequestMapping(value = "/basCrnpOpt/add/auth")
@ManagerAuth
public R add(BasCrnpOpt basCrnpOpt) {
- basCrnpOptService.insert(basCrnpOpt);
+ basCrnpOptService.save(basCrnpOpt);
return R.ok();
}
@@ -81,7 +81,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids) {
- basCrnpOptService.deleteById(id);
+ basCrnpOptService.removeById(id);
}
return R.ok();
}
@@ -89,20 +89,20 @@
@RequestMapping(value = "/basCrnpOpt/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnpOpt"));
convert(map, wrapper);
- List<BasCrnpOpt> list = basCrnpOptService.selectList(wrapper);
+ List<BasCrnpOpt> list = basCrnpOptService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basCrnpOptQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasCrnpOpt> page = basCrnpOptService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasCrnpOpt> page = basCrnpOptService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasCrnpOpt basCrnpOpt : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -116,8 +116,8 @@
@RequestMapping(value = "/basCrnpOpt/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasCrnpOpt> wrapper = new EntityWrapper<BasCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnpOptService.selectOne(wrapper)){
+ QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<BasCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basCrnpOptService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnpOpt.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index b936913..6ddbc6d 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -3,9 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.domain.param.InitDevpStationParam;
import com.zy.asrs.entity.BasDevp;
@@ -30,7 +30,7 @@
@RequestMapping(value = "/basDevp/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basDevpService.selectById(String.valueOf(id)));
+ return R.ok(basDevpService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basDevp/list/auth")
@@ -41,15 +41,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDevp> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasDevp.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basDevpService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basDevpService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -65,7 +65,7 @@
@RequestMapping(value = "/basDevp/add/auth")
@ManagerAuth
public R add(BasDevp basDevp) {
- basDevpService.insert(basDevp);
+ basDevpService.save(basDevp);
return R.ok();
}
@@ -83,7 +83,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basDevpService.deleteById(id);
+ basDevpService.removeById(id);
}
return R.ok();
}
@@ -91,20 +91,20 @@
@RequestMapping(value = "/basDevp/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDevp> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
convert(map, wrapper);
- List<BasDevp> list = basDevpService.selectList(wrapper);
+ List<BasDevp> list = basDevpService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basDevpQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDevp> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasDevp> page = basDevpService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasDevp basDevp : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -118,8 +118,8 @@
@RequestMapping(value = "/basDevp/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasDevp> wrapper = new EntityWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDevpService.selectOne(wrapper)){
+ QueryWrapper<BasDevp> wrapper = new QueryWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDevpService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -132,7 +132,7 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("devp_no", param.getDevpNo()));
+ BasDevp basDevp = basDevpService.getOne(new QueryWrapper<BasDevp>().eq("devp_no", param.getDevpNo()));
if(Cools.isEmpty(basDevp)){
return R.error("璁惧涓嶅瓨鍦�");
}
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpController.java
index b64a3e6..c21a25c 100644
--- a/src/main/java/com/zy/asrs/controller/BasDualCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpController.java
@@ -1,9 +1,9 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasDualCrnp;
import com.zy.asrs.service.BasDualCrnpService;
@@ -26,7 +26,7 @@
@RequestMapping(value = "/basDualCrnp/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basDualCrnpService.selectById(String.valueOf(id)));
+ return R.ok(basDualCrnpService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basDualCrnp/list/auth")
@@ -37,15 +37,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasDualCrnp.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basDualCrnpService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basDualCrnpService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -61,7 +61,7 @@
@RequestMapping(value = "/basDualCrnp/add/auth")
@ManagerAuth
public R add(BasDualCrnp basDualCrnp) {
- basDualCrnpService.insert(basDualCrnp);
+ basDualCrnpService.save(basDualCrnp);
return R.ok();
}
@@ -79,7 +79,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basDualCrnpService.deleteById(id);
+ basDualCrnpService.removeById(id);
}
return R.ok();
}
@@ -87,20 +87,20 @@
@RequestMapping(value = "/basDualCrnp/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnp"));
convert(map, wrapper);
- List<BasDualCrnp> list = basDualCrnpService.selectList(wrapper);
+ List<BasDualCrnp> list = basDualCrnpService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basDualCrnpQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasDualCrnp> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<>();
wrapper.like("crn_no", condition);
- Page<BasDualCrnp> page = basDualCrnpService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasDualCrnp> page = basDualCrnpService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasDualCrnp basDualCrnp : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -114,8 +114,8 @@
@RequestMapping(value = "/basDualCrnp/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasDualCrnp> wrapper = new EntityWrapper<BasDualCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDualCrnpService.selectOne(wrapper)){
+ QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<BasDualCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnp.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java
index fb768d0..f901732 100644
--- a/src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasDualCrnpErr;
import com.zy.asrs.service.BasDualCrnpErrService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basDualCrnpErr/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basDualCrnpErrService.selectById(String.valueOf(id)));
+ return R.ok(basDualCrnpErrService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basDualCrnpErr/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasDualCrnpErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpErr> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasDualCrnpErr.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basDualCrnpErrService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basDualCrnpErrService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basDualCrnpErr/add/auth")
@ManagerAuth
public R add(BasDualCrnpErr basDualCrnpErr) {
- basDualCrnpErrService.insert(basDualCrnpErr);
+ basDualCrnpErrService.save(basDualCrnpErr);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basDualCrnpErrService.deleteById(id);
+ basDualCrnpErrService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basDualCrnpErr/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasDualCrnpErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpErr> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnpErr"));
convert(map, wrapper);
- List<BasDualCrnpErr> list = basDualCrnpErrService.selectList(wrapper);
+ List<BasDualCrnpErr> list = basDualCrnpErrService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basDualCrnpErrQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasDualCrnpErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpErr> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasDualCrnpErr> page = basDualCrnpErrService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasDualCrnpErr> page = basDualCrnpErrService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasDualCrnpErr basDualCrnpErr : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basDualCrnpErr/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasDualCrnpErr> wrapper = new EntityWrapper<BasDualCrnpErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDualCrnpErrService.selectOne(wrapper)){
+ QueryWrapper<BasDualCrnpErr> wrapper = new QueryWrapper<BasDualCrnpErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpErrService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnpErr.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java
index 29eb96f..72c0e98 100644
--- a/src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpErrLogController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasDualCrnpErrLog;
import com.zy.asrs.service.BasDualCrnpErrLogService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basDualCrnpErrLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basDualCrnpErrLogService.selectById(String.valueOf(id)));
+ return R.ok(basDualCrnpErrLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basDualCrnpErrLog/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpErrLog> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasDualCrnpErrLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basDualCrnpErrLogService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basDualCrnpErrLogService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basDualCrnpErrLog/add/auth")
@ManagerAuth
public R add(BasDualCrnpErrLog basDualCrnpErrLog) {
- basDualCrnpErrLogService.insert(basDualCrnpErrLog);
+ basDualCrnpErrLogService.save(basDualCrnpErrLog);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basDualCrnpErrLogService.deleteById(id);
+ basDualCrnpErrLogService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basDualCrnpErrLog/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpErrLog> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnpErrLog"));
convert(map, wrapper);
- List<BasDualCrnpErrLog> list = basDualCrnpErrLogService.selectList(wrapper);
+ List<BasDualCrnpErrLog> list = basDualCrnpErrLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basDualCrnpErrLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpErrLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasDualCrnpErrLog> page = basDualCrnpErrLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasDualCrnpErrLog> page = basDualCrnpErrLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasDualCrnpErrLog basDualCrnpErrLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basDualCrnpErrLog/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasDualCrnpErrLog> wrapper = new EntityWrapper<BasDualCrnpErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDualCrnpErrLogService.selectOne(wrapper)){
+ QueryWrapper<BasDualCrnpErrLog> wrapper = new QueryWrapper<BasDualCrnpErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpErrLogService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnpErrLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
index 0af88ad..3ac3060 100644
--- a/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasDualCrnpOpt;
import com.zy.asrs.service.BasDualCrnpOptService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basDualCrnpOpt/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basDualCrnpOptService.selectById(String.valueOf(id)));
+ return R.ok(basDualCrnpOptService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basDualCrnpOpt/list/auth")
@@ -38,16 +38,16 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasDualCrnpOpt.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("send_time", false);
- return R.ok(basDualCrnpOptService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ wrapper.orderBy(true, false, "send_time");
+ return R.ok(basDualCrnpOptService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -63,7 +63,7 @@
@RequestMapping(value = "/basDualCrnpOpt/add/auth")
@ManagerAuth
public R add(BasDualCrnpOpt basDualCrnpOpt) {
- basDualCrnpOptService.insert(basDualCrnpOpt);
+ basDualCrnpOptService.save(basDualCrnpOpt);
return R.ok();
}
@@ -81,7 +81,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basDualCrnpOptService.deleteById(id);
+ basDualCrnpOptService.removeById(id);
}
return R.ok();
}
@@ -89,20 +89,20 @@
@RequestMapping(value = "/basDualCrnpOpt/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnpOpt"));
convert(map, wrapper);
- List<BasDualCrnpOpt> list = basDualCrnpOptService.selectList(wrapper);
+ List<BasDualCrnpOpt> list = basDualCrnpOptService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basDualCrnpOptQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasDualCrnpOpt> page = basDualCrnpOptService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasDualCrnpOpt> page = basDualCrnpOptService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasDualCrnpOpt basDualCrnpOpt : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -116,8 +116,8 @@
@RequestMapping(value = "/basDualCrnpOpt/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<BasDualCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDualCrnpOptService.selectOne(wrapper)){
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<BasDualCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpOptService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnpOpt.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 2a40cc2..e1ced37 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basLocSts/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basLocStsService.selectById(id));
+ return R.ok(basLocStsService.getById(id));
}
@RequestMapping(value = "/basLocSts/list/auth")
@@ -38,13 +38,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basLocStsService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basLocStsService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -64,7 +64,7 @@
return R.error();
}
if (null == basLocSts.getLocSts()){
- basLocStsService.insert(basLocSts);
+ basLocStsService.save(basLocSts);
} else {
basLocStsService.updateById(basLocSts);
}
@@ -78,7 +78,7 @@
basLocSts.setModiTime(new Date());
basLocSts.setAppeUser(getUserId());
basLocSts.setAppeTime(new Date());
- basLocStsService.insert(basLocSts);
+ basLocStsService.save(basLocSts);
return R.ok();
}
@@ -102,7 +102,7 @@
return R.error();
}
for (BasLocSts entity : list){
- basLocStsService.delete(new EntityWrapper<>(entity));
+ basLocStsService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -111,19 +111,19 @@
@ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basLocSts"));
convert(map, wrapper);
- List<BasLocSts> list = basLocStsService.selectList(wrapper);
+ List<BasLocSts> list = basLocStsService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basLocStsQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<>();
wrapper.like("loc_desc", condition);
- Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasLocSts> page = basLocStsService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasLocSts basLocSts : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -137,8 +137,8 @@
@RequestMapping(value = "/basLocSts/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasLocSts> wrapper = new EntityWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basLocStsService.selectOne(wrapper)){
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basLocStsService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasLocSts.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 9dfa3f9..4b81688 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -3,9 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasMap;
@@ -51,7 +51,7 @@
@RequestMapping(value = "/basMap/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basMapService.selectById(String.valueOf(id)));
+ return R.ok(basMapService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basMap/list/auth")
@@ -62,16 +62,16 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasMap> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasMap> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasMap.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("lev");
- return R.ok(basMapService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ wrapper.orderBy(true, true, "lev");
+ return R.ok(basMapService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -87,7 +87,7 @@
@RequestMapping(value = "/basMap/add/auth")
@ManagerAuth
public R add(BasMap basMap) {
- basMapService.insert(basMap);
+ basMapService.save(basMap);
return R.ok();
}
@@ -105,7 +105,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basMapService.deleteById(id);
+ basMapService.removeById(id);
}
return R.ok();
}
@@ -113,20 +113,20 @@
@RequestMapping(value = "/basMap/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasMap> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasMap> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basMap"));
convert(map, wrapper);
- List<BasMap> list = basMapService.selectList(wrapper);
+ List<BasMap> list = basMapService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basMapQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasMap> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasMap> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasMap> page = basMapService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasMap> page = basMapService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasMap basMap : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -140,8 +140,8 @@
@RequestMapping(value = "/basMap/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasMap> wrapper = new EntityWrapper<BasMap>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basMapService.selectOne(wrapper)){
+ QueryWrapper<BasMap> wrapper = new QueryWrapper<BasMap>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basMapService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasMap.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -150,7 +150,7 @@
@GetMapping("/basMap/lev/{lev}/auth")
@ManagerAuth
public R getByLev(@PathVariable("lev") Integer lev) {
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", lev));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", lev));
if (basMap == null){
return R.error("鍦板浘涓嶅瓨鍦�");
}
@@ -305,7 +305,7 @@
dataList.add(arrayList);
}
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", lev));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", lev));
if (basMap == null) {
basMap = new BasMap();
}
@@ -314,13 +314,13 @@
basMap.setCreateTime(new Date());
basMap.setUpdateTime(new Date());
basMap.setLev(lev);
- basMapService.insertOrUpdate(basMap);
+ basMapService.saveOrUpdate(basMap);
}
- basStationService.delete(new EntityWrapper<>());
+ basStationService.remove(new QueryWrapper<>());
deviceStationMap.forEach((deviceNo, stationList) -> {
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceNo));
+ BasDevp basDevp = basDevpService.getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceNo));
if (basDevp == null) {
basDevp = new BasDevp();
basDevp.setDevpNo(deviceNo);
@@ -361,9 +361,9 @@
basDevp.setStationList(JSON.toJSONString(stationList, SerializerFeature.DisableCircularReferenceDetect));
basDevp.setUpdateTime(new Date());
- basDevpService.insertOrUpdate(basDevp);
+ basDevpService.saveOrUpdate(basDevp);
- DeviceConfig deviceConfig = deviceConfigService.selectOne(new EntityWrapper<DeviceConfig>().eq("device_no", deviceNo).eq("device_type", String.valueOf(SlaveType.Devp)));
+ DeviceConfig deviceConfig = deviceConfigService.getOne(new QueryWrapper<DeviceConfig>().eq("device_no", deviceNo).eq("device_type", String.valueOf(SlaveType.Devp)));
if (deviceConfig != null) {
deviceConfig.setFakeInitStatus(JSON.toJSONString(stationList));
deviceConfigService.updateById(deviceConfig);
@@ -376,7 +376,7 @@
basStation.setStationLev(stationObjModel.getStationLev());
basStation.setCreateTime(new Date());
basStation.setStatus(1);
- basStationService.insert(basStation);
+ basStationService.save(basStation);
}
});
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/controller/BasOutStationAreaController.java b/src/main/java/com/zy/asrs/controller/BasOutStationAreaController.java
index 8716cc3..4946f4c 100644
--- a/src/main/java/com/zy/asrs/controller/BasOutStationAreaController.java
+++ b/src/main/java/com/zy/asrs/controller/BasOutStationAreaController.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
@@ -44,7 +44,7 @@
Map<String, Object> data = new HashMap<>();
List<Integer> stationIds = new ArrayList<>();
- List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().eq("status", 1));
+ List<BasDevp> devps = basDevpService.list(new QueryWrapper<BasDevp>().eq("status", 1));
for (BasDevp devp : devps) {
for (StationObjModel stationObjModel : devp.getOutStationList$()) {
stationIds.add(stationObjModel.getStationId());
@@ -52,13 +52,13 @@
}
List<BasStation> stations = stationIds.isEmpty()
? new ArrayList<>()
- : basStationService.selectList(new EntityWrapper<BasStation>().in("station_id", stationIds));
+ : basStationService.list(new QueryWrapper<BasStation>().in("station_id", stationIds));
data.put("stations", stations);
- List<BasOutArea> areas = basOutAreaService.selectList(new EntityWrapper<>());
+ List<BasOutArea> areas = basOutAreaService.list(new QueryWrapper<>());
data.put("areas", areas);
- List<BasOutStationArea> relations = basOutStationAreaService.selectList(new EntityWrapper<>());
+ List<BasOutStationArea> relations = basOutStationAreaService.list(new QueryWrapper<>());
data.put("relations", relations);
return R.ok(data);
@@ -70,8 +70,8 @@
JSONArray areas = payload.getJSONArray("areas");
JSONArray relations = payload.getJSONArray("relations");
- basOutAreaService.delete(new EntityWrapper<>());
- basOutStationAreaService.delete(new EntityWrapper<>());
+ basOutAreaService.remove(new QueryWrapper<>());
+ basOutStationAreaService.remove(new QueryWrapper<>());
if (areas != null && !areas.isEmpty()) {
List<BasOutArea> areaList = new ArrayList<>();
@@ -83,7 +83,7 @@
areaList.add(a);
}
if (!areaList.isEmpty()) {
- basOutAreaService.insertBatch(areaList);
+ basOutAreaService.saveBatch(areaList);
}
}
@@ -97,7 +97,7 @@
relList.add(r);
}
if (!relList.isEmpty()) {
- basOutStationAreaService.insertBatch(relList);
+ basOutStationAreaService.saveBatch(relList);
}
}
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvController.java b/src/main/java/com/zy/asrs/controller/BasRgvController.java
index d4d684e..aeb1d71 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.service.BasRgvService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basRgv/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basRgvService.selectById(String.valueOf(id)));
+ return R.ok(basRgvService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basRgv/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasRgv.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basRgvService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basRgvService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basRgv/add/auth")
@ManagerAuth
public R add(BasRgv basRgv) {
- basRgvService.insert(basRgv);
+ basRgvService.save(basRgv);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basRgvService.deleteById(id);
+ basRgvService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basRgv/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basRgv"));
convert(map, wrapper);
- List<BasRgv> list = basRgvService.selectList(wrapper);
+ List<BasRgv> list = basRgvService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basRgvQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
wrapper.like("rgv_no", condition);
- Page<BasRgv> page = basRgvService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasRgv> page = basRgvService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasRgv basRgv : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basRgv/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasRgv> wrapper = new EntityWrapper<BasRgv>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basRgvService.selectOne(wrapper)){
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<BasRgv>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basRgvService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasRgv.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvErrController.java b/src/main/java/com/zy/asrs/controller/BasRgvErrController.java
index a7d252f..2b53deb 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvErrController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvErrController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.service.BasRgvErrService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basRgvErr/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basRgvErrService.selectById(String.valueOf(id)));
+ return R.ok(basRgvErrService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basRgvErr/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasRgvErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasRgvErr.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basRgvErrService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basRgvErrService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basRgvErr/add/auth")
@ManagerAuth
public R add(BasRgvErr basRgvErr) {
- basRgvErrService.insert(basRgvErr);
+ basRgvErrService.save(basRgvErr);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basRgvErrService.deleteById(id);
+ basRgvErrService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basRgvErr/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasRgvErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basRgvErr"));
convert(map, wrapper);
- List<BasRgvErr> list = basRgvErrService.selectList(wrapper);
+ List<BasRgvErr> list = basRgvErrService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basRgvErrQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasRgvErr> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasRgvErr> page = basRgvErrService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasRgvErr> page = basRgvErrService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasRgvErr basRgvErr : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basRgvErr/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasRgvErr> wrapper = new EntityWrapper<BasRgvErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basRgvErrService.selectOne(wrapper)){
+ QueryWrapper<BasRgvErr> wrapper = new QueryWrapper<BasRgvErr>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basRgvErrService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasRgvErr.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvErrLogController.java b/src/main/java/com/zy/asrs/controller/BasRgvErrLogController.java
index 7d05728..16a4629 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvErrLogController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasRgvErrLog;
import com.zy.asrs.service.BasRgvErrLogService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basRgvErrLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basRgvErrLogService.selectById(String.valueOf(id)));
+ return R.ok(basRgvErrLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basRgvErrLog/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasRgvErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvErrLog> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasRgvErrLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basRgvErrLogService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basRgvErrLogService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basRgvErrLog/add/auth")
@ManagerAuth
public R add(BasRgvErrLog basRgvErrLog) {
- basRgvErrLogService.insert(basRgvErrLog);
+ basRgvErrLogService.save(basRgvErrLog);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basRgvErrLogService.deleteById(id);
+ basRgvErrLogService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basRgvErrLog/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasRgvErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvErrLog> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basRgvErrLog"));
convert(map, wrapper);
- List<BasRgvErrLog> list = basRgvErrLogService.selectList(wrapper);
+ List<BasRgvErrLog> list = basRgvErrLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basRgvErrLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasRgvErrLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvErrLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasRgvErrLog> page = basRgvErrLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasRgvErrLog> page = basRgvErrLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasRgvErrLog basRgvErrLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basRgvErrLog/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasRgvErrLog> wrapper = new EntityWrapper<BasRgvErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basRgvErrLogService.selectOne(wrapper)){
+ QueryWrapper<BasRgvErrLog> wrapper = new QueryWrapper<BasRgvErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basRgvErrLogService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasRgvErrLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvOptController.java b/src/main/java/com/zy/asrs/controller/BasRgvOptController.java
index 1b94162..386c2d7 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvOptController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasRgvOptService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basRgvOpt/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basRgvOptService.selectById(String.valueOf(id)));
+ return R.ok(basRgvOptService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basRgvOpt/list/auth")
@@ -38,16 +38,16 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasRgvOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvOpt> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasRgvOpt.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("send_time", false);
- return R.ok(basRgvOptService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ wrapper.orderBy(true, false, "send_time");
+ return R.ok(basRgvOptService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -63,7 +63,7 @@
@RequestMapping(value = "/basRgvOpt/add/auth")
@ManagerAuth
public R add(BasRgvOpt basRgvOpt) {
- basRgvOptService.insert(basRgvOpt);
+ basRgvOptService.save(basRgvOpt);
return R.ok();
}
@@ -81,7 +81,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basRgvOptService.deleteById(id);
+ basRgvOptService.removeById(id);
}
return R.ok();
}
@@ -89,20 +89,20 @@
@RequestMapping(value = "/basRgvOpt/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasRgvOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvOpt> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basRgvOpt"));
convert(map, wrapper);
- List<BasRgvOpt> list = basRgvOptService.selectList(wrapper);
+ List<BasRgvOpt> list = basRgvOptService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basRgvOptQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasRgvOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgvOpt> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasRgvOpt> page = basRgvOptService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasRgvOpt> page = basRgvOptService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasRgvOpt basRgvOpt : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -116,8 +116,8 @@
@RequestMapping(value = "/basRgvOpt/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasRgvOpt> wrapper = new EntityWrapper<BasRgvOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basRgvOptService.selectOne(wrapper)){
+ QueryWrapper<BasRgvOpt> wrapper = new QueryWrapper<BasRgvOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basRgvOptService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasRgvOpt.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasStationController.java b/src/main/java/com/zy/asrs/controller/BasStationController.java
index bda0ba1..855a2d7 100644
--- a/src/main/java/com/zy/asrs/controller/BasStationController.java
+++ b/src/main/java/com/zy/asrs/controller/BasStationController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.service.BasStationService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basStation/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basStationService.selectById(String.valueOf(id)));
+ return R.ok(basStationService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basStation/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasStation> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasStation.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basStationService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basStationService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basStation/add/auth")
@ManagerAuth
public R add(BasStation basStation) {
- basStationService.insert(basStation);
+ basStationService.save(basStation);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basStationService.deleteById(id);
+ basStationService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basStation/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasStation> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basStation"));
convert(map, wrapper);
- List<BasStation> list = basStationService.selectList(wrapper);
+ List<BasStation> list = basStationService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basStationQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasStation> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasStation> wrapper = new QueryWrapper<>();
wrapper.like("station_id", condition);
- Page<BasStation> page = basStationService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasStation> page = basStationService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasStation basStation : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basStation/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasStation> wrapper = new EntityWrapper<BasStation>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basStationService.selectOne(wrapper)){
+ QueryWrapper<BasStation> wrapper = new QueryWrapper<BasStation>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basStationService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasStation.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasStationDeviceController.java b/src/main/java/com/zy/asrs/controller/BasStationDeviceController.java
index 700b00b..df0c0a1 100644
--- a/src/main/java/com/zy/asrs/controller/BasStationDeviceController.java
+++ b/src/main/java/com/zy/asrs/controller/BasStationDeviceController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasDualCrnp;
@@ -42,7 +42,7 @@
@RequestMapping("/list/auth")
@ManagerAuth
public R list() {
- return R.ok(basStationDeviceService.selectList(new EntityWrapper<>()));
+ return R.ok(basStationDeviceService.list(new QueryWrapper<>()));
}
@RequestMapping("/save/auth")
@@ -55,9 +55,9 @@
// However, to be safer, we should probably only delete for the stations involved or delete all if it's a full save.
// Let's assume the UI sends the full current state of configuration.
- basStationDeviceService.delete(new EntityWrapper<>());
+ basStationDeviceService.remove(new QueryWrapper<>());
if (list != null && !list.isEmpty()) {
- basStationDeviceService.insertBatch(list);
+ basStationDeviceService.saveBatch(list);
}
return R.ok();
}
@@ -68,20 +68,20 @@
Map<String, Object> data = new HashMap<>();
List<Integer> stationList = new ArrayList<>();
- List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().eq("status", 1));
+ List<BasDevp> devps = basDevpService.list(new QueryWrapper<BasDevp>().eq("status", 1));
for (BasDevp devp : devps) {
for (StationObjModel stationObjModel : devp.getBarcodeStationList$()) {
stationList.add(stationObjModel.getStationId());
}
}
- List<BasStation> stations = basStationService.selectList(new EntityWrapper<BasStation>().in("station_id", stationList));
+ List<BasStation> stations = basStationService.list(new QueryWrapper<BasStation>().in("station_id", stationList));
data.put("stations", stations);
// Get Devices (Crn and DualCrn)
List<Map<String, Object>> devices = new ArrayList<>();
- List<BasCrnp> crns = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("status", 1));
+ List<BasCrnp> crns = basCrnpService.list(new QueryWrapper<BasCrnp>().eq("status", 1));
for (BasCrnp crn : crns) {
Map<String, Object> d = new HashMap<>();
d.put("deviceNo", crn.getCrnNo());
@@ -90,7 +90,7 @@
devices.add(d);
}
- List<BasDualCrnp> dualCrns = basDualCrnpService.selectList(new EntityWrapper<BasDualCrnp>().eq("status", 1));
+ List<BasDualCrnp> dualCrns = basDualCrnpService.list(new QueryWrapper<BasDualCrnp>().eq("status", 1));
for (BasDualCrnp dualCrn : dualCrns) {
Map<String, Object> d = new HashMap<>();
d.put("deviceNo", dualCrn.getCrnNo());
@@ -102,7 +102,7 @@
data.put("devices", devices);
// Get existing relations
- List<BasStationDevice> relations = basStationDeviceService.selectList(new EntityWrapper<>());
+ List<BasStationDevice> relations = basStationDeviceService.list(new QueryWrapper<>());
data.put("relations", relations);
return R.ok(data);
diff --git a/src/main/java/com/zy/asrs/controller/BasStationOptController.java b/src/main/java/com/zy/asrs/controller/BasStationOptController.java
index 5ff4110..00a5909 100644
--- a/src/main/java/com/zy/asrs/controller/BasStationOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasStationOptController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasStationOpt;
import com.zy.asrs.service.BasStationOptService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basStationOpt/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basStationOptService.selectById(String.valueOf(id)));
+ return R.ok(basStationOptService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basStationOpt/list/auth")
@@ -38,16 +38,16 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasStationOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasStationOpt> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasStationOpt.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("send_time", false);
- return R.ok(basStationOptService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ wrapper.orderBy(true, false, "send_time");
+ return R.ok(basStationOptService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -63,7 +63,7 @@
@RequestMapping(value = "/basStationOpt/add/auth")
@ManagerAuth
public R add(BasStationOpt basStationOpt) {
- basStationOptService.insert(basStationOpt);
+ basStationOptService.save(basStationOpt);
return R.ok();
}
@@ -81,7 +81,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basStationOptService.deleteById(id);
+ basStationOptService.removeById(id);
}
return R.ok();
}
@@ -89,20 +89,20 @@
@RequestMapping(value = "/basStationOpt/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasStationOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasStationOpt> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basStationOpt"));
convert(map, wrapper);
- List<BasStationOpt> list = basStationOptService.selectList(wrapper);
+ List<BasStationOpt> list = basStationOptService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basStationOptQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasStationOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasStationOpt> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasStationOpt> page = basStationOptService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasStationOpt> page = basStationOptService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasStationOpt basStationOpt : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -116,8 +116,8 @@
@RequestMapping(value = "/basStationOpt/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasStationOpt> wrapper = new EntityWrapper<BasStationOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basStationOptService.selectOne(wrapper)){
+ QueryWrapper<BasStationOpt> wrapper = new QueryWrapper<BasStationOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basStationOptService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasStationOpt.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index 0136af7..8a35a55 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basWrkIotype/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(basWrkIotypeService.selectById(String.valueOf(id)));
+ return R.ok(basWrkIotypeService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basWrkIotype/list/auth")
@@ -38,13 +38,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkIotype> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basWrkIotypeService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basWrkIotypeService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -64,7 +64,7 @@
return R.error();
}
if (null == basWrkIotype.getIoType()){
- basWrkIotypeService.insert(basWrkIotype);
+ basWrkIotypeService.save(basWrkIotype);
} else {
basWrkIotypeService.updateById(basWrkIotype);
}
@@ -78,7 +78,7 @@
basWrkIotype.setModiTime(new Date());
basWrkIotype.setAppeUser(getUserId());
basWrkIotype.setAppeTime(new Date());
- basWrkIotypeService.insert(basWrkIotype);
+ basWrkIotypeService.save(basWrkIotype);
return R.ok();
}
@@ -102,7 +102,7 @@
return R.error();
}
for (BasWrkIotype entity : list){
- basWrkIotypeService.delete(new EntityWrapper<>(entity));
+ basWrkIotypeService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -111,19 +111,19 @@
@ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkIotype> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkIotype"));
convert(map, wrapper);
- List<BasWrkIotype> list = basWrkIotypeService.selectList(wrapper);
+ List<BasWrkIotype> list = basWrkIotypeService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basWrkIotypeQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkIotype> wrapper = new QueryWrapper<>();
wrapper.like("io_desc", condition);
- Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasWrkIotype> page = basWrkIotypeService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkIotype basWrkIotype : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -137,8 +137,8 @@
@RequestMapping(value = "/basWrkIotype/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasWrkIotype> wrapper = new EntityWrapper<BasWrkIotype>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkIotypeService.selectOne(wrapper)){
+ QueryWrapper<BasWrkIotype> wrapper = new QueryWrapper<BasWrkIotype>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basWrkIotypeService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkIotype.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index 321b8f6..58cae40 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basWrkStatus/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(basWrkStatusService.selectById(String.valueOf(id)));
+ return R.ok(basWrkStatusService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basWrkStatus/list/auth")
@@ -38,13 +38,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basWrkStatusService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basWrkStatusService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -64,7 +64,7 @@
return R.error();
}
if (null == basWrkStatus.getWrkSts()){
- basWrkStatusService.insert(basWrkStatus);
+ basWrkStatusService.save(basWrkStatus);
} else {
basWrkStatusService.updateById(basWrkStatus);
}
@@ -78,7 +78,7 @@
basWrkStatus.setModiTime(new Date());
basWrkStatus.setAppeUser(getUserId());
basWrkStatus.setAppeTime(new Date());
- basWrkStatusService.insert(basWrkStatus);
+ basWrkStatusService.save(basWrkStatus);
return R.ok();
}
@@ -102,7 +102,7 @@
return R.error();
}
for (BasWrkStatus entity : list){
- basWrkStatusService.delete(new EntityWrapper<>(entity));
+ basWrkStatusService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -111,19 +111,19 @@
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkStatus"));
convert(map, wrapper);
- List<BasWrkStatus> list = basWrkStatusService.selectList(wrapper);
+ List<BasWrkStatus> list = basWrkStatusService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basWrkStatusQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<>();
wrapper.like("wrk_desc", condition);
- Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasWrkStatus> page = basWrkStatusService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkStatus basWrkStatus : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -137,8 +137,8 @@
@RequestMapping(value = "/basWrkStatus/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasWrkStatus> wrapper = new EntityWrapper<BasWrkStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkStatusService.selectOne(wrapper)){
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<BasWrkStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basWrkStatusService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 54a1ef5..e8bdf35 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -3,8 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -92,10 +92,10 @@
public R stationLatestData() {
List<StationLatestDataVo> vos = new ArrayList<>();
- WrkLastno inTaskRange = wrkLastnoService.selectById(WrkIoType.IN.id);
- WrkLastno outTaskRange = wrkLastnoService.selectById(WrkIoType.OUT.id);
+ WrkLastno inTaskRange = wrkLastnoService.getById(WrkIoType.IN.id);
+ WrkLastno outTaskRange = wrkLastnoService.getById(WrkIoType.OUT.id);
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig deviceConfig : devpList) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp,
@@ -167,7 +167,7 @@
public R crnLatestData() {
List<CrnLatestDataVo> vos = new ArrayList<>();
- List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
for (DeviceConfig deviceConfig : crnList) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -194,7 +194,7 @@
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
} else {
@@ -215,7 +215,7 @@
@ManagerAuth(memo = "鍙屽伐浣嶅爢鍨涙満瀹炴椂鏁版嵁")
public R dualCrnLatestData() {
List<CrnLatestDataVo> vos = new ArrayList<>();
- List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.DualCrn)));
for (DeviceConfig deviceConfig : dualCrnList) {
DualCrnThread crnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, deviceConfig.getDeviceNo());
@@ -248,7 +248,7 @@
@ManagerAuth(memo = "RGV瀹炴椂鏁版嵁")
public R rgvLatestData(){
List<RgvLatestDataVo> vos = new ArrayList<>();
- List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
for (DeviceConfig deviceConfig : rgvList) {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, deviceConfig.getDeviceNo());
@@ -300,7 +300,7 @@
}
CrnDetailVo vo = new CrnDetailVo();
- DeviceConfig deviceConfig = deviceConfigService.selectOne(new EntityWrapper<DeviceConfig>()
+ DeviceConfig deviceConfig = deviceConfigService.getOne(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn))
.eq("device_no", crnNo));
@@ -315,12 +315,12 @@
vo.setCrnStatus(crnProtocol.getStatusType().desc);
if (crnProtocol.getAlarm() > 0) {
- BasCrnpErr crnError = basCrnpErrService.selectById(crnProtocol.getAlarm());
+ BasCrnpErr crnError = basCrnpErrService.getById(crnProtocol.getAlarm());
vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
}
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo()));
vo.setStaNo(String.valueOf(wrkMast.getStaNo()));
@@ -398,7 +398,7 @@
}
private List<List<HashMap<String, Object>>> buildLocMapBase() {
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", 1));
if (Cools.isEmpty(basMap) || Cools.isEmpty(basMap.getData())) {
return null;
}
@@ -477,9 +477,9 @@
JSONArray data = JSON.parseArray(object.toString());
return R.ok().add(data);
}
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
wrapper.eq("lev1", 1);
- List<LocMast> locMasts = locMastService.selectList(wrapper);
+ List<LocMast> locMasts = locMastService.list(wrapper);
redisUtil.set(RedisKeyType.LOC_MAST_MAP_LIST.key, JSON.toJSONString(locMasts), 60 * 60 * 24);
return R.ok().add(locMasts);
}
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index ba23d00..9f258f4 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -50,7 +50,7 @@
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable() {
List<CrnStateTableVo> list = new ArrayList<>();
- List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ List<BasCrnp> crnps = basCrnpService.list(new QueryWrapper<BasCrnp>().orderBy(true, true, "crn_no"));
for (BasCrnp basCrnp : crnps) {
// 琛ㄦ牸琛�
CrnStateTableVo vo = new CrnStateTableVo();
@@ -88,7 +88,7 @@
}
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo())); // 婧愮珯
vo.setStaNo(String.valueOf(wrkMast.getStaNo())); // 鐩爣绔�
@@ -100,7 +100,7 @@
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
if (crnProtocol.getAlarm() > 0) {
- BasCrnpErr crnError = basCrnpErrService.selectById(crnProtocol.getAlarm());
+ BasCrnpErr crnError = basCrnpErrService.getById(crnProtocol.getAlarm());
vo.setAlarm(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
vo.setDeviceStatus("ERROR");
}
diff --git a/src/main/java/com/zy/asrs/controller/DeviceConfigController.java b/src/main/java/com/zy/asrs/controller/DeviceConfigController.java
index af26677..2892e5b 100644
--- a/src/main/java/com/zy/asrs/controller/DeviceConfigController.java
+++ b/src/main/java/com/zy/asrs/controller/DeviceConfigController.java
@@ -1,9 +1,9 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.DeviceConfigService;
@@ -26,7 +26,7 @@
@RequestMapping(value = "/deviceConfig/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(deviceConfigService.selectById(String.valueOf(id)));
+ return R.ok(deviceConfigService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/deviceConfig/list/auth")
@@ -37,15 +37,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<DeviceConfig> wrapper = new EntityWrapper<>();
+ QueryWrapper<DeviceConfig> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(DeviceConfig.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(deviceConfigService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(deviceConfigService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@ManagerAuth
public R add(DeviceConfig deviceConfig) {
deviceConfig.setCreateTime(new Date());
- deviceConfigService.insert(deviceConfig);
+ deviceConfigService.save(deviceConfig);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- deviceConfigService.deleteById(id);
+ deviceConfigService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/deviceConfig/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<DeviceConfig> wrapper = new EntityWrapper<>();
+ QueryWrapper<DeviceConfig> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("deviceConfig"));
convert(map, wrapper);
- List<DeviceConfig> list = deviceConfigService.selectList(wrapper);
+ List<DeviceConfig> list = deviceConfigService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/deviceConfigQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<DeviceConfig> wrapper = new EntityWrapper<>();
+ QueryWrapper<DeviceConfig> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<DeviceConfig> page = deviceConfigService.selectPage(new Page<>(0, 10), wrapper);
+ Page<DeviceConfig> page = deviceConfigService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (DeviceConfig deviceConfig : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/deviceConfig/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<DeviceConfig> wrapper = new EntityWrapper<DeviceConfig>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != deviceConfigService.selectOne(wrapper)){
+ QueryWrapper<DeviceConfig> wrapper = new QueryWrapper<DeviceConfig>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != deviceConfigService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(DeviceConfig.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/DeviceLogController.java b/src/main/java/com/zy/asrs/controller/DeviceLogController.java
index 6640886..a498bd5 100644
--- a/src/main/java/com/zy/asrs/controller/DeviceLogController.java
+++ b/src/main/java/com/zy/asrs/controller/DeviceLogController.java
@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
diff --git a/src/main/java/com/zy/asrs/controller/DualCrnController.java b/src/main/java/com/zy/asrs/controller/DualCrnController.java
index 48cb7b8..c46ae8b 100644
--- a/src/main/java/com/zy/asrs/controller/DualCrnController.java
+++ b/src/main/java/com/zy/asrs/controller/DualCrnController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -41,7 +41,7 @@
@ManagerAuth(memo = "鍙屽伐浣嶅爢鍨涙満淇℃伅琛�")
public R dualCrnStateTable() {
List<DualCrnStateTableVo> list = new ArrayList<>();
- List<BasDualCrnp> crnps = basDualCrnpService.selectList(new EntityWrapper<BasDualCrnp>().orderBy("crn_no"));
+ List<BasDualCrnp> crnps = basDualCrnpService.list(new QueryWrapper<BasDualCrnp>().orderBy(true, true, "crn_no"));
for (BasDualCrnp basDualCrnp : crnps) {
DualCrnStateTableVo vo = new DualCrnStateTableVo();
vo.setCrnNo(basDualCrnp.getCrnNo());
diff --git a/src/main/java/com/zy/asrs/controller/HttpRequestLogController.java b/src/main/java/com/zy/asrs/controller/HttpRequestLogController.java
index faf3f50..f96a9b0 100644
--- a/src/main/java/com/zy/asrs/controller/HttpRequestLogController.java
+++ b/src/main/java/com/zy/asrs/controller/HttpRequestLogController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.HttpRequestLog;
import com.zy.asrs.service.HttpRequestLogService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/httpRequestLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(httpRequestLogService.selectById(String.valueOf(id)));
+ return R.ok(httpRequestLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/httpRequestLog/list/auth")
@@ -38,16 +38,16 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<HttpRequestLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<HttpRequestLog> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(HttpRequestLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("create_time desc");
- return R.ok(httpRequestLogService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ wrapper.orderBy(true, false, "create_time");
+ return R.ok(httpRequestLogService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -63,7 +63,7 @@
@RequestMapping(value = "/httpRequestLog/add/auth")
@ManagerAuth
public R add(HttpRequestLog httpRequestLog) {
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
return R.ok();
}
@@ -81,7 +81,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- httpRequestLogService.deleteById(id);
+ httpRequestLogService.removeById(id);
}
return R.ok();
}
@@ -89,20 +89,20 @@
@RequestMapping(value = "/httpRequestLog/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<HttpRequestLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<HttpRequestLog> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("httpRequestLog"));
convert(map, wrapper);
- List<HttpRequestLog> list = httpRequestLogService.selectList(wrapper);
+ List<HttpRequestLog> list = httpRequestLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/httpRequestLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<HttpRequestLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<HttpRequestLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<HttpRequestLog> page = httpRequestLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<HttpRequestLog> page = httpRequestLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (HttpRequestLog httpRequestLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -116,8 +116,8 @@
@RequestMapping(value = "/httpRequestLog/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<HttpRequestLog> wrapper = new EntityWrapper<HttpRequestLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != httpRequestLogService.selectOne(wrapper)){
+ QueryWrapper<HttpRequestLog> wrapper = new QueryWrapper<HttpRequestLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != httpRequestLogService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(HttpRequestLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 1853dff..4929264 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -3,9 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -42,7 +42,7 @@
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(locMastService.selectById(String.valueOf(id)));
+ return R.ok(locMastService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/locMast/list/auth")
@@ -53,13 +53,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(locMastService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -101,7 +101,7 @@
return R.error();
}
for (LocMast entity : list){
- locMastService.delete(new EntityWrapper<>(entity));
+ locMastService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -110,19 +110,19 @@
@ManagerAuth(memo = "搴撲綅瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
convert(map, wrapper);
- List<LocMast> list = locMastService.selectList(wrapper);
+ List<LocMast> list = locMastService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/locMastQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
wrapper.like("loc_no", condition);
- Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
+ Page<LocMast> page = locMastService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocMast locMast : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -136,8 +136,8 @@
@RequestMapping(value = "/locMast/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locMastService.selectOne(wrapper)){
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != locMastService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -147,7 +147,7 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
@Transactional
public R locMastInit(@RequestParam Integer lev) {
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", 1));
if (Cools.isEmpty(basMap)){
return R.error("璇峰厛鍒濆鍖栧湴鍥�");
}
@@ -200,7 +200,7 @@
}
}
- locMastService.delete(new EntityWrapper<LocMast>());
+ locMastService.remove(new QueryWrapper<LocMast>());
for (int i = 1; i <= lev; i++) {
int finalLev = i;
@@ -218,7 +218,7 @@
locMast.setLocType(Utils.getLocNo(mapX, mapY, finalLev));
locMast.setStatus(1);
locMast.setAppeTime(new Date());
- locMastService.insert(locMast);
+ locMastService.save(locMast);
});
}
diff --git a/src/main/java/com/zy/asrs/controller/NotifyReportController.java b/src/main/java/com/zy/asrs/controller/NotifyReportController.java
index 017c759..b4ebe24 100644
--- a/src/main/java/com/zy/asrs/controller/NotifyReportController.java
+++ b/src/main/java/com/zy/asrs/controller/NotifyReportController.java
@@ -1,8 +1,8 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -62,7 +62,7 @@
result.put("notifyEndpoint", endpoint);
result.put("queueCount", loadQueueRecords(null, null).size());
if (!Cools.isEmpty(endpoint)) {
- result.put("logCount", httpRequestLogService.selectCount(new EntityWrapper<HttpRequestLog>().eq("name", endpoint)));
+ result.put("logCount", httpRequestLogService.count(new QueryWrapper<HttpRequestLog>().eq("name", endpoint)));
} else {
result.put("logCount", 0);
}
@@ -103,7 +103,7 @@
@RequestParam(required = false) Integer result,
@RequestParam(required = false) String condition) {
String endpoint = buildNotifyEndpoint(getConfigValue("notifyUri"), getConfigValue("notifyUriPath"));
- EntityWrapper<HttpRequestLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<HttpRequestLog> wrapper = new QueryWrapper<>();
if (!Cools.isEmpty(endpoint)) {
wrapper.eq("name", endpoint);
} else {
@@ -125,14 +125,14 @@
wrapper.like("request", "\"device\":" + device);
}
if (!Cools.isEmpty(condition)) {
- wrapper.andNew().like("request", condition).or().like("response", condition);
+ wrapper.and(q -> q.like("request", condition).or().like("response", condition));
}
if (result != null) {
wrapper.eq("result", result);
}
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy(true, false, "create_time");
- Page<HttpRequestLog> logPage = httpRequestLogService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<HttpRequestLog> logPage = httpRequestLogService.page(new Page<>(curr, limit), wrapper);
Page<NotifyReportVo> resultPage = new Page<>(curr, limit);
resultPage.setTotal(logPage.getTotal());
@@ -366,7 +366,7 @@
detail.put("sourceType", "log");
detail.put("logId", logId);
- HttpRequestLog log = httpRequestLogService.selectById(logId);
+ HttpRequestLog log = httpRequestLogService.getById(logId);
if (log == null) {
detail.put("success", false);
detail.put("message", "閫氱煡鏃ュ織涓嶅瓨鍦�");
@@ -401,7 +401,7 @@
}
private String getConfigValue(String code) {
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config config = configService.getOne(new QueryWrapper<Config>().eq("code", code));
return config == null ? null : config.getValue();
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3325ec3..9bbe2f5 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -157,7 +157,7 @@
HashMap<String, Object> map = new HashMap<>();
// 鑾峰彇鍫嗗灈鏈烘暟鎹�
ArrayList<CrnProtocol> crnProtocols = new ArrayList<>();
- List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
for (DeviceConfig device : crnList) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, device.getDeviceNo());
@@ -174,7 +174,7 @@
// 鑾峰彇RGV鏁版嵁
ArrayList<RgvProtocol> rgvProtocols = new ArrayList<>();
- List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
for (DeviceConfig device : rgvList) {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, device.getDeviceNo());
@@ -191,7 +191,7 @@
// 鑾峰彇鍙屽伐浣嶅爢鍨涙満鏁版嵁
ArrayList<DualCrnProtocol> dualCrnProtocols = new ArrayList<>();
- List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.DualCrn)));
for (DeviceConfig device : dualCrnList) {
DualCrnThread dualCrnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, device.getDeviceNo());
@@ -208,7 +208,7 @@
// 鑾峰彇杈撻�佺珯鐐规暟鎹�
ArrayList<StationProtocol> stationProtocols = new ArrayList<>();
- List<DeviceConfig> stationList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> stationList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig device : stationList) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, device.getDeviceNo());
@@ -234,7 +234,7 @@
public R getStationStatus(@RequestBody GetStationStatusParam param) {
// 鑾峰彇杈撻�佺珯鐐规暟鎹�
List<StationProtocol> stationProtocols = new ArrayList<>();
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp))
);
for (DeviceConfig device : devpList) {
@@ -284,7 +284,7 @@
@OpenApiLog(memo = "鑾峰彇鍏ㄩ儴搴撲綅淇℃伅")
public R getAllLocInformation(@RequestBody GetAllLocInformationParam param) {
List<HashMap<String, Object>> list = new ArrayList<>();
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
if (!Cools.isEmpty(param.getRow())) {
wrapper.eq("row1", param.getRow());
@@ -294,7 +294,7 @@
wrapper.eq("lev1", param.getLev());
}
- List<LocMast> locMasts = locMastService.selectList(wrapper);
+ List<LocMast> locMasts = locMastService.list(wrapper);
if (locMasts.isEmpty()) {
return R.ok().add(list);
}
@@ -316,7 +316,7 @@
@PostMapping("/queryTask")
@OpenApiLog(memo = "鏌ヨ浠诲姟")
public R queryTask(@RequestBody QueryTaskParam param) {
- EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
if (param.getTaskNo() != null) {
wrapper.eq("wms_wrk_no", param.getTaskNo());
}
@@ -328,7 +328,7 @@
}
wrapper.eq("io_type", ioType.id);
}
- List<WrkMast> wrkMasts = wrkMastService.selectList(wrapper);
+ List<WrkMast> wrkMasts = wrkMastService.list(wrapper);
return R.ok().add(wrkMasts);
}
@@ -351,7 +351,7 @@
if (mainProcessPlugin.contains("Fake")) {
map.put("running", false);
map.put("isFake", true);
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
+ Config config = configService.getOne(new QueryWrapper<Config>().eq("code", "enableFake"));
if (config != null) {
if (config.getValue().equals("Y")) {
map.put("running", true);
@@ -366,7 +366,7 @@
@PostMapping("/startFakeSystem")
@OpenApiLog(memo = "鍚姩浠跨湡妯℃嫙")
public R startFakeSystem() {
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
+ Config config = configService.getOne(new QueryWrapper<Config>().eq("code", "enableFake"));
if (config != null) {
config.setValue("Y");
configService.updateById(config);
@@ -377,7 +377,7 @@
@PostMapping("/stopFakeSystem")
@OpenApiLog(memo = "鍋滄浠跨湡妯℃嫙")
public R stopFakeSystem() {
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
+ Config config = configService.getOne(new QueryWrapper<Config>().eq("code", "enableFake"));
if (config != null) {
config.setValue("N");
configService.updateById(config);
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index cd2a285..9ccdb5e 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -42,7 +42,7 @@
@ManagerAuth(memo = "RGV淇℃伅琛�")
public R rgvStateTable() {
List<RgvStateTableVo> list = new ArrayList<>();
- List<BasRgv> rgvs = basRgvService.selectList(new EntityWrapper<BasRgv>().orderBy("rgv_no"));
+ List<BasRgv> rgvs = basRgvService.list(new QueryWrapper<BasRgv>().orderBy(true, true, "rgv_no"));
for (BasRgv basRgv : rgvs) {
RgvStateTableVo vo = new RgvStateTableVo();
vo.setRgvNo(basRgv.getRgvNo());
@@ -79,7 +79,7 @@
vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {
- BasRgvErr err = basRgvErrService.selectById(rgvProtocol.getAlarm());
+ BasRgvErr err = basRgvErrService.getById(rgvProtocol.getAlarm());
vo.setAlarm(err == null ? "鏈煡寮傚父" : err.getErrName());
vo.setDeviceStatus("ERROR");
}
diff --git a/src/main/java/com/zy/asrs/controller/StationController.java b/src/main/java/com/zy/asrs/controller/StationController.java
index 75a7367..adc9359 100644
--- a/src/main/java/com/zy/asrs/controller/StationController.java
+++ b/src/main/java/com/zy/asrs/controller/StationController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.domain.param.StationCommandBarcodeParam;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.DeviceConfig;
@@ -84,7 +84,7 @@
return R.error("褰撳墠绯荤粺鏈惎鐢ㄤ豢鐪熸彃浠�");
}
- Config enableFakeConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
+ Config enableFakeConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "enableFake"));
if (enableFakeConfig == null || !"Y".equals(enableFakeConfig.getValue())) {
return R.error("褰撳墠闈炰豢鐪熻繍琛屾ā寮忥紝绂佹淇敼鏉＄爜");
}
@@ -96,7 +96,7 @@
}
Integer devpNo = finalStation.getDeviceNo();
- DeviceConfig deviceConfig = deviceConfigService.selectOne(new EntityWrapper<DeviceConfig>()
+ DeviceConfig deviceConfig = deviceConfigService.getOne(new QueryWrapper<DeviceConfig>()
.eq("device_no", devpNo)
.eq("device_type", String.valueOf(SlaveType.Devp)));
if (deviceConfig == null || deviceConfig.getFake() == null || deviceConfig.getFake() != 1) {
@@ -135,7 +135,7 @@
return null;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
List<StationObjModel> list = basDevp.getStationList$();
for (StationObjModel entity : list) {
diff --git a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
index 0ee6a4e..f6a8d15 100644
--- a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/wrkLastno/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(wrkLastnoService.selectById(String.valueOf(id)));
+ return R.ok(wrkLastnoService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/wrkLastno/list/auth")
@@ -38,13 +38,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkLastno> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkLastnoService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(wrkLastnoService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -64,7 +64,7 @@
wrkLastno.setModiTime(new Date());
wrkLastno.setAppeUser(getUserId());
wrkLastno.setAppeTime(new Date());
- wrkLastnoService.insert(wrkLastno);
+ wrkLastnoService.save(wrkLastno);
return R.ok();
}
@@ -88,7 +88,7 @@
return R.error();
}
for (WrkLastno entity : list){
- wrkLastnoService.delete(new EntityWrapper<>(entity));
+ wrkLastnoService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -97,19 +97,19 @@
@ManagerAuth(memo = "宸ヤ綔搴忓彿瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkLastno> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkLastno"));
convert(map, wrapper);
- List<WrkLastno> list = wrkLastnoService.selectList(wrapper);
+ List<WrkLastno> list = wrkLastnoService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/wrkLastnoQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkLastno> wrapper = new QueryWrapper<>();
wrapper.like("wrk_mk", condition);
- Page<WrkLastno> page = wrkLastnoService.selectPage(new Page<>(0, 10), wrapper);
+ Page<WrkLastno> page = wrkLastnoService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (WrkLastno wrkLastno : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -123,8 +123,8 @@
@RequestMapping(value = "/wrkLastno/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<WrkLastno> wrapper = new EntityWrapper<WrkLastno>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkLastnoService.selectOne(wrapper)){
+ QueryWrapper<WrkLastno> wrapper = new QueryWrapper<WrkLastno>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkLastnoService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(WrkLastno.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index f8d6167..7bb2d16 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -1,7 +1,7 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -33,21 +33,21 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
convert(param, wrapper);
allLike(WrkMast.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){
if (orderByField.endsWith("$")){
orderByField = orderByField.substring(0, orderByField.length()-1);
}
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
}else {
- wrapper.orderBy("io_time", false);
+ wrapper.orderBy(true, false, "io_time");
}
- return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 7e0bec4..f0238c8 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -30,7 +30,7 @@
@RequestMapping(value = "/wrkMastLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastLogService.selectById(String.valueOf(id)));
+ return R.ok(wrkMastLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/wrkMastLog/list/auth")
@@ -42,21 +42,21 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
convert(param, wrapper);
allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){
if (orderByField.endsWith("$")){
orderByField = orderByField.substring(0, orderByField.length()-1);
}
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
}else {
- wrapper.orderBy("modi_time", false);
+ wrapper.orderBy(true, false, "modi_time");
}
- return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -76,7 +76,7 @@
@RequestMapping(value = "/wrkMastLog/add/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ坊鍔�")
public R add(WrkMastLog wrkMastLog) {
- wrkMastLogService.insert(wrkMastLog);
+ wrkMastLogService.save(wrkMastLog);
return R.ok();
}
@@ -98,7 +98,7 @@
return R.error();
}
for (WrkMastLog entity : list){
- wrkMastLogService.delete(new EntityWrapper<>(entity));
+ wrkMastLogService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -107,19 +107,19 @@
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastLog"));
convert(map, wrapper);
- List<WrkMastLog> list = wrkMastLogService.selectList(wrapper);
+ List<WrkMastLog> list = wrkMastLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/wrkMastLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<WrkMastLog> page = wrkMastLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (WrkMastLog wrkMastLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -133,8 +133,8 @@
@RequestMapping(value = "/wrkMastLog/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastLog> wrapper = new EntityWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastLogService.selectOne(wrapper)){
+ QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != wrkMastLogService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java
index 45101d1..8008aff 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 8a24879..91d0811 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -3,10 +3,10 @@
import com.alibaba.fastjson.JSONArray;
import com.core.common.Cools;
import com.zy.core.model.StationObjModel;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -16,7 +16,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnpErr.java b/src/main/java/com/zy/asrs/entity/BasCrnpErr.java
index c0ed328..48b87b3 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnpErr.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnpErr.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
@@ -17,7 +17,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -99,7 +99,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
@@ -115,7 +115,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java b/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java
index 41153ce..cf71473 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnpErrLog.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -13,7 +13,7 @@
import com.zy.system.entity.User;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -233,7 +233,7 @@
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
if (!Cools.isEmpty(basWrkStatus)){
return String.valueOf(basWrkStatus.getWrkDesc());
}
@@ -242,7 +242,7 @@
public String getIoType$(){
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ BasWrkIotype basWrkIotype = service.getById(this.ioType);
if (!Cools.isEmpty(basWrkIotype)){
return String.valueOf(basWrkIotype.getIoDesc());
}
@@ -270,7 +270,7 @@
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
+ User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
@@ -286,7 +286,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnpOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnpOpt.java
index cbfde43..7203124 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnpOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnpOpt.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +14,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -168,7 +168,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 5b15930..6488292 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -12,7 +12,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
index c1ef9e2..e342057 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
@@ -2,11 +2,11 @@
import com.core.common.Cools;
import com.zy.core.model.StationObjModel;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -16,7 +16,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java b/src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java
index d67e0f3..09e9a7c 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnpErr.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
@@ -17,7 +17,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -99,7 +99,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
@@ -115,7 +115,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java b/src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java
index 6f99150..9deab20 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnpErrLog.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +27,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -247,7 +247,7 @@
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
if (!Cools.isEmpty(basWrkStatus)){
return String.valueOf(basWrkStatus.getWrkDesc());
}
@@ -256,7 +256,7 @@
public String getIoType$(){
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ BasWrkIotype basWrkIotype = service.getById(this.ioType);
if (!Cools.isEmpty(basWrkIotype)){
return String.valueOf(basWrkIotype.getIoDesc());
}
@@ -284,7 +284,7 @@
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
+ User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
@@ -300,7 +300,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java b/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
index a0be9c1..e6abf4a 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnpOpt.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -12,7 +12,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -166,7 +166,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasLocSts.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java
index 13d16b9..cd24080 100644
--- a/src/main/java/com/zy/asrs/entity/BasLocSts.java
+++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -102,7 +102,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -134,7 +134,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasMap.java b/src/main/java/com/zy/asrs/entity/BasMap.java
index 0694a6d..88cd38e 100644
--- a/src/main/java/com/zy/asrs/entity/BasMap.java
+++ b/src/main/java/com/zy/asrs/entity/BasMap.java
@@ -1,15 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotation.TableField;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/BasOutArea.java b/src/main/java/com/zy/asrs/entity/BasOutArea.java
index 7578ac4..8ab366c 100644
--- a/src/main/java/com/zy/asrs/entity/BasOutArea.java
+++ b/src/main/java/com/zy/asrs/entity/BasOutArea.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import lombok.Data;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/asrs/entity/BasOutStationArea.java b/src/main/java/com/zy/asrs/entity/BasOutStationArea.java
index 1ff9b6f..8a5fde0 100644
--- a/src/main/java/com/zy/asrs/entity/BasOutStationArea.java
+++ b/src/main/java/com/zy/asrs/entity/BasOutStationArea.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import lombok.Data;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
index 453395a..5a6f986 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -11,7 +11,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvErr.java b/src/main/java/com/zy/asrs/entity/BasRgvErr.java
index cf7aef2..faaaee5 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvErr.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvErr.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
@@ -17,7 +17,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -99,7 +99,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
@@ -115,7 +115,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
index 12f8e9d..71ba507 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -13,7 +13,7 @@
import com.zy.system.entity.User;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -233,7 +233,7 @@
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
if (!Cools.isEmpty(basWrkStatus)){
return String.valueOf(basWrkStatus.getWrkDesc());
}
@@ -242,7 +242,7 @@
public String getIoType$(){
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ BasWrkIotype basWrkIotype = service.getById(this.ioType);
if (!Cools.isEmpty(basWrkIotype)){
return String.valueOf(basWrkIotype.getIoDesc());
}
@@ -270,7 +270,7 @@
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
+ User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
@@ -286,7 +286,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
index 48e4701..1080a92 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +14,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -168,7 +168,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index 4394099..e90134b 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/src/main/java/com/zy/asrs/entity/BasStation.java
@@ -1,15 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/BasStationDevice.java b/src/main/java/com/zy/asrs/entity/BasStationDevice.java
index d2f529a..85cbfa1 100644
--- a/src/main/java/com/zy/asrs/entity/BasStationDevice.java
+++ b/src/main/java/com/zy/asrs/entity/BasStationDevice.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/entity/BasStationOpt.java b/src/main/java/com/zy/asrs/entity/BasStationOpt.java
index 666b0bd..0d7a929 100644
--- a/src/main/java/com/zy/asrs/entity/BasStationOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasStationOpt.java
@@ -1,8 +1,8 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +14,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -168,7 +168,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getId());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
index 91fb456..1c7558a 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -119,7 +119,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -151,7 +151,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
index c02168d..7c707c1 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -102,7 +102,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -134,7 +134,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/DeviceConfig.java b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
index 1eb09fb..a6e0df3 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceConfig.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceConfig.java
@@ -1,15 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/DeviceDataLog.java b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
index e49268d..5e1a617 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
@@ -1,15 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/HttpRequestLog.java b/src/main/java/com/zy/asrs/entity/HttpRequestLog.java
index 755044c..f41b7c3 100644
--- a/src/main/java/com/zy/asrs/entity/HttpRequestLog.java
+++ b/src/main/java/com/zy/asrs/entity/HttpRequestLog.java
@@ -1,15 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotation.TableField;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 491cc28..378615b 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasLocStsService;
@@ -122,7 +122,7 @@
public String getLocSts$(){
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
- BasLocSts basLocSts = service.selectById(this.locSts);
+ BasLocSts basLocSts = service.getById(this.locSts);
if (!Cools.isEmpty(basLocSts)){
return String.valueOf(basLocSts.getLocDesc());
}
@@ -180,7 +180,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -196,7 +196,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 514079f..8192ef4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -129,7 +129,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -161,7 +161,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index e339021..176ea5a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -1,10 +1,10 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.FieldStrategy;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
@@ -144,21 +144,21 @@
* 鍫嗗灈鏈哄彿
*/
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableField(value = "crn_no",strategy = FieldStrategy.IGNORED)
+ @TableField(value = "crn_no", insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
private Integer crnNo;
/**
* 鍙屽伐浣嶅爢鍨涙満鍙�
*/
@ApiModelProperty(value= "鍙屽伐浣嶅爢鍨涙満鍙�")
- @TableField(value = "dual_crn_no",strategy = FieldStrategy.IGNORED)
+ @TableField(value = "dual_crn_no", insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
private Integer dualCrnNo;
/**
* RGV鍙�
*/
@ApiModelProperty(value= "RGV鍙�")
- @TableField(value = "rgv_no",strategy = FieldStrategy.IGNORED)
+ @TableField(value = "rgv_no", insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
private Integer rgvNo;
/**
@@ -209,7 +209,7 @@
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
+ LocMast locMast = service.getById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -218,7 +218,7 @@
public String getSourceLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
+ LocMast locMast = service.getById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -234,7 +234,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -250,7 +250,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 4212cba..8436eb6 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
@@ -216,7 +216,7 @@
public String getWrkNo$(){
WrkMastService service = SpringUtils.getBean(WrkMastService.class);
- WrkMast wrkMast = service.selectById(this.wrkNo);
+ WrkMast wrkMast = service.getById(this.wrkNo);
if (!Cools.isEmpty(wrkMast)){
return String.valueOf(wrkMast.getWrkNo());
}
@@ -225,7 +225,7 @@
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
+ LocMast locMast = service.getById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -234,7 +234,7 @@
public String getSourceLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
+ LocMast locMast = service.getById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -250,7 +250,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -266,7 +266,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
index 8c39292..f4b9071 100644
--- a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.ApiLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpErrLogMapper.java
index 7879774..474399c 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpErrLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnpErrLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasCrnpErrLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpErrMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpErrMapper.java
index 51bdc94..535513b 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpErrMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnpErrMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasCrnpErr;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
index 30c488c..2f8863b 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasCrnp;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpOptMapper.java
index 08380f7..3e67ea1 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnpOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasCrnpOpt;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 8ac9b42..8b977f0 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasDevp;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java
index 0a82366..5896504 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasDualCrnpErrLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java
index 8920c86..b2ad54f 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpErrMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasDualCrnpErr;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java
index 5966820..2631df7 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasDualCrnp;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java
index 8fad86d..09c9309 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDualCrnpOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasDualCrnpOpt;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java b/src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java
index 6b4fbce..80822a4 100644
--- a/src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasLocSts;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasMapMapper.java b/src/main/java/com/zy/asrs/mapper/BasMapMapper.java
index 561086b..6cdaf55 100644
--- a/src/main/java/com/zy/asrs/mapper/BasMapMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasMapMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasMap;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasOutAreaMapper.java b/src/main/java/com/zy/asrs/mapper/BasOutAreaMapper.java
index f851741..c5dda2e 100644
--- a/src/main/java/com/zy/asrs/mapper/BasOutAreaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasOutAreaMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasOutArea;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasOutStationAreaMapper.java b/src/main/java/com/zy/asrs/mapper/BasOutStationAreaMapper.java
index df46427..04e5b90 100644
--- a/src/main/java/com/zy/asrs/mapper/BasOutStationAreaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasOutStationAreaMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasOutStationArea;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasRgvErrLogMapper.java
index ba2d4f2..43b9548 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvErrLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasRgvErrLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasRgvErrLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java b/src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java
index 4b3a44e..fc03821 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasRgvErr;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java b/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
index cb45640..ec0e0ce 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasRgv;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java
index b8622e4..8ee22d7 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasRgvOpt;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasStationDeviceMapper.java b/src/main/java/com/zy/asrs/mapper/BasStationDeviceMapper.java
index 41e9265..2fdb13d 100644
--- a/src/main/java/com/zy/asrs/mapper/BasStationDeviceMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasStationDeviceMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasStationDevice;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasStationMapper.java b/src/main/java/com/zy/asrs/mapper/BasStationMapper.java
index 9bb6da0..e59558f 100644
--- a/src/main/java/com/zy/asrs/mapper/BasStationMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasStationMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasStation;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java
index 7402006..e26520a 100644
--- a/src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasStationOpt;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java b/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
index 50f490d..e73de4b 100644
--- a/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasWrkIotype;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java b/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
index 7432bbc..9a7fb2a 100644
--- a/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasWrkStatus;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/DeviceConfigMapper.java b/src/main/java/com/zy/asrs/mapper/DeviceConfigMapper.java
index 33b0117..abbdc0d 100644
--- a/src/main/java/com/zy/asrs/mapper/DeviceConfigMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/DeviceConfigMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.DeviceConfig;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java b/src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java
index 4ec399f..ed3ff6f 100644
--- a/src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.DeviceDataLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/asrs/mapper/HttpRequestLogMapper.java b/src/main/java/com/zy/asrs/mapper/HttpRequestLogMapper.java
index f5da580..eab40ec 100644
--- a/src/main/java/com/zy/asrs/mapper/HttpRequestLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/HttpRequestLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.HttpRequestLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 399c24e..e7c3fc3 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.LocMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java b/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
index ebeb20f..a3c4948 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WrkLastno;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
index e6fde4a..96f49f9 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMastLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2bbdcec..b26ebbd 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/service/ApiLogService.java b/src/main/java/com/zy/asrs/service/ApiLogService.java
index 083c527..be22413 100644
--- a/src/main/java/com/zy/asrs/service/ApiLogService.java
+++ b/src/main/java/com/zy/asrs/service/ApiLogService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.ApiLog;
public interface ApiLogService extends IService<ApiLog> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpErrLogService.java b/src/main/java/com/zy/asrs/service/BasCrnpErrLogService.java
index 7e0fa29..2a2dc85 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpErrLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnpErrLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasCrnpErrLog;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasCrnpErrLogService extends IService<BasCrnpErrLog> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpErrService.java b/src/main/java/com/zy/asrs/service/BasCrnpErrService.java
index 66801dd..6a7f3e5 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpErrService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnpErrService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasCrnpErr;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasCrnpErrService extends IService<BasCrnpErr> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpOptService.java b/src/main/java/com/zy/asrs/service/BasCrnpOptService.java
index 52634b0..77badcf 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnpOptService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasCrnpOpt;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasCrnpOptService extends IService<BasCrnpOpt> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpService.java b/src/main/java/com/zy/asrs/service/BasCrnpService.java
index 1b8fb38..0d596f6 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnpService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasCrnp;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasCrnpService extends IService<BasCrnp> {
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index a31877c..3424979 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDevp;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasDevpService extends IService<BasDevp> {
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java
index 138065b..4312908 100644
--- a/src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpErrLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDualCrnpErrLog;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasDualCrnpErrLogService extends IService<BasDualCrnpErrLog> {
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java
index 445bca4..cc26568 100644
--- a/src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpErrService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDualCrnpErr;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasDualCrnpErrService extends IService<BasDualCrnpErr> {
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java
index 893813a..67ec1e2 100644
--- a/src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpOptService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDualCrnpOpt;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasDualCrnpOptService extends IService<BasDualCrnpOpt> {
diff --git a/src/main/java/com/zy/asrs/service/BasDualCrnpService.java b/src/main/java/com/zy/asrs/service/BasDualCrnpService.java
index 5f378a8..fc01066 100644
--- a/src/main/java/com/zy/asrs/service/BasDualCrnpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDualCrnpService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDualCrnp;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasDualCrnpService extends IService<BasDualCrnp> {
diff --git a/src/main/java/com/zy/asrs/service/BasLocStsService.java b/src/main/java/com/zy/asrs/service/BasLocStsService.java
index 85f68fb..b1f0c34 100644
--- a/src/main/java/com/zy/asrs/service/BasLocStsService.java
+++ b/src/main/java/com/zy/asrs/service/BasLocStsService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasLocSts;
public interface BasLocStsService extends IService<BasLocSts> {
diff --git a/src/main/java/com/zy/asrs/service/BasMapService.java b/src/main/java/com/zy/asrs/service/BasMapService.java
index ce57132..f05d78e 100644
--- a/src/main/java/com/zy/asrs/service/BasMapService.java
+++ b/src/main/java/com/zy/asrs/service/BasMapService.java
@@ -4,7 +4,7 @@
import java.util.List;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasMapService extends IService<BasMap> {
diff --git a/src/main/java/com/zy/asrs/service/BasOutAreaService.java b/src/main/java/com/zy/asrs/service/BasOutAreaService.java
index 40e364d..a660afa 100644
--- a/src/main/java/com/zy/asrs/service/BasOutAreaService.java
+++ b/src/main/java/com/zy/asrs/service/BasOutAreaService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasOutArea;
public interface BasOutAreaService extends IService<BasOutArea> {
diff --git a/src/main/java/com/zy/asrs/service/BasOutStationAreaService.java b/src/main/java/com/zy/asrs/service/BasOutStationAreaService.java
index b863717..13e34ec 100644
--- a/src/main/java/com/zy/asrs/service/BasOutStationAreaService.java
+++ b/src/main/java/com/zy/asrs/service/BasOutStationAreaService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasOutStationArea;
public interface BasOutStationAreaService extends IService<BasOutStationArea> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvErrLogService.java b/src/main/java/com/zy/asrs/service/BasRgvErrLogService.java
index b7057a8..d06f58e 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvErrLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasRgvErrLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasRgvErrLog;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasRgvErrLogService extends IService<BasRgvErrLog> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvErrService.java b/src/main/java/com/zy/asrs/service/BasRgvErrService.java
index 754bb63..139d8fa 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvErrService.java
+++ b/src/main/java/com/zy/asrs/service/BasRgvErrService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasRgvErr;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasRgvErrService extends IService<BasRgvErr> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvOptService.java b/src/main/java/com/zy/asrs/service/BasRgvOptService.java
index cd3edcb..2192bb6 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasRgvOptService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasRgvOpt;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasRgvOptService extends IService<BasRgvOpt> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvService.java b/src/main/java/com/zy/asrs/service/BasRgvService.java
index 12d4aba..dd1d8f9 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvService.java
+++ b/src/main/java/com/zy/asrs/service/BasRgvService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasRgv;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasRgvService extends IService<BasRgv> {
diff --git a/src/main/java/com/zy/asrs/service/BasStationDeviceService.java b/src/main/java/com/zy/asrs/service/BasStationDeviceService.java
index 98c5fba..859ab05 100644
--- a/src/main/java/com/zy/asrs/service/BasStationDeviceService.java
+++ b/src/main/java/com/zy/asrs/service/BasStationDeviceService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasStationDevice;
public interface BasStationDeviceService extends IService<BasStationDevice> {
diff --git a/src/main/java/com/zy/asrs/service/BasStationOptService.java b/src/main/java/com/zy/asrs/service/BasStationOptService.java
index 19cf329..bca1947 100644
--- a/src/main/java/com/zy/asrs/service/BasStationOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasStationOptService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasStationOpt;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasStationOptService extends IService<BasStationOpt> {
diff --git a/src/main/java/com/zy/asrs/service/BasStationService.java b/src/main/java/com/zy/asrs/service/BasStationService.java
index 96eceb3..97285dc 100644
--- a/src/main/java/com/zy/asrs/service/BasStationService.java
+++ b/src/main/java/com/zy/asrs/service/BasStationService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasStation;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasStationService extends IService<BasStation> {
diff --git a/src/main/java/com/zy/asrs/service/BasWrkIotypeService.java b/src/main/java/com/zy/asrs/service/BasWrkIotypeService.java
index aeb603d..5d43ca1 100644
--- a/src/main/java/com/zy/asrs/service/BasWrkIotypeService.java
+++ b/src/main/java/com/zy/asrs/service/BasWrkIotypeService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasWrkIotype;
public interface BasWrkIotypeService extends IService<BasWrkIotype> {
diff --git a/src/main/java/com/zy/asrs/service/BasWrkStatusService.java b/src/main/java/com/zy/asrs/service/BasWrkStatusService.java
index d64196e..1db229a 100644
--- a/src/main/java/com/zy/asrs/service/BasWrkStatusService.java
+++ b/src/main/java/com/zy/asrs/service/BasWrkStatusService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasWrkStatus;
public interface BasWrkStatusService extends IService<BasWrkStatus> {
diff --git a/src/main/java/com/zy/asrs/service/DeviceConfigService.java b/src/main/java/com/zy/asrs/service/DeviceConfigService.java
index f859f33..3122ed1 100644
--- a/src/main/java/com/zy/asrs/service/DeviceConfigService.java
+++ b/src/main/java/com/zy/asrs/service/DeviceConfigService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.DeviceConfig;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface DeviceConfigService extends IService<DeviceConfig> {
diff --git a/src/main/java/com/zy/asrs/service/DeviceDataLogService.java b/src/main/java/com/zy/asrs/service/DeviceDataLogService.java
index 9295bd8..89aa488 100644
--- a/src/main/java/com/zy/asrs/service/DeviceDataLogService.java
+++ b/src/main/java/com/zy/asrs/service/DeviceDataLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.DeviceDataLog;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface DeviceDataLogService extends IService<DeviceDataLog> {
diff --git a/src/main/java/com/zy/asrs/service/HttpRequestLogService.java b/src/main/java/com/zy/asrs/service/HttpRequestLogService.java
index 419d2ed..d59efdf 100644
--- a/src/main/java/com/zy/asrs/service/HttpRequestLogService.java
+++ b/src/main/java/com/zy/asrs/service/HttpRequestLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.HttpRequestLog;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface HttpRequestLogService extends IService<HttpRequestLog> {
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 6c7d271..0bb4cd9 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.LocMast;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/NotifyAsyncService.java b/src/main/java/com/zy/asrs/service/NotifyAsyncService.java
index 7bde6e2..af96c7f 100644
--- a/src/main/java/com/zy/asrs/service/NotifyAsyncService.java
+++ b/src/main/java/com/zy/asrs/service/NotifyAsyncService.java
@@ -75,7 +75,7 @@
result.setMessage("閫氱煡寮傚父: " + e.getMessage());
} finally {
httpRequestLog.setResult(result.isSuccess() ? 1 : 0);
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
}
if (!result.isSuccess() && updateRetryState && key != null) {
diff --git a/src/main/java/com/zy/asrs/service/WrkLastnoService.java b/src/main/java/com/zy/asrs/service/WrkLastnoService.java
index c3c2df8..2a9d68a 100644
--- a/src/main/java/com/zy/asrs/service/WrkLastnoService.java
+++ b/src/main/java/com/zy/asrs/service/WrkLastnoService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.WrkLastno;
public interface WrkLastnoService extends IService<WrkLastno> {
diff --git a/src/main/java/com/zy/asrs/service/WrkMastLogService.java b/src/main/java/com/zy/asrs/service/WrkMastLogService.java
index 292f694..36a9bc9 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastLogService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.WrkMastLog;
public interface WrkMastLogService extends IService<WrkMastLog> {
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 7148656..d85f190 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.WrkMast;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
index b13d660..1b90911 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.SnowflakeIdWorker;
import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.mapper.ApiLogMapper;
@@ -39,7 +39,7 @@
null, // 淇敼鏃堕棿
null // 澶囨敞
);
- if (!this.insert(apiLog)) {
+ if (!this.save(apiLog)) {
log.error("鎺ュ彛璋冪敤鏃ュ織淇濆瓨澶辫触锛�");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpErrLogServiceImpl.java
index 3cfbf51..922c87f 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpErrLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpErrLogServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasCrnpErrLogMapper;
import com.zy.asrs.entity.BasCrnpErrLog;
import com.zy.asrs.service.BasCrnpErrLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basCrnpErrLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpErrServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpErrServiceImpl.java
index f1182f8..db9b17f 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpErrServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpErrServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasCrnpErrMapper;
import com.zy.asrs.entity.BasCrnpErr;
import com.zy.asrs.service.BasCrnpErrService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basCrnpErrService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpOptServiceImpl.java
index ab475ae..5f61b77 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpOptServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasCrnpOptMapper;
import com.zy.asrs.entity.BasCrnpOpt;
import com.zy.asrs.service.BasCrnpOptService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basCrnpOptService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index 7068887..ddeb4b4 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnpService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basCrnpService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index e176b21..6d9266a 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basDevpService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java
index 0abf97a..b6e6b4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrLogServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasDualCrnpErrLogMapper;
import com.zy.asrs.entity.BasDualCrnpErrLog;
import com.zy.asrs.service.BasDualCrnpErrLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basDualCrnpErrLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java
index bd3c27c..2ab5a58 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpErrServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasDualCrnpErrMapper;
import com.zy.asrs.entity.BasDualCrnpErr;
import com.zy.asrs.service.BasDualCrnpErrService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basDualCrnpErrService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java
index 2d13b09..6595305 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpOptServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasDualCrnpOptMapper;
import com.zy.asrs.entity.BasDualCrnpOpt;
import com.zy.asrs.service.BasDualCrnpOptService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basDualCrnpOptService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java
index 98c4bcb..d64cfd3 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDualCrnpServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasDualCrnpMapper;
import com.zy.asrs.entity.BasDualCrnp;
import com.zy.asrs.service.BasDualCrnpService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basDualCrnpService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java
index 59a5106..3c36b65 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasLocSts;
import com.zy.asrs.mapper.BasLocStsMapper;
import com.zy.asrs.service.BasLocStsService;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java
index a9e4d53..b325718 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java
@@ -3,8 +3,8 @@
import com.zy.asrs.mapper.BasMapMapper;
import com.zy.asrs.entity.BasMap;
import com.zy.asrs.service.BasMapService;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
import java.util.stream.Collectors;
@@ -26,7 +26,7 @@
@Override
public List<Integer> getLevList() {
- return this.baseMapper.selectList(new EntityWrapper<>()).stream().map(BasMap::getLev).collect(Collectors.toList());
+ return this.baseMapper.selectList(new QueryWrapper<>()).stream().map(BasMap::getLev).collect(Collectors.toList());
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasOutAreaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasOutAreaServiceImpl.java
index 176429d..90e036a 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasOutAreaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasOutAreaServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasOutArea;
import com.zy.asrs.mapper.BasOutAreaMapper;
import com.zy.asrs.service.BasOutAreaService;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasOutStationAreaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasOutStationAreaServiceImpl.java
index 31858d2..44e5693 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasOutStationAreaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasOutStationAreaServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasOutStationArea;
import com.zy.asrs.mapper.BasOutStationAreaMapper;
import com.zy.asrs.service.BasOutStationAreaService;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasRgvErrLogServiceImpl.java
index 6bcbd03..7c53890 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvErrLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasRgvErrLogServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasRgvErrLogMapper;
import com.zy.asrs.entity.BasRgvErrLog;
import com.zy.asrs.service.BasRgvErrLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basRgvErrLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
index dcf62fd..f08431c 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.service.BasRgvErrService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basRgvErrService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java
index 3d6d2a8..0a60f60 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasRgvOptMapper;
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasRgvOptService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basRgvOptService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
index 36c7bb0..317059d 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasRgvMapper;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.service.BasRgvService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basRgvService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasStationDeviceServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasStationDeviceServiceImpl.java
index 6cca0f8..4b6e7ac 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasStationDeviceServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasStationDeviceServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasStationDevice;
import com.zy.asrs.mapper.BasStationDeviceMapper;
import com.zy.asrs.service.BasStationDeviceService;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java
index 3fb05ec..be2862b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasStationOptMapper;
import com.zy.asrs.entity.BasStationOpt;
import com.zy.asrs.service.BasStationOptService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basStationOptService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java
index 272a9bd..25118fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.BasStationMapper;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.service.BasStationService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basStationService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasWrkIotypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasWrkIotypeServiceImpl.java
index 9c6c8c6..d40329e 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasWrkIotypeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasWrkIotypeServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasWrkIotype;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
import com.zy.asrs.service.BasWrkIotypeService;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasWrkStatusServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasWrkStatusServiceImpl.java
index 9684470..73256b4 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasWrkStatusServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasWrkStatusServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasWrkStatus;
import com.zy.asrs.mapper.BasWrkStatusMapper;
import com.zy.asrs.service.BasWrkStatusService;
diff --git a/src/main/java/com/zy/asrs/service/impl/DeviceConfigServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DeviceConfigServiceImpl.java
index 15c7ba0..f92520c 100644
--- a/src/main/java/com/zy/asrs/service/impl/DeviceConfigServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DeviceConfigServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.DeviceConfigMapper;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.DeviceConfigService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("deviceConfigService")
diff --git a/src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java
index 5b5460e..e0cbc8b 100644
--- a/src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.DeviceDataLogMapper;
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.DeviceDataLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("deviceDataLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/HttpRequestLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/HttpRequestLogServiceImpl.java
index 9f6b0b6..3de21ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/HttpRequestLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/HttpRequestLogServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.asrs.mapper.HttpRequestLogMapper;
import com.zy.asrs.entity.HttpRequestLog;
import com.zy.asrs.service.HttpRequestLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("httpRequestLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 714f947..95246ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
diff --git a/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
index 115fefc..a73721a 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
@@ -54,7 +54,7 @@
public JSONObject calculateAndSaveSchedule() {
ArrayList<HashMap<String, Object>> crnDataList = new ArrayList<>();
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("status", 1));
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<BasCrnp>().eq("status", 1));
Map<Integer, StationObjModel> stationIndex = new HashMap<>();
Map<Integer, String> stationCrnCodeIndex = new HashMap<>();
@@ -123,7 +123,7 @@
CrnProtocol p = crnThread.getStatus();
Integer tNo = p.getTaskNo();
if (tNo != null && tNo > 0) {
- WrkMast task = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", tNo));
+ WrkMast task = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wrk_no", tNo));
if (task != null) {
// Calculate current X, Y
double curX = (p.getBay() == null ? 0 : p.getBay()) * bayWidth;
@@ -237,7 +237,7 @@
}
ArrayList<HashMap<String, Object>> taskDataList = new ArrayList<>();
- List<WrkMast> outTasks = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts));
+ List<WrkMast> outTasks = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts));
for (WrkMast wrkMast : outTasks) {
HashMap<String, Object> t = new HashMap<>();
t.put("taskId", wrkMast.getWrkNo());
@@ -298,7 +298,7 @@
taskDataList.add(t);
}
- List<WrkMast> moveTasks = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_LOC_MOVE.sts));
+ List<WrkMast> moveTasks = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_LOC_MOVE.sts));
for (WrkMast wrkMast : moveTasks) {
HashMap<String, Object> t = new HashMap<>();
t.put("taskId", wrkMast.getWrkNo());
@@ -352,7 +352,7 @@
taskDataList.add(t);
}
- List<WrkMast> inTasks = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.INBOUND_DEVICE_RUN.sts));
+ List<WrkMast> inTasks = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.INBOUND_DEVICE_RUN.sts));
for (WrkMast wrkMast : inTasks) {
HashMap<String, Object> t = new HashMap<>();
t.put("taskId", wrkMast.getWrkNo());
@@ -432,8 +432,8 @@
result = null;
}
} else {
- Config uriCfg = configService.selectOne(new EntityWrapper<Config>().eq("code", "plannerSolverUri"));
- Config pathCfg = configService.selectOne(new EntityWrapper<Config>().eq("code", "plannerSolverPath"));
+ Config uriCfg = configService.getOne(new QueryWrapper<Config>().eq("code", "plannerSolverUri"));
+ Config pathCfg = configService.getOne(new QueryWrapper<Config>().eq("code", "plannerSolverPath"));
if (uriCfg == null || pathCfg == null || uriCfg.getValue() == null || pathCfg.getValue() == null) {
// 濡傛灉鏄湇鍔¤皟鐢紝杩欓噷鏃犳硶鐩存帴杩斿洖R.error锛岃繑鍥瀗ull鎴栬�卐mpty json
return null;
@@ -508,7 +508,7 @@
private Double getDoubleConfig(String code, Double def) {
try {
- Config c = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config c = configService.getOne(new QueryWrapper<Config>().eq("code", code));
if (c != null && c.getValue() != null && c.getValue().trim().length() > 0) {
return Double.parseDouble(c.getValue().trim());
}
@@ -518,7 +518,7 @@
private Integer getIntConfig(String code, Integer def) {
try {
- Config c = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config c = configService.getOne(new QueryWrapper<Config>().eq("code", code));
if (c != null && c.getValue() != null && c.getValue().trim().length() > 0) {
String v = c.getValue().trim();
if (v.endsWith("%")) v = v.substring(0, v.length() - 1);
@@ -530,7 +530,7 @@
private Boolean getBoolConfig(String code, Boolean def) {
try {
- Config c = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config c = configService.getOne(new QueryWrapper<Config>().eq("code", code));
if (c != null && c.getValue() != null) {
String v = c.getValue().trim().toUpperCase();
if ("Y".equals(v) || "TRUE".equals(v)) return true;
diff --git a/src/main/java/com/zy/asrs/service/impl/StationCycleCapacityServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StationCycleCapacityServiceImpl.java
index 493238d..f06ff9a 100644
--- a/src/main/java/com/zy/asrs/service/impl/StationCycleCapacityServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StationCycleCapacityServiceImpl.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.domain.vo.StationCycleCapacityVo;
import com.zy.asrs.domain.vo.StationCycleLoopVo;
import com.zy.asrs.entity.BasDevp;
@@ -376,7 +376,7 @@
}
private void appendExcludeStationsFromDeviceConfig(Set<Integer> excludeStationSet) {
- List<BasDevp> basDevpList = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevpList = basDevpService.list(new QueryWrapper<>());
if (basDevpList == null || basDevpList.isEmpty()) {
return;
}
@@ -418,7 +418,7 @@
private Map<Integer, Integer> buildStationWorkNoMap() {
Map<Integer, Integer> workNoMap = new HashMap<>();
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
if (devpList == null || devpList.isEmpty()) {
return workNoMap;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
index f069f52..2a5a4a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.mapper.WrkLastnoMapper;
import com.zy.asrs.service.WrkLastnoService;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
index bbb1351..e75f8e2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastLog;
import com.zy.asrs.mapper.WrkMastLogMapper;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 8776a4e..f3fc6e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
diff --git a/src/main/java/com/zy/asrs/task/NotifyScheduler.java b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
index 665f5e7..d6c9bd3 100644
--- a/src/main/java/com/zy/asrs/task/NotifyScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
@@ -1,6 +1,6 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.domain.NotifyDto;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.DeviceConfigService;
@@ -34,7 +34,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyShuttle() {
- List<DeviceConfig> deviceList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> deviceList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
for (DeviceConfig device : deviceList) {
notifyMsg(String.valueOf(SlaveType.Crn), device.getDeviceNo());
@@ -43,7 +43,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyForkLift() {
- List<DeviceConfig> deviceList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> deviceList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
for (DeviceConfig device : deviceList) {
notifyMsg(String.valueOf(SlaveType.Rgv), device.getDeviceNo());
@@ -52,7 +52,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void notifyStation() {
- List<DeviceConfig> deviceList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> deviceList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig device : deviceList) {
notifyMsg(String.valueOf(SlaveType.Devp), device.getDeviceNo());
@@ -75,7 +75,7 @@
}
private synchronized void notifyMsg(String notifyType, Integer device) {
- Config notifyEnableConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyEnable"));
+ Config notifyEnableConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "notifyEnable"));
if (notifyEnableConfig == null) {
return;
}
@@ -84,13 +84,13 @@
return;
}
- Config notifyUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyUri"));
+ Config notifyUriConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "notifyUri"));
if (notifyUriConfig == null) {
return;
}
String notifyUri = notifyUriConfig.getValue();
- Config notifyUriPathConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyUriPath"));
+ Config notifyUriPathConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "notifyUriPath"));
if (notifyUriPathConfig == null) {
return;
}
diff --git a/src/main/java/com/zy/asrs/task/PlannerScheduler.java b/src/main/java/com/zy/asrs/task/PlannerScheduler.java
index 5e327b8..edd8275 100644
--- a/src/main/java/com/zy/asrs/task/PlannerScheduler.java
+++ b/src/main/java/com/zy/asrs/task/PlannerScheduler.java
@@ -1,7 +1,7 @@
package com.zy.asrs.task;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.service.PlannerService;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -22,7 +22,7 @@
public void schedulePlanner() {
try {
String crnRunMethod = "normal";
- Config crnRunMethodConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "crnRunMethod"));
+ Config crnRunMethodConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "crnRunMethod"));
if(crnRunMethodConfig != null) {
crnRunMethod = crnRunMethodConfig.getValue();
}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
index 9f2a2bd..e9d01c5 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
@@ -1,7 +1,7 @@
package com.zy.asrs.task;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
@@ -38,7 +38,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
public void executeIn(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_INBOUND.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_INBOUND.sts));
if (wrkMasts.isEmpty()) {
return;
}
@@ -70,7 +70,7 @@
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
+ if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
log.info("鍒犻櫎宸ヤ綔涓绘。[workNo={}]澶辫触", wrkMast.getWrkNo());
}
@@ -82,7 +82,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
public void executeOut(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_OUTBOUND.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_OUTBOUND.sts));
if (wrkMasts.isEmpty()) {
return;
}
@@ -114,7 +114,7 @@
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
+ if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
log.info("鍒犻櫎宸ヤ綔涓绘。[workNo={}]澶辫触", wrkMast.getWrkNo());
}
@@ -126,7 +126,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
public void executeLocMove(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_LOC_MOVE.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_LOC_MOVE.sts));
if (wrkMasts.isEmpty()) {
return;
}
@@ -179,7 +179,7 @@
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
+ if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
log.info("鍒犻櫎宸ヤ綔涓绘。[workNo={}]澶辫触", wrkMast.getWrkNo());
}
@@ -191,7 +191,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
public void executeCancelTask(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("mk", "taskCancel"));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("mk", "taskCancel"));
if (wrkMasts.isEmpty()) {
return;
}
@@ -202,7 +202,7 @@
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
+ if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
log.info("鍒犻櫎宸ヤ綔涓绘。[workNo={}]澶辫触", wrkMast.getWrkNo());
}
@@ -240,7 +240,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
public void processOutStationRun(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
if (wrkMasts.isEmpty()) {
return;
}
diff --git a/src/main/java/com/zy/asrs/utils/NotifyUtils.java b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
index 4bda147..d4cda7b 100644
--- a/src/main/java/com/zy/asrs/utils/NotifyUtils.java
+++ b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
@@ -1,6 +1,6 @@
package com.zy.asrs.utils;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.SnowflakeIdWorker;
import com.zy.asrs.domain.NotifyDto;
import com.zy.asrs.domain.enums.NotifyMsgType;
@@ -103,7 +103,7 @@
private boolean append(String notifyType, Integer device, String taskNo, String superTaskNo, NotifyMsgType msgType, String data) {
boolean notifyEnable = true;
- Config notifyEnableConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyEnable"));
+ Config notifyEnableConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "notifyEnable"));
if (notifyEnableConfig != null) {
notifyEnable = notifyEnableConfig.getValue().equals("Y");
}
@@ -128,13 +128,13 @@
dto.setSuperTaskNo(superTaskNo);
//閲嶈瘯娆℃暟
- Config notifyFailTimesConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyFailTimes"));
+ Config notifyFailTimesConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "notifyFailTimes"));
if (notifyFailTimesConfig != null) {
dto.setFailTimes(Integer.parseInt(notifyFailTimesConfig.getValue()));
}
//閲嶈瘯闂撮殧
- Config notifyRetryTimeConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyRetryTime"));
+ Config notifyRetryTimeConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "notifyRetryTime"));
if (notifyRetryTimeConfig != null) {
dto.setRetryTime(Integer.parseInt(notifyRetryTimeConfig.getValue()));
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index f3430d1..7fb3df8 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,8 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -172,7 +172,7 @@
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
BasStationDeviceService basStationDeviceService = SpringUtils.getBean(BasStationDeviceService.class);
- List<BasStationDevice> stationDevices = basStationDeviceService.selectList(new EntityWrapper<BasStationDevice>().eq("station_id", stationId));
+ List<BasStationDevice> stationDevices = basStationDeviceService.list(new QueryWrapper<BasStationDevice>().eq("station_id", stationId));
boolean hasConfig = !stationDevices.isEmpty();
List<Integer> allowedCrnNos = new ArrayList<>();
if (hasConfig) {
@@ -189,18 +189,18 @@
currentCircleTaskCrnNo = Integer.parseInt(String.valueOf(object));
}
- Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>()
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<BasCrnp>()
.eq("in_enable", "Y")
.eq("status", 1);
if (currentCircleTaskCrnNo != null) {
currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>()
.eq("crn_no", currentCircleTaskCrnNo)
.eq("in_enable", "Y")
.eq("status", 1)
);
- List<WrkMast> currentCrnTask = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> currentCrnTask = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", currentCircleTaskCrnNo)
);
if (currentCrnTask.size() <= 1) {
@@ -215,8 +215,8 @@
}
HashMap<Integer, Integer> map = new HashMap<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- List<BasCrnp> basCrnps = basCrnpService.selectList(wrapper);
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(wrapper);
List<BasCrnp> baseList = new ArrayList<>();
List<BasCrnp> extraList = new ArrayList<>();
@@ -245,7 +245,7 @@
continue;
}
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> inWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
.eq("io_type", WrkIoType.IN.id)
);
@@ -308,7 +308,7 @@
BasDualCrnpService basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
BasStationDeviceService basStationDeviceService = SpringUtils.getBean(BasStationDeviceService.class);
- List<BasStationDevice> stationDevices = basStationDeviceService.selectList(new EntityWrapper<BasStationDevice>().eq("station_id", stationId));
+ List<BasStationDevice> stationDevices = basStationDeviceService.list(new QueryWrapper<BasStationDevice>().eq("station_id", stationId));
boolean hasConfig = !stationDevices.isEmpty();
List<Integer> allowedCrnNos = new ArrayList<>();
if (hasConfig) {
@@ -319,13 +319,13 @@
}
}
- Wrapper<BasDualCrnp> wrapper = new EntityWrapper<BasDualCrnp>()
+ QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<BasDualCrnp>()
.eq("in_enable", "Y")
.eq("status", 1);
HashMap<Integer, Integer> map = new HashMap<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(wrapper);
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(wrapper);
List<BasDualCrnp> baseList = new ArrayList<>();
List<BasDualCrnp> extraList = new ArrayList<>();
@@ -354,7 +354,7 @@
continue;
}
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> inWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("dual_crn_no", basDualCrnp.getCrnNo())
.eq("io_type", WrkIoType.IN.id)
);
@@ -435,7 +435,7 @@
return rowList;
}
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<BasCrnp>());
for (BasCrnp basCrnp : basCrnps) {
String deepRowsStr = basCrnp.getDeepRows();
if(!Cools.isEmpty(deepRowsStr)){
@@ -444,7 +444,7 @@
}
}
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<BasDualCrnp>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<BasDualCrnp>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
String deepRowsStr = basDualCrnp.getDeepRows();
if(!Cools.isEmpty(deepRowsStr)){
@@ -484,7 +484,7 @@
}
List<Integer> controlRowList = null;
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<List<Integer>> rowList = basCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -526,7 +526,7 @@
}
List<Integer> controlRowList = null;
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<List<Integer>> rowList = basDualCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -577,7 +577,7 @@
List<Integer> controlRowList = null;
List<Integer> deepRowList = null;
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<List<Integer>> rowList = basCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -616,7 +616,7 @@
List<Integer> controlRowList = null;
List<Integer> deepRowList = null;
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<List<Integer>> rowList = basDualCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -658,7 +658,7 @@
return null;
}
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<List<Integer>> controlRows = basCrnp.getControlRows$();
for (List<Integer> list : controlRows) {
@@ -668,7 +668,7 @@
}
}
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<List<Integer>> controlRows = basDualCrnp.getControlRows$();
for (List<Integer> list : controlRows) {
diff --git a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
index 63ef73c..01cf25e 100644
--- a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
+++ b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
@@ -11,8 +11,8 @@
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.*;
+import jakarta.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.util.concurrent.CopyOnWriteArraySet;
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 184f627..a9badbf 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -1,7 +1,7 @@
package com.zy.common.config;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -13,18 +13,18 @@
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
/**
* Created by vincent on 2019-06-13
*/
@Component
-public class AdminInterceptor extends HandlerInterceptorAdapter {
+public class AdminInterceptor implements HandlerInterceptor {
@Value("${super.pwd}")
private String superPwd;
@@ -81,19 +81,19 @@
// if (obj instanceof OperateLog) {
// OperateLog operate = (OperateLog) obj;
// operate.setResponse(String.valueOf(response.getStatus()));
-// operateLogService.insert(operate);
+// operateLogService.save(operate);
// }
}
private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
String token = request.getHeader("token");
- UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token).eq("system_type", "WCS"));
+ UserLogin userLogin = userLoginService.getOne(new QueryWrapper<UserLogin>().eq("token", token).eq("system_type", "WCS"));
if (null == userLogin){
Http.response(response, BaseRes.DENIED);
return false;
}
- User user = userService.selectById(userLogin.getUserId());
+ User user = userService.getById(userLogin.getUserId());
String deToken = Cools.deTokn(token, user.getPassword());
long timestamp = Long.parseLong(deToken.substring(0, 13));
// 1澶╁悗杩囨湡
@@ -113,7 +113,7 @@
operateLog.setUserId(user.getId());
operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
operateLog.setResponse(JSON.toJSONString(request.getRequestURI()));
- operateLogService.insert(operateLog);
+ operateLogService.save(operateLog);
// 璇锋眰缂撳瓨
request.setAttribute("userId", user.getId());
// request.setAttribute("operateLog", operateLog);
@@ -133,9 +133,9 @@
Permission permission = new Permission();
permission.setAction(action);
permission.setStatus((short) 1);
- Permission one = permissionService.selectOne(new EntityWrapper<>(permission));
+ Permission one = permissionService.getOne(new QueryWrapper<>(permission));
if (!Cools.isEmpty(one)) {
- RolePermission rolePermission = rolePermissionService.selectOne(new EntityWrapper<>(new RolePermission(user.getRoleId(), permission.getId())));
+ RolePermission rolePermission = rolePermissionService.getOne(new QueryWrapper<>(new RolePermission(user.getRoleId(), permission.getId())));
return !Cools.isEmpty(rolePermission);
}
return true;
diff --git a/src/main/java/com/zy/common/config/AspectConfig.java b/src/main/java/com/zy/common/config/AspectConfig.java
index 91fa0b6..97cc842 100644
--- a/src/main/java/com/zy/common/config/AspectConfig.java
+++ b/src/main/java/com/zy/common/config/AspectConfig.java
@@ -21,8 +21,8 @@
import org.springframework.web.context.request.ServletRequestAttributes;
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.lang.reflect.Method;
import java.util.Arrays;
import java.util.Date;
@@ -101,7 +101,7 @@
}
private void saveLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object result, String memo) {
- apiLogService.insert(new ApiLog(
+ apiLogService.save(new ApiLog(
null,
memo,
request != null ? Optional.ofNullable(String.valueOf(request.getRequestURI())).orElse(null) : null,
@@ -120,7 +120,7 @@
private void saveErrLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object response, Throwable ex,
String memo) {
- apiLogService.insert(new ApiLog(
+ apiLogService.save(new ApiLog(
null,
memo,
request != null ? Optional.ofNullable(String.valueOf(request.getRequestURI())).orElse(null) : null,
diff --git a/src/main/java/com/zy/common/config/RedisConfig.java b/src/main/java/com/zy/common/config/RedisConfig.java
index cf99252..0f33631 100644
--- a/src/main/java/com/zy/common/config/RedisConfig.java
+++ b/src/main/java/com/zy/common/config/RedisConfig.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -37,7 +38,7 @@
// 鎸囧畾瑕佸簭鍒楀寲鐨勫煙锛宖ield,get鍜宻et,浠ュ強淇グ绗﹁寖鍥达紝ANY鏄兘鏈夊寘鎷琾rivate鍜宲ublic
om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
// 鎸囧畾搴忓垪鍖栬緭鍏ョ殑绫诲瀷锛岀被蹇呴』鏄潪final淇グ鐨勶紝final淇グ鐨勭被锛屾瘮濡係tring,Integer绛変細璺戝嚭寮傚父
- om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+ om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
jacksonSerializer.setObjectMapper(om);
// 鍊奸噰鐢╦son搴忓垪鍖�
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index 548158f..c00e09f 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -1,7 +1,7 @@
package com.zy.common.entity;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.Config;
@@ -36,7 +36,7 @@
*/
public static Parameter reset() {
ConfigService configService = SpringUtils.getBean(ConfigService.class);
- List<Config> configs = configService.selectList(new EntityWrapper<Config>().eq("status", "1"));
+ List<Config> configs = configService.list(new QueryWrapper<Config>().eq("status", "1"));
Map<String, Object> data = new HashMap<>();
for (Config config : configs) {
if (config.getType() == 1) {
diff --git a/src/main/java/com/zy/common/i18n/RequestLocaleInterceptor.java b/src/main/java/com/zy/common/i18n/RequestLocaleInterceptor.java
index 3cf87b0..5c59e3f 100644
--- a/src/main/java/com/zy/common/i18n/RequestLocaleInterceptor.java
+++ b/src/main/java/com/zy/common/i18n/RequestLocaleInterceptor.java
@@ -3,15 +3,15 @@
import com.core.common.Cools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.HandlerInterceptor;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Locale;
@Component
-public class RequestLocaleInterceptor extends HandlerInterceptorAdapter {
+public class RequestLocaleInterceptor implements HandlerInterceptor {
public static final String LANG_COOKIE_NAME = "wcs_lang";
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 54be1d4..c5283be 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,6 +1,6 @@
package com.zy.common.service;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.param.*;
@@ -49,7 +49,7 @@
* @return workNo(宸ヤ綔鍙�)
*/
public synchronized int getWorkNo(Integer wrkMk) {
- WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
+ WrkLastno wrkLastno = wrkLastnoService.getById(wrkMk);
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
@@ -89,7 +89,7 @@
if(wrkNo == null) {
if (!Cools.isEmpty(taskNo)) {
- wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+ wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
}
}else {
wrkMast = wrkMastService.selectByWorkNo(wrkNo);
@@ -119,7 +119,7 @@
if(wrkNo == null) {
if (!Cools.isEmpty(taskNo)) {
- wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+ wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
}
}else {
wrkMast = wrkMastService.selectByWorkNo(wrkNo);
@@ -199,7 +199,7 @@
throw new CoolException("鏈煡璁惧绫诲瀷");
}
- boolean res = wrkMastService.insert(wrkMast);
+ boolean res = wrkMastService.save(wrkMast);
if (!res) {
News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -267,7 +267,7 @@
throw new CoolException("鏈煡璁惧绫诲瀷");
}
- boolean res = wrkMastService.insert(wrkMast);
+ boolean res = wrkMastService.save(wrkMast);
if (!res) {
News.error("鍏ュ簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -309,7 +309,7 @@
}
if(Cools.isEmpty(staNo)) {
- List<BasOutStationArea> areaList = basOutStationAreaService.selectList(new EntityWrapper<BasOutStationArea>().eq("area_code", outArea));
+ List<BasOutStationArea> areaList = basOutStationAreaService.list(new QueryWrapper<BasOutStationArea>().eq("area_code", outArea));
if (areaList.isEmpty()) {
throw new CoolException("鍑哄簱鍖哄煙涓嶅瓨鍦�");
}
@@ -349,11 +349,11 @@
}
if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", crnNo));
if(basCrnp == null) {
throw new CoolException("鏈壘鍒板搴斿爢鍨涙満鏁版嵁");
}
- List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> outWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", crnNo)
.eq("io_type", WrkIoType.OUT.id)
);
@@ -365,11 +365,11 @@
wrkMast.setCrnNo(findCrnResult.getCrnNo());
} else if (findCrnResult.getCrnType().equals(SlaveType.DualCrn)) {
- BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", crnNo));
+ BasDualCrnp basDualCrnp = basDualCrnpService.getOne(new QueryWrapper<BasDualCrnp>().eq("crn_no", crnNo));
if(basDualCrnp == null) {
throw new CoolException("鏈壘鍒板搴斿弻宸ヤ綅鍫嗗灈鏈烘暟鎹�");
}
- List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> outWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("dual_crn_no", crnNo)
.eq("io_type", WrkIoType.OUT.id)
);
@@ -384,7 +384,7 @@
throw new CoolException("鏈煡璁惧绫诲瀷");
}
- boolean res = wrkMastService.insert(wrkMast);
+ boolean res = wrkMastService.save(wrkMast);
if (!res) {
News.error("鍑哄簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -397,7 +397,7 @@
}
public FindCrnNoResult findCrnNoByLocNo(String locNo) {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<List<Integer>> rowList = basCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -410,7 +410,7 @@
}
}
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<List<Integer>> rowList = basDualCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -429,13 +429,13 @@
List<StationObjModel> stationList = new ArrayList<>();
Integer crnNo = findCrnNoResult.getCrnNo();
if (findCrnNoResult.getCrnType().equals(SlaveType.Crn)) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", crnNo));
if(basCrnp == null) {
return null;
}
stationList = basCrnp.getInStationList$();
} else if (findCrnNoResult.getCrnType().equals(SlaveType.DualCrn)) {
- BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", crnNo));
+ BasDualCrnp basDualCrnp = basDualCrnpService.getOne(new QueryWrapper<BasDualCrnp>().eq("crn_no", crnNo));
if(basDualCrnp == null) {
return null;
}
@@ -461,13 +461,13 @@
List<StationObjModel> stationList = new ArrayList<>();
Integer crnNo = findCrnNoResult.getCrnNo();
if (findCrnNoResult.getCrnType().equals(SlaveType.Crn)) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", crnNo));
if(basCrnp == null) {
return null;
}
stationList = basCrnp.getOutStationList$();
} else if (findCrnNoResult.getCrnType().equals(SlaveType.DualCrn)) {
- BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", crnNo));
+ BasDualCrnp basDualCrnp = basDualCrnpService.getOne(new QueryWrapper<BasDualCrnp>().eq("crn_no", crnNo));
if(basDualCrnp == null) {
return null;
}
diff --git a/src/main/java/com/zy/common/utils/Http.java b/src/main/java/com/zy/common/utils/Http.java
index b0f9672..5f08a69 100644
--- a/src/main/java/com/zy/common/utils/Http.java
+++ b/src/main/java/com/zy/common/utils/Http.java
@@ -5,7 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.R;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
/**
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index e2112fc..8ddeabe 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasMap;
@@ -26,7 +26,7 @@
public List<List<NavigateNode>> getStationMap(int lev) {
BasMapService basMapService = SpringUtils.getBean(BasMapService.class);
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", lev));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", lev));
if (basMap == null) {
throw new CoolException("鍦板浘涓嶅瓨鍦�");
}
@@ -83,7 +83,7 @@
public List<List<NavigateNode>> getRgvTrackMap(int lev) {
BasMapService basMapService = SpringUtils.getBean(BasMapService.class);
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", lev));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", lev));
if (basMap == null) {
throw new CoolException("鍦板浘涓嶅瓨鍦�");
}
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index b5d3424..377f2d2 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -15,7 +15,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.common.model.NavigateNode;
@@ -35,7 +35,7 @@
private BasStationService basStationService;
public synchronized List<NavigateNode> calcByStationId(Integer startStationId, Integer endStationId) {
- BasStation startStation = basStationService.selectById(startStationId);
+ BasStation startStation = basStationService.getById(startStationId);
if (startStation == null) {
throw new CoolException("鏈壘鍒拌 璧风偣 瀵瑰簲鐨勭珯鐐规暟鎹�");
}
@@ -218,7 +218,7 @@
try {
DeviceConfigService deviceConfigService = SpringUtils.getBean(DeviceConfigService.class);
if (deviceConfigService != null) {
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig deviceConfig : devpList) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, deviceConfig.getDeviceNo());
@@ -296,13 +296,13 @@
try {
ConfigService configService = SpringUtils.getBean(ConfigService.class);
if (configService != null) {
- Config cfgLen = configService.selectOne(new EntityWrapper<Config>().eq("code", "stationPathLenWeightPercent"));
+ Config cfgLen = configService.getOne(new QueryWrapper<Config>().eq("code", "stationPathLenWeightPercent"));
if (cfgLen != null && cfgLen.getValue() != null) {
String v = cfgLen.getValue().trim();
if (v.endsWith("%")) v = v.substring(0, v.length() - 1);
try { lenWeightPercent = Double.parseDouble(v); } catch (Exception ignore) {}
}
- Config cfgCong = configService.selectOne(new EntityWrapper<Config>().eq("code", "stationPathCongWeightPercent"));
+ Config cfgCong = configService.getOne(new QueryWrapper<Config>().eq("code", "stationPathCongWeightPercent"));
if (cfgCong != null && cfgCong.getValue() != null) {
String v = cfgCong.getValue().trim();
if (v.endsWith("%")) v = v.substring(0, v.length() - 1);
diff --git a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java b/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
index fd04503..87cb4ed 100644
--- a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
+++ b/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
@@ -1,7 +1,7 @@
package com.zy.common.utils;
import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.util.Map;
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 5410b76..80bff56 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -1,8 +1,8 @@
package com.zy.common.web;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -24,7 +24,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
/**
@@ -67,9 +67,9 @@
res.put("token", Cools.enToken(System.currentTimeMillis() + mobile, superPwd));
return R.ok(res);
}
- EntityWrapper<User> userWrapper = new EntityWrapper<>();
+ QueryWrapper<User> userWrapper = new QueryWrapper<>();
userWrapper.eq("mobile", mobile);
- User user = userService.selectOne(userWrapper);
+ User user = userService.getOne(userWrapper);
if (Cools.isEmpty(user)){
return new R(10001, i18nMessageService.getMessage("response.user.notFound"));
}
@@ -80,12 +80,12 @@
return new R(10003, i18nMessageService.getMessage("response.user.passwordMismatch"));
}
String token = Cools.enToken(System.currentTimeMillis() + mobile, user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()).eq("system_type", "WCS"));
+ userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", user.getId()).eq("system_type", "WCS"));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setSystemType("WCS");
- userLoginService.insert(userLogin);
+ userLoginService.save(userLogin);
Map<String, Object> res = new HashMap<>();
res.put("username", user.getUsername());
res.put("token", token);
@@ -122,30 +122,30 @@
@RequestMapping("/user/detail/auth")
@ManagerAuth
public R userDetail(){
- return R.ok(userService.selectById(getUserId()));
+ return R.ok(userService.getById(getUserId()));
}
@RequestMapping("/menu/auth")
@ManagerAuth(memo = "棣栭〉鑿滃崟")
public R menu(){
// 鑾峰彇鎵�鏈変竴绾ц彍鍗�
- List<Resource> oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ List<Resource> oneLevel = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy(true, true, "sort"));
User user = null;
- Wrapper<Resource> resourceWrapper;
+ QueryWrapper<Resource> resourceWrapper;
if (getUserId() == 9527) {
- resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
+ resourceWrapper = new QueryWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy(true, true, "sort");
} else {
// 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗�
- user = userService.selectById(getUserId());
- List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
+ user = userService.getById(getUserId());
+ List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", user.getRoleId()));
List<Long> resourceIds = new ArrayList<>();
roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
if (resourceIds.isEmpty()){
return R.ok();
}
- resourceWrapper = new EntityWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
+ resourceWrapper = new QueryWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy(true, true, "sort");
}
- List<Resource> twoLevel = resourceService.selectList(resourceWrapper);
+ List<Resource> twoLevel = resourceService.list(resourceWrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Resource menu : oneLevel) {
Map<String, Object> map = new HashMap<>();
@@ -157,12 +157,12 @@
// 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
if (getUserId() != 9527) {
- Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
+ Resource view = resourceService.getOne(new QueryWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
if (!Cools.isEmpty(view)){
RoleResource param = new RoleResource();
param.setResourceId(view.getId());
param.setRoleId(user.getRoleId());
- if (null == roleResourceService.selectOne(new EntityWrapper<>(param))){
+ if (null == roleResourceService.getOne(new QueryWrapper<>(param))){
continue;
}
}
@@ -189,7 +189,7 @@
@RequestMapping("/power/list/auth")
@ManagerAuth
public R powerList(){
- List<Resource> oneLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ List<Resource> oneLevels = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy(true, true, "sort"));
List<Map> result = new ArrayList<>();
// 涓�绾�
for (Resource oneLevel : oneLevels){
@@ -199,7 +199,7 @@
oneLevelMap.put("id", oneLevel.getId());
oneLevelMap.put("spread", true);
oneLevelMap.put("children", twoLevelsList);
- List<Resource> twoLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
+ List<Resource> twoLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy(true, true, "sort"));
// 浜岀骇
for (Resource twoLevel : twoLevels){
Map<String, Object> twoLevelMap = new HashMap<>();
@@ -210,7 +210,7 @@
List<Map> threeLevelsList = new ArrayList<>();
twoLevelMap.put("children", threeLevelsList);
// 涓夌骇
- List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
+ List<Resource> threeLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy(true, true, "sort"));
for (Resource threeLevel : threeLevels){
Map<String, Object> threeLevelMap = new HashMap<>();
threeLevelMap.put("title", localizeResourceName(threeLevel));
@@ -231,7 +231,7 @@
functions.put("spread", true);
List<Map> funcs = new ArrayList<>();
functions.put("children", funcs);
- List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
+ List<Permission> permissions = permissionService.list(new QueryWrapper<Permission>().eq("status", 1));
for (Permission permission : permissions) {
Map<String, Object> func = new HashMap<>();
func.put("title", i18nMessageService.resolvePermissionText(permission.getName(), permission.getAction(), permission.getId()));
@@ -253,9 +253,9 @@
public R get(@PathVariable("roleId") Long roleId) {
List<Object> result = new ArrayList<>();
// 鑿滃崟
- List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", roleId));
+ List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", roleId));
for (RoleResource roleResource : roleResources){
- Resource resource = resourceService.selectById(roleResource.getResourceId());
+ Resource resource = resourceService.getById(roleResource.getResourceId());
if (!Cools.isEmpty(resource)){
if (resource.getLevel() == 3){
result.add(resource.getId());
@@ -263,9 +263,9 @@
}
}
// 鍔熻兘
- List<RolePermission> rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ List<RolePermission> rolePermissions = rolePermissionService.list(new QueryWrapper<RolePermission>().eq("role_id", roleId));
for (RolePermission rolePermission : rolePermissions){
- Permission permission = permissionService.selectById(rolePermission.getPermissionId());
+ Permission permission = permissionService.getById(rolePermission.getPermissionId());
if (!Cools.isEmpty(permission)){
result.add(permission.getAction());
}
@@ -277,18 +277,18 @@
@ManagerAuth(memo = "鎺堟潈")
@Transactional
public R power(Long roleId, String powers){
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
- roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
- rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ roleResourceService.remove(new QueryWrapper<RoleResource>().eq("role_id", roleId));
+ rolePermissionService.remove(new QueryWrapper<RolePermission>().eq("role_id", roleId));
if (!Cools.isEmpty(powers)){
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
- Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
+ Resource resource = resourceService.getOne(new QueryWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
if (!Cools.isEmpty(resource)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
}
@@ -296,22 +296,22 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
} else {
- Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
+ Permission permission = permissionService.getOne(new QueryWrapper<Permission>().eq("action", dto.getTwo()));
if (!Cools.isEmpty(permission)){
RolePermission rolePermission = new RolePermission();
rolePermission.setRoleId(roleId);
rolePermission.setPermissionId(permission.getId());
- rolePermissionService.insert(rolePermission);
+ rolePermissionService.save(rolePermission);
}
}
for (String three : dto.getThree()){
- Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
+ Resource resource1 = resourceService.getOne(new QueryWrapper<Resource>().eq("id", three).eq("level", 3));
if (!Cools.isEmpty(resource1)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鐨�").concat(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())));
}
@@ -319,7 +319,7 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource1.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
}
}
}
@@ -332,7 +332,7 @@
public R buttonResource(@PathVariable("resourceId") Long resourceId) {
List<Resource> resources;
if (getUserId() == 9527) {
- resources = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
+ resources = resourceService.list(new QueryWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
} else {
resources = roleResourceService.getMenuButtomResource(resourceId, getUserId());
}
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 1d40c1d..46c2845 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -1,7 +1,7 @@
package com.zy.common.web;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
@@ -11,7 +11,7 @@
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -35,7 +35,7 @@
}
protected User getUser(){
- User user = userService.selectById(getUserId());
+ User user = userService.getById(getUserId());
if (null == user) {
throw new CoolException(BaseRes.DENIED);
}
@@ -58,7 +58,7 @@
* @param set 鎺掗櫎瀛楁闆嗗悎
* @param condition 鎼滅储鍐呭
*/
- protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ protected <T> void allLike(Class<T> cls, Set<String> set, QueryWrapper<T> wrapper, String condition){
if (Cools.isEmpty(condition)) {
return;
}
@@ -83,13 +83,13 @@
if (columns.isEmpty()) {
return;
}
- for (int i=0;i<columns.size();i++){
- if (i==0){
- wrapper.andNew();
- } else {
- wrapper.or();
+ wrapper.and(q -> {
+ for (int i = 0; i < columns.size(); i++) {
+ q.like(columns.get(i), condition);
+ if (i < columns.size() - 1) {
+ q.or();
+ }
}
- wrapper.like(columns.get(i), condition);
- }
+ });
}
}
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index f2b7f7a..0267db9 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index ad57dfa..cd287fc 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -5,7 +5,7 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
/**
* Created by vincent on 2019-07-30
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index dfac3b1..2b1c8ef 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -6,7 +6,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
/**
* WCS涓绘祦绋�
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 953f986..68cc1a2 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,6 +1,6 @@
package com.zy.core;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.DeviceConfigService;
@@ -45,37 +45,37 @@
private void initMq(){
// 鍒濆鍖栧爢鍨涙満mq
- List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
for (DeviceConfig crn : crnList) {
MessageQueue.init(SlaveType.Crn, crn.getDeviceNo());
}
// 鍒濆鍖栧弻宸ヤ綅鍫嗗灈鏈簃q
- List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.DualCrn)));
for (DeviceConfig crn : dualCrnList) {
MessageQueue.init(SlaveType.DualCrn, crn.getDeviceNo());
}
// 鍒濆鍖朢gv灏忚溅mq
- List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
for (DeviceConfig rgv : rgvList) {
MessageQueue.init(SlaveType.Rgv, rgv.getDeviceNo());
}
// 鍒濆鍖栬緭閫佺嚎mq
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig devp : devpList) {
MessageQueue.init(SlaveType.Devp, devp.getDeviceNo());
}
// 鍒濆鍖栨潯鐮佹壂鎻忎华mq
- List<DeviceConfig> barcodeList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> barcodeList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Barcode)));
for (DeviceConfig barcode : barcodeList) {
MessageQueue.init(SlaveType.Barcode, barcode.getDeviceNo());
}
// 鍒濆鍖朙ed鐏痬q
- List<DeviceConfig> ledList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> ledList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Led)));
for (DeviceConfig led : ledList) {
MessageQueue.init(SlaveType.Led, led.getDeviceNo());
@@ -83,7 +83,7 @@
}
private void initThread(){
- List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
if(!crnList.isEmpty()) {
News.info("鍒濆鍖栧爢鍨涙満........................................................");
@@ -105,7 +105,7 @@
}
}
- List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.DualCrn)));
if(!dualCrnList.isEmpty()) {
News.info("鍒濆鍖栧弻宸ヤ綅鍫嗗灈鏈�........................................................");
@@ -125,7 +125,7 @@
}
}
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
if(!devpList.isEmpty()) {
News.info("鍒濆鍖栬緭閫佺珯........................................................");
@@ -149,7 +149,7 @@
}
}
- List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
if(!rgvList.isEmpty()) {
News.info("鍒濆鍖朢GV........................................................");
diff --git a/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java b/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java
index a20c9f5..2379e10 100644
--- a/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java
+++ b/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java
@@ -11,7 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.util.HashMap;
@Component
@@ -24,7 +24,7 @@
@PostConstruct
public void init() {
- WrkLastno wrkLastno = wrkLastnoService.selectById(WrkIoType.FAKE_TASK_NO.id);
+ WrkLastno wrkLastno = wrkLastnoService.getById(WrkIoType.FAKE_TASK_NO.id);
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/java/com/zy/core/config/SystemConfigInitializer.java b/src/main/java/com/zy/core/config/SystemConfigInitializer.java
index 7c96bfc..94e1358 100644
--- a/src/main/java/com/zy/core/config/SystemConfigInitializer.java
+++ b/src/main/java/com/zy/core/config/SystemConfigInitializer.java
@@ -1,6 +1,6 @@
package com.zy.core.config;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.common.utils.RedisUtil;
import com.zy.core.enums.RedisKeyType;
import com.zy.system.entity.Config;
@@ -8,7 +8,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.util.HashMap;
import java.util.List;
@@ -24,7 +24,7 @@
public void init() {
HashMap<String, String> systemConfigMap = new HashMap<>();
- List<Config> configList = configService.selectList(new EntityWrapper<>());
+ List<Config> configList = configService.list(new QueryWrapper<>());
for (Config config : configList) {
systemConfigMap.put(config.getCode(), config.getValue());
}
diff --git a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
index 6233e0c..df51cce 100644
--- a/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyStationFakeConnect.java
@@ -262,12 +262,12 @@
List<NavigateNode> targetNavigateNodes = new ArrayList<>();
try {
- BasStation startStation = basStationService.selectById(stationId);
+ BasStation startStation = basStationService.getById(stationId);
if (startStation == null) {
return;
}
- BasStation targetStation = basStationService.selectById(targetStationId);
+ BasStation targetStation = basStationService.getById(targetStationId);
if (targetStation == null) {
return;
}
diff --git a/src/main/java/com/zy/core/network/real/ZyRgvRealConnect.java b/src/main/java/com/zy/core/network/real/ZyRgvRealConnect.java
index 68d9898..f892958 100644
--- a/src/main/java/com/zy/core/network/real/ZyRgvRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyRgvRealConnect.java
@@ -130,7 +130,7 @@
1, // 涓嬪彂鐘舵�亄0:鏈笅鍙�,1:宸蹭笅鍙憓
JSON.toJSONString(response) // 鍝嶅簲
);
- bean.insert(basRgvOpt);
+ bean.save(basRgvOpt);
}
return response;
}
diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index f3fab96..8f7ffca 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -9,7 +9,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -83,7 +83,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return Collections.emptyList();
}
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
index 7781e5f..a07c1a1 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
@@ -6,7 +6,7 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -87,7 +87,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return Collections.emptyList();
}
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
index d65f7e4..010a031 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
@@ -6,7 +6,7 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -83,7 +83,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return Collections.emptyList();
}
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index d03023b..f739578 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.domain.param.CreateOutTaskParam;
@@ -149,25 +149,25 @@
while (!Thread.currentThread().isInterrupted()) {
try {
Config enableFakeConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "enableFake"));
+ .getOne(new QueryWrapper<Config>().eq("code", "enableFake"));
if (enableFakeConfig != null) {
enableFake = enableFakeConfig.getValue();
}
Config fakeRealTaskRequestWmsConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "fakeRealTaskRequestWms"));
+ .getOne(new QueryWrapper<Config>().eq("code", "fakeRealTaskRequestWms"));
if (fakeRealTaskRequestWmsConfig != null) {
fakeRealTaskRequestWms = fakeRealTaskRequestWmsConfig.getValue();
}
Config fakeGenerateInTaskConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "fakeGenerateInTask"));
+ .getOne(new QueryWrapper<Config>().eq("code", "fakeGenerateInTask"));
if (fakeGenerateInTaskConfig != null) {
fakeGenerateInTask = fakeGenerateInTaskConfig.getValue();
}
Config fakeGenerateOutTaskConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "fakeGenerateOutTask"));
+ .getOne(new QueryWrapper<Config>().eq("code", "fakeGenerateOutTask"));
if (fakeGenerateOutTaskConfig != null) {
fakeGenerateOutTask = fakeGenerateOutTaskConfig.getValue();
}
@@ -218,7 +218,7 @@
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -272,7 +272,7 @@
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -308,13 +308,13 @@
// 妫�娴嬩换鍔℃槸鍚︾敓鎴�
List<WrkMast> wrkMasts = wrkMastService
- .selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ .list(new QueryWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
if (!wrkMasts.isEmpty()) {
continue;
}
List<LocMast> locMastList = locMastService
- .selectList(new EntityWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.O)));
+ .list(new QueryWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.O)));
if (locMastList.isEmpty()) {
continue;
}
@@ -368,7 +368,7 @@
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -399,7 +399,7 @@
&& !stationProtocol.isLoading()
&& stationProtocol.getTaskNo() == 0) {
List<LocMast> locMastList = locMastService
- .selectList(new EntityWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.F)));
+ .list(new QueryWrapper<LocMast>().eq("loc_sts", String.valueOf(LocStsType.F)));
if (locMastList.isEmpty()) {
continue;
}
@@ -447,7 +447,7 @@
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -478,7 +478,7 @@
// 妫�娴嬩换鍔℃槸鍚︾敓鎴�
List<WrkMast> wrkMasts = wrkMastService
- .selectList(new EntityWrapper<WrkMast>()
+ .list(new QueryWrapper<WrkMast>()
.eq("barcode", stationProtocol.getBarcode()));
if (!wrkMasts.isEmpty()) {
continue;
@@ -563,7 +563,7 @@
// 璁＄畻鎵�鏈夌珯鐐瑰仠鐣欐椂闂�
public synchronized void calcAllStationStayTime() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -587,7 +587,7 @@
// 妫�娴嬪嚭搴撶珯鐐瑰仠鐣欐槸鍚﹁秴鏃�
public synchronized void checkOutStationStayTimeOut() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
List<StationObjModel> outStationList = basDevp.getOutStationList$();
if (outStationList.isEmpty()) {
@@ -633,7 +633,7 @@
// 妫�娴嬪叆搴撶珯鐐瑰爢鍨涙満鏄惁鍙栬蛋璐х墿
public synchronized void checkInStationCrnTake() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<StationObjModel> inStationList = basCrnp.getInStationList$();
if (inStationList.isEmpty()) {
@@ -643,7 +643,7 @@
checkInStationListCrnTake(inStationList);
}
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<StationObjModel> inStationList = basDualCrnp.getInStationList$();
if (inStationList.isEmpty()) {
@@ -745,7 +745,7 @@
// 鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
public synchronized void crnIoExecuteFinish() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 92f770b..b29ca52 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.entity.BasDevp;
@@ -100,7 +100,7 @@
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -132,7 +132,7 @@
// 妫�娴嬩换鍔℃槸鍚︾敓鎴�
List<WrkMast> wrkMasts = wrkMastService
- .selectList(new EntityWrapper<WrkMast>()
+ .list(new QueryWrapper<WrkMast>()
.eq("barcode", stationProtocol.getBarcode()));
if (!wrkMasts.isEmpty()) {
continue;
@@ -204,7 +204,7 @@
//妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
private synchronized void checkInStationHasTask() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if(stationThread == null){
diff --git a/src/main/java/com/zy/core/plugin/XiaosongProcess.java b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
index 2fdf863..abe40da 100644
--- a/src/main/java/com/zy/core/plugin/XiaosongProcess.java
+++ b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.entity.BasDevp;
@@ -112,7 +112,7 @@
return;
}
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -159,7 +159,7 @@
// 妫�娴嬩换鍔℃槸鍚︾敓鎴�
List<WrkMast> wrkMasts = wrkMastService
- .selectList(new EntityWrapper<WrkMast>()
+ .list(new QueryWrapper<WrkMast>()
.eq("barcode", stationProtocol.getBarcode()));
if (!wrkMasts.isEmpty()) {
continue;
@@ -231,7 +231,7 @@
//妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
private synchronized void checkInStationHasTask() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if(stationThread == null){
diff --git a/src/main/java/com/zy/core/task/InitLocMapScheduler.java b/src/main/java/com/zy/core/task/InitLocMapScheduler.java
index e1d4da1..1fd36d7 100644
--- a/src/main/java/com/zy/core/task/InitLocMapScheduler.java
+++ b/src/main/java/com/zy/core/task/InitLocMapScheduler.java
@@ -10,7 +10,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasMap;
import com.zy.asrs.service.BasMapService;
@@ -34,7 +34,7 @@
return;
}
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", 1));
if (Cools.isEmpty(basMap)){
//缂哄皯鍒濆鍖栧簱浣嶅湴鍥�
return;
diff --git a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
index 4e9d007..9b258da 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
@@ -1,7 +1,7 @@
package com.zy.core.thread.impl;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasRgv;
@@ -158,7 +158,7 @@
log.setStatus(1);
log.setCreateTime(new Date());
log.setSystemStatus(JSON.toJSONString(rgvProtocol));
- errLogService.insert(log);
+ errLogService.save(log);
if (log.getId() != null) {
redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
}
@@ -185,13 +185,13 @@
}
if (basRgvService != null) {
- BasRgv basRgv = basRgvService.selectOne(new EntityWrapper<BasRgv>().eq("rgv_no", deviceConfig.getDeviceNo()));
+ BasRgv basRgv = basRgvService.getOne(new QueryWrapper<BasRgv>().eq("rgv_no", deviceConfig.getDeviceNo()));
if(basRgv == null) {
basRgv = new BasRgv();
basRgv.setRgvNo(deviceConfig.getDeviceNo());
basRgv.setStatus(1);
basRgv.setCreateTime(new Date());
- basRgvService.insert(basRgv);
+ basRgvService.save(basRgv);
}
}
}
@@ -268,7 +268,7 @@
JSON.toJSONString(response)
);
if (bean != null) {
- bean.insert(basRgvOpt);
+ bean.save(basRgvOpt);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index aa80bab..79fdf45 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -1,7 +1,7 @@
package com.zy.core.thread.impl;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnp;
@@ -124,7 +124,7 @@
}
if (basCrnpService != null) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
if(basCrnp == null) {
basCrnp = new BasCrnp();
basCrnp.setCrnNo(deviceConfig.getDeviceNo());
@@ -134,7 +134,7 @@
basCrnp.setMaxInTask(5);
basCrnp.setMaxOutTask(5);
basCrnp.setCreateTime(new Date());
- basCrnpService.insert(basCrnp);
+ basCrnpService.save(basCrnp);
}
}
}
@@ -219,7 +219,7 @@
log.setStatus(1);
log.setCreateTime(new Date());
log.setSystemStatus(JSON.toJSONString(crnProtocol));
- errLogService.insert(log);
+ errLogService.save(log);
if (log.getId() != null) {
redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
}
@@ -327,7 +327,7 @@
JSON.toJSONString(response)
);
if (bean != null) {
- bean.insert(basCrnpOpt);
+ bean.save(basCrnpOpt);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
index 15b0450..2541dd5 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnV2Thread.java
@@ -1,7 +1,7 @@
package com.zy.core.thread.impl;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.*;
@@ -120,7 +120,7 @@
}
if (basCrnpService != null) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
if(basCrnp == null) {
basCrnp = new BasCrnp();
basCrnp.setCrnNo(deviceConfig.getDeviceNo());
@@ -130,7 +130,7 @@
basCrnp.setMaxInTask(5);
basCrnp.setMaxOutTask(5);
basCrnp.setCreateTime(new Date());
- basCrnpService.insert(basCrnp);
+ basCrnpService.save(basCrnp);
}
}
}
@@ -216,7 +216,7 @@
log.setStatus(1);
log.setCreateTime(new Date());
log.setSystemStatus(JSON.toJSONString(crnProtocol));
- errLogService.insert(log);
+ errLogService.save(log);
if (log.getId() != null) {
redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
}
@@ -327,7 +327,7 @@
JSON.toJSONString(response)
);
if (bean != null) {
- bean.insert(basCrnpOpt);
+ bean.save(basCrnpOpt);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
index ab72c7b..8d8883c 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.*;
@@ -282,7 +282,7 @@
}
if (basDualCrnpService != null) {
- BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ BasDualCrnp basDualCrnp = basDualCrnpService.getOne(new QueryWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
if(basDualCrnp == null) {
basDualCrnp = new BasDualCrnp();
basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
@@ -292,7 +292,7 @@
basDualCrnp.setMaxInTask(5);
basDualCrnp.setMaxOutTask(5);
basDualCrnp.setCreateTime(new Date());
- basDualCrnpService.insert(basDualCrnp);
+ basDualCrnpService.save(basDualCrnp);
}
}
}
@@ -392,7 +392,7 @@
log.setStatus(1);
log.setCreateTime(new Date());
log.setSystemStatus(JSON.toJSONString(crnProtocol));
- errLogService.insert(log);
+ errLogService.save(log);
if (log.getId() != null) {
redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
}
@@ -537,7 +537,7 @@
JSON.toJSONString(response)
);
if (bean != null) {
- bean.insert(basDualCrnpOpt);
+ bean.save(basDualCrnpOpt);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
index 802f7e6..5247f98 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -1,7 +1,7 @@
package com.zy.core.thread.impl;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
@@ -110,7 +110,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return;
}
@@ -236,7 +236,7 @@
JSON.toJSONString(commandResponse)
);
if (optService != null) {
- optService.insert(basStationOpt);
+ optService.save(basStationOpt);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
index 55db83b..c2cf8df 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
@@ -115,7 +115,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return;
}
@@ -259,7 +259,7 @@
JSON.toJSONString(commandResponse)
);
if (optService != null) {
- optService.insert(basStationOpt);
+ optService.save(basStationOpt);
}
}
return commandResponse;
@@ -415,7 +415,7 @@
if (deviceConfigService == null) {
return null;
}
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig dc : devpList) {
com.zy.core.thread.StationThread t = (com.zy.core.thread.StationThread) SlaveConnection.get(SlaveType.Devp, dc.getDeviceNo());
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java b/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
index f833e51..2ec6539 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
@@ -114,7 +114,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return;
}
@@ -277,7 +277,7 @@
JSON.toJSONString(commandResponse)
);
if (optService != null) {
- optService.insert(basStationOpt);
+ optService.save(basStationOpt);
}
}
return commandResponse;
@@ -457,7 +457,7 @@
if (deviceConfigService == null) {
return null;
}
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig dc : devpList) {
com.zy.core.thread.StationThread t = (com.zy.core.thread.StationThread) SlaveConnection.get(SlaveType.Devp, dc.getDeviceNo());
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 85a9e47..ab54c17 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.param.CreateLocMoveTaskParam;
@@ -71,7 +71,7 @@
//鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
public synchronized void crnIoExecuteNormal() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if(crnThread == null){
@@ -83,10 +83,10 @@
continue;
}
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
.in("wrk_sts", WrkStsType.INBOUND_RUN.sts, WrkStsType.OUTBOUND_RUN.sts, WrkStsType.LOC_MOVE_RUN.sts)
- .orderBy("batch_seq", false)
+ .orderBy(true, false, "batch_seq")
);
if(!wrkMasts.isEmpty()){
continue;
@@ -211,7 +211,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "鐩爣搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
continue;
@@ -281,10 +281,10 @@
Integer crnNo = basCrnp.getCrnNo();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", crnNo)
.eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts)
- .orderBy("batch_seq", false)
+ .orderBy(true, false, "batch_seq")
);
for (WrkMast wrkMast : wrkMasts) {
@@ -318,7 +318,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getSourceLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
continue;
@@ -412,7 +412,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "鐩爣搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
continue;
@@ -497,7 +497,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getSourceLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
continue;
@@ -541,14 +541,14 @@
Integer crnNo = basCrnp.getCrnNo();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", crnNo)
.eq("wrk_sts", WrkStsType.NEW_LOC_MOVE.sts)
);
for (WrkMast wrkMast : wrkMasts) {
// 鑾峰彇婧愬簱浣嶄俊鎭�
- LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast sourceLocMast = locMastService.getById(wrkMast.getSourceLocNo());
if (sourceLocMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
continue;
@@ -560,7 +560,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
continue;
@@ -589,7 +589,7 @@
//鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
public synchronized void crnIoExecuteFinish() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if(crnThread == null){
@@ -663,7 +663,7 @@
public synchronized void plannerExecute() {
int nowSec = (int) (System.currentTimeMillis() / 1000);
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
String key = RedisKeyType.PLANNER_SCHEDULE.key + "CRN-" + basCrnp.getCrnNo();
List<Object> items = redisUtil.lGet(key, 0, -1);
@@ -679,7 +679,7 @@
if (crnProtocol == null) {
continue;
}
- List<WrkMast> running = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> running = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
.in("wrk_sts", WrkStsType.INBOUND_RUN.sts, WrkStsType.OUTBOUND_RUN.sts, WrkStsType.LOC_MOVE_RUN.sts)
);
@@ -771,7 +771,7 @@
}
// 鑾峰彇婧愬簱浣嶄俊鎭�
- LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast sourceLocMast = locMastService.getById(wrkMast.getSourceLocNo());
if (sourceLocMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
return false;
@@ -783,7 +783,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
return false;
diff --git a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
index 99dc866..93f7e4a 100644
--- a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.param.CreateLocMoveTaskParam;
@@ -63,7 +63,7 @@
//鍏ュ嚭搴� ===>> 鍙屽伐浣嶅爢鍨涙満鍏ュ嚭搴撲綔涓氫笅鍙�
public synchronized void dualCrnIoExecute() {
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
DualCrnThread dualCrnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, basDualCrnp.getCrnNo());
if(dualCrnThread == null){
@@ -75,7 +75,7 @@
continue;
}
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("dual_crn_no", basDualCrnp.getCrnNo())
.in("wrk_sts", WrkStsType.INBOUND_RUN.sts, WrkStsType.OUTBOUND_RUN.sts, WrkStsType.LOC_MOVE_RUN.sts)
);
@@ -335,8 +335,12 @@
}
}
+ if (taskList.isEmpty()) {
+ return list;
+ }
+
// 鑾峰彇浠诲姟
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("dual_crn_no", basDualCrnp.getCrnNo())
.in("wrk_no", taskList)
);
@@ -362,7 +366,7 @@
return list;
}
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("dual_crn_no", basDualCrnp.getCrnNo())
.eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts)
);
@@ -372,7 +376,7 @@
private List<WrkMast> getLocMoveTaskList(BasDualCrnp basDualCrnp) {
List<WrkMast> list = new ArrayList<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("dual_crn_no", basDualCrnp.getCrnNo())
.eq("wrk_sts", WrkStsType.NEW_LOC_MOVE.sts)
);
@@ -404,7 +408,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "鐩爣搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
return null;
@@ -578,7 +582,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getSourceLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
continue;
@@ -633,7 +637,7 @@
Integer crnNo = basDualCrnp.getCrnNo();
// 鑾峰彇婧愬簱浣嶄俊鎭�
- LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast sourceLocMast = locMastService.getById(wrkMast.getSourceLocNo());
if (sourceLocMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
return null;
@@ -645,7 +649,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
return null;
@@ -688,7 +692,7 @@
//鍙屽伐浣嶅爢鍨涙満浠诲姟鎵ц瀹屾垚
public synchronized void dualCrnIoExecuteFinish() {
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
DualCrnThread dualCrnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, basDualCrnp.getCrnNo());
if(dualCrnThread == null){
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index de8a651..f31ab82 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
@@ -64,7 +64,7 @@
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
LoadGuardState loadGuardState = buildLoadGuardState(limitConfig);
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -96,7 +96,7 @@
&& stationProtocol.getTaskNo() > 0
) {
//妫�娴嬩换鍔℃槸鍚︾敓鎴�
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ WrkMast wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
if (wrkMast == null) {
continue;
}
@@ -157,7 +157,7 @@
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
LoadGuardState loadGuardState = buildLoadGuardState(limitConfig);
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
.isNotNull("crn_no")
);
@@ -243,7 +243,7 @@
//鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
public synchronized void dualCrnStationOutExecute() {
try {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
.isNotNull("dual_crn_no")
);
@@ -302,13 +302,13 @@
//妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
public synchronized void stationOutExecuteFinish() {
try {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
for (WrkMast wrkMast : wrkMasts) {
Integer wrkNo = wrkMast.getWrkNo();
Integer targetStaNo = wrkMast.getStaNo();
boolean complete = false;
- BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", targetStaNo));
+ BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", targetStaNo));
if (basStation == null) {
continue;
}
@@ -344,7 +344,7 @@
// 妫�娴嬩换鍔¤浆瀹屾垚
public synchronized void checkTaskToComplete() {
try {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts));
for (WrkMast wrkMast : wrkMasts) {
Integer wrkNo = wrkMast.getWrkNo();
Integer targetStaNo = wrkMast.getStaNo();
@@ -355,7 +355,7 @@
}
boolean complete = false;
- BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", targetStaNo));
+ BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", targetStaNo));
if (basStation == null) {
continue;
}
@@ -389,7 +389,7 @@
//妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
public synchronized void checkStationRunBlock() {
try {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -530,7 +530,7 @@
// 妫�娴嬪嚭搴撴帓搴�
public synchronized void checkStationOutOrder() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
if (stationThread == null) {
@@ -573,10 +573,10 @@
continue;
}
- List<WrkMast> batchWrkList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> batchWrkList = wrkMastService.list(new QueryWrapper<WrkMast>()
.notIn("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts, WrkStsType.COMPLETE_OUTBOUND.sts)
.eq("batch", wrkMast.getBatch())
- .orderBy("batch")
+ .orderBy(true, true, "batch")
);
if (batchWrkList.isEmpty()) {
continue;
@@ -650,7 +650,7 @@
// 鐩戞帶缁曞湀绔欑偣
public synchronized void watchCircleStation() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
if (stationThread == null) {
@@ -716,7 +716,7 @@
public List<Integer> getAllOutOrderList() {
List<Integer> list = new ArrayList<>();
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
List<Integer> orderList = basDevp.getOutOrderIntList();
list.addAll(orderList);
@@ -741,7 +741,7 @@
HashMap<String, Integer> batchMap = new HashMap<>();
for (Integer station : checkList) {
- BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", station));
+ BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", station));
if (basStation == null) {
continue;
}
@@ -773,7 +773,7 @@
private int countCurrentStationTask() {
int currentStationTaskCount = 0;
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
diff --git a/src/main/java/com/zy/core/utils/WmsOperateUtils.java b/src/main/java/com/zy/core/utils/WmsOperateUtils.java
index e08a79b..eb1703d 100644
--- a/src/main/java/com/zy/core/utils/WmsOperateUtils.java
+++ b/src/main/java/com/zy/core/utils/WmsOperateUtils.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
@@ -80,7 +80,7 @@
int result = 0;
try {
BasStation basStation = basStationService
- .selectOne(new EntityWrapper<BasStation>().eq("station_id", sourceStaNo));
+ .getOne(new QueryWrapper<BasStation>().eq("station_id", sourceStaNo));
if (basStation == null) {
News.error("绔欑偣{}涓嶅瓨鍦�", sourceStaNo);
return null;
@@ -127,7 +127,7 @@
httpRequestLog.setResponse(response);
httpRequestLog.setCreateTime(new Date());
httpRequestLog.setResult(result);
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
}
return response;
}
@@ -209,7 +209,7 @@
// 鐢宠浠诲姟閲嶆柊鍒嗛厤搴撲綅
public synchronized String applyReassignTaskLocNo(Integer taskNo, Integer stationId) {
String wmsUrl = null;
- Config wmsSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemUri"));
+ Config wmsSystemUriConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "wmsSystemUri"));
if (wmsSystemUriConfig != null) {
wmsUrl = wmsSystemUriConfig.getValue();
}
@@ -221,7 +221,7 @@
String wmsSystemReassignInTaskUrl = null;
Config wmsSystemReassignInTaskUrlConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemReassignInTaskUrl"));
+ .getOne(new QueryWrapper<Config>().eq("code", "wmsSystemReassignInTaskUrl"));
if (wmsSystemReassignInTaskUrlConfig != null) {
wmsSystemReassignInTaskUrl = wmsSystemReassignInTaskUrlConfig.getValue();
}
@@ -284,7 +284,7 @@
httpRequestLog.setResponse(response);
httpRequestLog.setCreateTime(new Date());
httpRequestLog.setResult(result);
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
}
return response;
}
@@ -292,7 +292,7 @@
// 鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅
public synchronized String applyChangeLocNo(String locNo) {
String wmsUrl = null;
- Config wmsSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemUri"));
+ Config wmsSystemUriConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "wmsSystemUri"));
if (wmsSystemUriConfig != null) {
wmsUrl = wmsSystemUriConfig.getValue();
}
@@ -304,7 +304,7 @@
String wmsSystemChangeLocNoUrl = null;
Config wmsSystemChangeLocNoUrlConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemChangeLocNoUrl"));
+ .getOne(new QueryWrapper<Config>().eq("code", "wmsSystemChangeLocNoUrl"));
if (wmsSystemChangeLocNoUrlConfig != null) {
wmsSystemChangeLocNoUrl = wmsSystemChangeLocNoUrlConfig.getValue();
}
@@ -322,7 +322,7 @@
List<Integer> crnRows = new ArrayList<>();
if (findCrnNoResult.getCrnType().equals(SlaveType.Crn)) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", crnNo));
if (basCrnp == null) {
return null;
}
@@ -332,7 +332,7 @@
}
} else if (findCrnNoResult.getCrnType().equals(SlaveType.DualCrn)) {
BasDualCrnp basDualCrnp = basDualCrnpService
- .selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", crnNo));
+ .getOne(new QueryWrapper<BasDualCrnp>().eq("crn_no", crnNo));
if (basDualCrnp == null) {
return null;
}
@@ -383,7 +383,7 @@
httpRequestLog.setResponse(response);
httpRequestLog.setCreateTime(new Date());
httpRequestLog.setResult(result);
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
}
return response;
}
diff --git a/src/main/java/com/zy/system/config/LicenseSchemaInitializer.java b/src/main/java/com/zy/system/config/LicenseSchemaInitializer.java
index 98e52a1..bc063be 100644
--- a/src/main/java/com/zy/system/config/LicenseSchemaInitializer.java
+++ b/src/main/java/com/zy/system/config/LicenseSchemaInitializer.java
@@ -2,7 +2,7 @@
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git a/src/main/java/com/zy/system/controller/ApiController.java b/src/main/java/com/zy/system/controller/ApiController.java
index 126983d..5a1c7c3 100644
--- a/src/main/java/com/zy/system/controller/ApiController.java
+++ b/src/main/java/com/zy/system/controller/ApiController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/api/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(apiService.selectById(String.valueOf(id)));
+ return R.ok(apiService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/api/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Api> wrapper = new EntityWrapper<>();
+ QueryWrapper<Api> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(apiService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(apiService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == api.getId()){
- apiService.insert(api);
+ apiService.save(api);
} else {
apiService.updateById(api);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/api/add/auth")
@ManagerAuth
public R add(Api api) {
- apiService.insert(api);
+ apiService.save(api);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- apiService.deleteBatchIds(Arrays.asList(ids));
+ apiService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Api> wrapper = new EntityWrapper<>();
+ QueryWrapper<Api> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("api"));
convert(map, wrapper);
- List<Api> list = apiService.selectList(wrapper);
+ List<Api> list = apiService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/apiQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Api> wrapper = new EntityWrapper<>();
+ QueryWrapper<Api> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<Api> page = apiService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Api> page = apiService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Api api : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index 6243d13..8eb9f90 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -2,8 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -32,7 +32,7 @@
@ManagerAuth
public R refreshCache(){
HashMap<String, String> systemConfigMap = new HashMap<>();
- List<Config> configList = configService.selectList(new EntityWrapper<>());
+ List<Config> configList = configService.list(new QueryWrapper<>());
for (Config config : configList) {
systemConfigMap.put(config.getCode(), config.getValue());
}
@@ -43,7 +43,7 @@
@RequestMapping(value = "/config/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(configService.selectById(String.valueOf(id)));
+ return R.ok(configService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/config/list/auth")
@@ -54,21 +54,21 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(configService.page(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/config/listAll/auth")
@ManagerAuth
public R listAll(){
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
- wrapper.orderBy("id", false);
- return R.ok(configService.selectList(wrapper));
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
+ wrapper.orderBy(true, false, "id");
+ return R.ok(configService.list(wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -86,7 +86,7 @@
for (ConfigUpdateBatchParam param : params) {
String code = param.getCode();
String value = param.getValue();
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config config = configService.getOne(new QueryWrapper<Config>().eq("code", code));
if (config == null) {
continue;
}
@@ -109,7 +109,7 @@
}
}
if (null == config.getId()){
- configService.insert(config);
+ configService.save(config);
} else {
configService.updateById(config);
Parameter.reset();
@@ -125,7 +125,7 @@
return R.error("json瑙ｆ瀽澶辫触");
}
}
- configService.insert(config);
+ configService.save(config);
return R.ok();
}
@@ -151,7 +151,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- configService.deleteBatchIds(Arrays.asList(ids));
+ configService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -159,19 +159,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("config"));
convert(map, wrapper);
- List<Config> list = configService.selectList(wrapper);
+ List<Config> list = configService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/configQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<Config> page = configService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Config> page = configService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Config config : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -204,10 +204,10 @@
@RequestMapping(value = "/config/getSelectTypes")
@ManagerAuth
public R getSelectTypes() {
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
- wrapper.setSqlSelect("DISTINCT select_type as selectType");
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
+ wrapper.select("DISTINCT select_type as selectType");
wrapper.isNotNull("select_type");
- List<Map<String, Object>> maps = configService.selectMaps(wrapper);
+ List<Map<String, Object>> maps = configService.listMaps(wrapper);
List<String> types = new ArrayList<>();
for (Map<String, Object> map : maps) {
if (map != null && map.get("selectType") != null) {
diff --git a/src/main/java/com/zy/system/controller/HomeController.java b/src/main/java/com/zy/system/controller/HomeController.java
index 6568c90..3b33414 100644
--- a/src/main/java/com/zy/system/controller/HomeController.java
+++ b/src/main/java/com/zy/system/controller/HomeController.java
@@ -1,6 +1,6 @@
package com.zy.system.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.R;
@@ -31,9 +31,9 @@
@RequestMapping("/top")
@ManagerAuth
public R top(){
- int logTotal = operateLogService.selectCount(new EntityWrapper<>());
+ long logTotal = operateLogService.count(new QueryWrapper<>());
int logWeek = operateLogService.selectCountByCurrentWeek();
- int userTotal = userService.selectCount(new EntityWrapper<>());
+ long userTotal = userService.count(new QueryWrapper<>());
int loginWeek = userLoginService.selectCountByCurrentWeek();
Map<String, Object> result = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/HostController.java b/src/main/java/com/zy/system/controller/HostController.java
index bad930a..c250ac8 100644
--- a/src/main/java/com/zy/system/controller/HostController.java
+++ b/src/main/java/com/zy/system/controller/HostController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/host/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(hostService.selectById(String.valueOf(id)));
+ return R.ok(hostService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/host/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Host> wrapper = new EntityWrapper<>();
+ QueryWrapper<Host> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(hostService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(hostService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == host.getId()){
- hostService.insert(host);
+ hostService.save(host);
} else {
hostService.updateById(host);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/host/add/auth")
@ManagerAuth
public R add(Host host) {
- hostService.insert(host);
+ hostService.save(host);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- hostService.deleteBatchIds(Arrays.asList(ids));
+ hostService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Host> wrapper = new EntityWrapper<>();
+ QueryWrapper<Host> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("host"));
convert(map, wrapper);
- List<Host> list = hostService.selectList(wrapper);
+ List<Host> list = hostService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/hostQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Host> wrapper = new EntityWrapper<>();
+ QueryWrapper<Host> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
- Page<Host> page = hostService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Host> page = hostService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Host host : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index a908113..4ecd3b0 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -89,7 +89,7 @@
licenseInfos.setLicenseTime(formatLicenseTime(install));
licenseInfos.setRequestCode(LicenseUtils.buildRequestCode(licenseSubject));
licenseInfos.setCreateTime(new Date());
- if (!licenseInfosService.insert(licenseInfos)) {
+ if (!licenseInfosService.save(licenseInfos)) {
return R.error("璁稿彲璇佷繚瀛樺け璐�");
}
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index da7f7b1..f84d857 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/operateLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(operateLogService.selectById(String.valueOf(id)));
+ return R.ok(operateLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/operateLog/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(operateLogService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(operateLogService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == operateLog.getId()){
- operateLogService.insert(operateLog);
+ operateLogService.save(operateLog);
} else {
operateLogService.updateById(operateLog);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/operateLog/add/auth")
@ManagerAuth
public R add(OperateLog operateLog) {
- operateLogService.insert(operateLog);
+ operateLogService.save(operateLog);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- operateLogService.deleteBatchIds(Arrays.asList(ids));
+ operateLogService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("operateLog"));
convert(map, wrapper);
- List<OperateLog> list = operateLogService.selectList(wrapper);
+ List<OperateLog> list = operateLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/operateLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<OperateLog> page = operateLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OperateLog> page = operateLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (OperateLog operateLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/PermissionController.java b/src/main/java/com/zy/system/controller/PermissionController.java
index c943808..774bf3f 100644
--- a/src/main/java/com/zy/system/controller/PermissionController.java
+++ b/src/main/java/com/zy/system/controller/PermissionController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/permission/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(permissionService.selectById(String.valueOf(id)));
+ return R.ok(permissionService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/permission/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(permissionService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(permissionService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == permission.getId()){
- permissionService.insert(permission);
+ permissionService.save(permission);
} else {
permissionService.updateById(permission);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/permission/add/auth")
@ManagerAuth
public R add(Permission permission) {
- permissionService.insert(permission);
+ permissionService.save(permission);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- permissionService.deleteBatchIds(Arrays.asList(ids));
+ permissionService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("permission"));
convert(map, wrapper);
- List<Permission> list = permissionService.selectList(wrapper);
+ List<Permission> list = permissionService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/permissionQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
- Page<Permission> page = permissionService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Permission> page = permissionService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Permission permission : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 9eac7ac..65cc871 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/resource/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(resourceService.selectById(String.valueOf(id)));
+ return R.ok(resourceService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/resource/list/auth")
@@ -38,13 +38,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ QueryWrapper<Resource> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(resourceService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -66,7 +66,7 @@
if (resource.getSort() == null){
resource.setSort(999);
}
- resourceService.insert(resource);
+ resourceService.save(resource);
} else {
resourceService.updateById(resource);
}
@@ -76,7 +76,7 @@
@RequestMapping(value = "/resource/add/auth")
@ManagerAuth(memo = "鑿滃崟娣诲姞")
public R add(Resource resource) {
- resourceService.insert(resource);
+ resourceService.save(resource);
return R.ok();
}
@@ -94,7 +94,7 @@
@ManagerAuth(memo = "鑿滃崟鍒犻櫎")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- resourceService.deleteById(id);
+ resourceService.removeById(id);
}
return R.ok();
}
@@ -103,19 +103,19 @@
@ManagerAuth(memo = "鑿滃崟瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ QueryWrapper<Resource> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("resource"));
convert(map, wrapper);
- List<Resource> list = resourceService.selectList(wrapper);
+ List<Resource> list = resourceService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/resourceQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ QueryWrapper<Resource> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
- Page<Resource> page = resourceService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Resource> page = resourceService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Resource resource : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -138,14 +138,14 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ QueryWrapper<Resource> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
else {
- wrapper.orderBy("sort");
+ wrapper.orderBy(true, true, "sort");
}
- List<Resource> resources = resourceService.selectList(wrapper);
+ List<Resource> resources = resourceService.list(wrapper);
for (Resource resource : resources) {
resource.setName(i18nMessageService.resolveResourceText(resource.getName(), resource.getCode(), resource.getId()));
}
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index ef9d380..e2d95ce 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/role/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(roleService.selectById(String.valueOf(id)));
+ return R.ok(roleService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/role/list/auth")
@@ -35,21 +35,21 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Role> wrapper = new EntityWrapper<>();
+ QueryWrapper<Role> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
+ wrapper.orderBy(true, false, "id");
if (9527 == getUserId()) {
- return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
}
Long roleId = getUser().getRoleId();
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
List<Long> leaderIds = new ArrayList<>();
leaderIds.add(roleId);
while (leaderId != null) {
- Role leader = roleService.selectById(leaderId);
+ Role leader = roleService.getById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
@@ -58,10 +58,10 @@
// if (null != role.getLevel()) {
// wrapper.gt("level", role.getLevel());
// }
- return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -80,7 +80,7 @@
return R.error();
}
if (null == role.getId()){
- roleService.insert(role);
+ roleService.save(role);
} else {
roleService.updateById(role);
}
@@ -90,7 +90,7 @@
@RequestMapping(value = "/role/add/auth")
@ManagerAuth(memo = "瑙掕壊娣诲姞")
public R add(Role role) {
- roleService.insert(role);
+ roleService.save(role);
return R.ok();
}
@@ -110,7 +110,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- roleService.deleteBatchIds(Arrays.asList(ids));
+ roleService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -118,27 +118,27 @@
@ManagerAuth(memo = "瑙掕壊瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Role> wrapper = new EntityWrapper<>();
+ QueryWrapper<Role> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("role"));
convert(map, wrapper);
- List<Role> list = roleService.selectList(wrapper);
+ List<Role> list = roleService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/roleQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Role> wrapper = new EntityWrapper<>();
+ QueryWrapper<Role> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
// 涓婁笅绾х鐞�
if (9527 != getUserId()) {
Long roleId = getUser().getRoleId();
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
List<Long> leaderIds = new ArrayList<>();
while (leaderId != null) {
- Role leader = roleService.selectById(leaderId);
+ Role leader = roleService.getById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
@@ -149,7 +149,7 @@
// }
}
- Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Role> page = roleService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Role role : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 9344ff6..340d7fe 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -28,7 +28,7 @@
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(userService.selectById(String.valueOf(id)));
+ return R.ok(userService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/user/list/auth")
@@ -39,31 +39,31 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
+ wrapper.orderBy(true, false, "id");
if (9527 == getUserId()) {
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(userService.page(new Page<>(curr, limit), wrapper));
}
Long roleId = getUser().getRoleId();
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
List<Long> leaderIds = new ArrayList<>();
leaderIds.add(role.getId());
while (leaderId != null) {
- Role leader = roleService.selectById(leaderId);
+ Role leader = roleService.getById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
wrapper.notIn("role_id", leaderIds);
}
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(userService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -82,7 +82,7 @@
return R.error();
}
if (null == user.getId()){
- userService.insert(user);
+ userService.save(user);
} else {
userService.updateById(user);
}
@@ -92,7 +92,7 @@
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
- userService.insert(user);
+ userService.save(user);
return R.ok();
}
@@ -102,7 +102,7 @@
if (Cools.isEmpty(user) || null==user.getId()){
return R.error();
}
- User entity = userService.selectById(user.getId());
+ User entity = userService.getById(user.getId());
if (user.getPassword()!=null) {
entity.setPassword(user.getPassword());
}
@@ -123,7 +123,7 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- userService.deleteById(id);
+ userService.removeById(id);
}
return R.ok();
}
@@ -132,19 +132,19 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
convert(map, wrapper);
- List<User> list = userService.selectList(wrapper);
+ List<User> list = userService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/userQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.like("username", condition);
- Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
+ Page<User> page = userService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (User user : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 69960f1..833795b 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/userLogin/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(userLoginService.selectById(String.valueOf(id)));
+ return R.ok(userLoginService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/userLogin/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
+ QueryWrapper<UserLogin> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(userLoginService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderBy(true, false, "id");
+ return R.ok(userLoginService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == userLogin.getId()){
- userLoginService.insert(userLogin);
+ userLoginService.save(userLogin);
} else {
userLoginService.updateById(userLogin);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/userLogin/add/auth")
@ManagerAuth
public R add(UserLogin userLogin) {
- userLoginService.insert(userLogin);
+ userLoginService.save(userLogin);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- userLoginService.deleteBatchIds(Arrays.asList(ids));
+ userLoginService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
+ QueryWrapper<UserLogin> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("userLogin"));
convert(map, wrapper);
- List<UserLogin> list = userLoginService.selectList(wrapper);
+ List<UserLogin> list = userLoginService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/userLoginQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
+ QueryWrapper<UserLogin> wrapper = new QueryWrapper<>();
wrapper.like("token", condition);
- Page<UserLogin> page = userLoginService.selectPage(new Page<>(0, 10), wrapper);
+ Page<UserLogin> page = userLoginService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (UserLogin userLogin : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/entity/Api.java b/src/main/java/com/zy/system/entity/Api.java
index 9342543..cad1c5b 100644
--- a/src/main/java/com/zy/system/entity/Api.java
+++ b/src/main/java/com/zy/system/entity/Api.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/Config.java b/src/main/java/com/zy/system/entity/Config.java
index a4ab8fc..1b788a7 100644
--- a/src/main/java/com/zy/system/entity/Config.java
+++ b/src/main/java/com/zy/system/entity/Config.java
@@ -1,8 +1,8 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/Host.java b/src/main/java/com/zy/system/entity/Host.java
index 28b85ab..538e5e7 100644
--- a/src/main/java/com/zy/system/entity/Host.java
+++ b/src/main/java/com/zy/system/entity/Host.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/LicenseInfos.java b/src/main/java/com/zy/system/entity/LicenseInfos.java
index 7c41d93..d9f4266 100644
--- a/src/main/java/com/zy/system/entity/LicenseInfos.java
+++ b/src/main/java/com/zy/system/entity/LicenseInfos.java
@@ -1,15 +1,15 @@
package com.zy.system.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotation.TableField;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index eb93fad..726ef71 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -77,7 +77,7 @@
public String getUserId$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.userId);
+ User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
return user.getUsername();
}
diff --git a/src/main/java/com/zy/system/entity/Permission.java b/src/main/java/com/zy/system/entity/Permission.java
index 8373e0f..17b3edf 100644
--- a/src/main/java/com/zy/system/entity/Permission.java
+++ b/src/main/java/com/zy/system/entity/Permission.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.ResourceService;
@@ -88,7 +88,7 @@
public String getResourceName(){
ResourceService service = SpringUtils.getBean(ResourceService.class);
- Resource resource = service.selectById(this.resourceId);
+ Resource resource = service.getById(this.resourceId);
if (!Cools.isEmpty(resource)){
return resource.getName();
}
diff --git a/src/main/java/com/zy/system/entity/Resource.java b/src/main/java/com/zy/system/entity/Resource.java
index 01b81f9..a6f59c8 100644
--- a/src/main/java/com/zy/system/entity/Resource.java
+++ b/src/main/java/com/zy/system/entity/Resource.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.ResourceService;
@@ -102,7 +102,7 @@
public String getResourceName(){
ResourceService service = SpringUtils.getBean(ResourceService.class);
- Resource resource = service.selectById(this.resourceId);
+ Resource resource = service.getById(this.resourceId);
if (!Cools.isEmpty(resource)){
return resource.getName();
}
diff --git a/src/main/java/com/zy/system/entity/Role.java b/src/main/java/com/zy/system/entity/Role.java
index 9f6a998..304ff77 100644
--- a/src/main/java/com/zy/system/entity/Role.java
+++ b/src/main/java/com/zy/system/entity/Role.java
@@ -1,8 +1,8 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.RoleService;
@@ -92,7 +92,7 @@
public String getLeader$(){
RoleService service = SpringUtils.getBean(RoleService.class);
- Role role = service.selectById(this.leader);
+ Role role = service.getById(this.leader);
if (!Cools.isEmpty(role)){
return String.valueOf(role.getName());
}
diff --git a/src/main/java/com/zy/system/entity/RolePermission.java b/src/main/java/com/zy/system/entity/RolePermission.java
index d846f50..90ce2fe 100644
--- a/src/main/java/com/zy/system/entity/RolePermission.java
+++ b/src/main/java/com/zy/system/entity/RolePermission.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.PermissionService;
@@ -62,7 +62,7 @@
public String getRoleName(){
RoleService service = SpringUtils.getBean(RoleService.class);
- Role role = service.selectById(this.roleId);
+ Role role = service.getById(this.roleId);
if (!Cools.isEmpty(role)){
return role.getName();
}
@@ -79,7 +79,7 @@
public String getPermissionName(){
PermissionService service = SpringUtils.getBean(PermissionService.class);
- Permission permission = service.selectById(this.permissionId);
+ Permission permission = service.getById(this.permissionId);
if (!Cools.isEmpty(permission)){
return permission.getName();
}
diff --git a/src/main/java/com/zy/system/entity/RoleResource.java b/src/main/java/com/zy/system/entity/RoleResource.java
index 48d4091..8748b2e 100644
--- a/src/main/java/com/zy/system/entity/RoleResource.java
+++ b/src/main/java/com/zy/system/entity/RoleResource.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index c5086aa..4481956 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.HostService;
@@ -82,7 +82,7 @@
public String getHostName() {
HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.selectById(this.hostId);
+ Host host = service.getById(this.hostId);
if (!Cools.isEmpty(host)){
return host.getName();
}
@@ -119,7 +119,7 @@
public String getRoleName(){
RoleService service = SpringUtils.getBean(RoleService.class);
- Role role = service.selectById(this.roleId);
+ Role role = service.getById(this.roleId);
if (!Cools.isEmpty(role)){
return role.getName();
}
diff --git a/src/main/java/com/zy/system/entity/UserLogin.java b/src/main/java/com/zy/system/entity/UserLogin.java
index 0460cba..2528b3f 100644
--- a/src/main/java/com/zy/system/entity/UserLogin.java
+++ b/src/main/java/com/zy/system/entity/UserLogin.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -60,7 +60,7 @@
public String getUserUsername(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.userId);
+ User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
return user.getUsername();
}
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index c45b77e..355abf2 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -156,7 +156,7 @@
licenseInfos.setLicenseTime(formatLicenseTime(install));
licenseInfos.setRequestCode(requestCode);
licenseInfos.setCreateTime(new Date());
- licenseInfosService.insert(licenseInfos);
+ licenseInfosService.save(licenseInfos);
} catch (Exception ignored) {
}
}
diff --git a/src/main/java/com/zy/system/mapper/ApiMapper.java b/src/main/java/com/zy/system/mapper/ApiMapper.java
index bd3d145..f93ea99 100644
--- a/src/main/java/com/zy/system/mapper/ApiMapper.java
+++ b/src/main/java/com/zy/system/mapper/ApiMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Api;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/ConfigMapper.java b/src/main/java/com/zy/system/mapper/ConfigMapper.java
index 9ec6ab3..17d2d88 100644
--- a/src/main/java/com/zy/system/mapper/ConfigMapper.java
+++ b/src/main/java/com/zy/system/mapper/ConfigMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Config;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/HostMapper.java b/src/main/java/com/zy/system/mapper/HostMapper.java
index ea5b9c1..a860cb7 100644
--- a/src/main/java/com/zy/system/mapper/HostMapper.java
+++ b/src/main/java/com/zy/system/mapper/HostMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Host;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java b/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java
index 25be922..22ce3a5 100644
--- a/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java
+++ b/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java
@@ -1,7 +1,7 @@
package com.zy.system.mapper;
import com.zy.system.entity.LicenseInfos;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/OperateLogMapper.java b/src/main/java/com/zy/system/mapper/OperateLogMapper.java
index d002d10..f6128c7 100644
--- a/src/main/java/com/zy/system/mapper/OperateLogMapper.java
+++ b/src/main/java/com/zy/system/mapper/OperateLogMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.OperateLog;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/system/mapper/PermissionMapper.java b/src/main/java/com/zy/system/mapper/PermissionMapper.java
index 3b6a70e..64f4985 100644
--- a/src/main/java/com/zy/system/mapper/PermissionMapper.java
+++ b/src/main/java/com/zy/system/mapper/PermissionMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Permission;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/ResourceMapper.java b/src/main/java/com/zy/system/mapper/ResourceMapper.java
index 3372755..88a99f1 100644
--- a/src/main/java/com/zy/system/mapper/ResourceMapper.java
+++ b/src/main/java/com/zy/system/mapper/ResourceMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Resource;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/RoleMapper.java b/src/main/java/com/zy/system/mapper/RoleMapper.java
index 7900402..ff4dd68 100644
--- a/src/main/java/com/zy/system/mapper/RoleMapper.java
+++ b/src/main/java/com/zy/system/mapper/RoleMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Role;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/RolePermissionMapper.java b/src/main/java/com/zy/system/mapper/RolePermissionMapper.java
index f7815ca..de90de9 100644
--- a/src/main/java/com/zy/system/mapper/RolePermissionMapper.java
+++ b/src/main/java/com/zy/system/mapper/RolePermissionMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.RolePermission;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/RoleResourceMapper.java b/src/main/java/com/zy/system/mapper/RoleResourceMapper.java
index e77e262..21e59c7 100644
--- a/src/main/java/com/zy/system/mapper/RoleResourceMapper.java
+++ b/src/main/java/com/zy/system/mapper/RoleResourceMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Resource;
import com.zy.system.entity.RoleResource;
import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/zy/system/mapper/UserLoginMapper.java b/src/main/java/com/zy/system/mapper/UserLoginMapper.java
index b275758..3b9d27e 100644
--- a/src/main/java/com/zy/system/mapper/UserLoginMapper.java
+++ b/src/main/java/com/zy/system/mapper/UserLoginMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.UserLogin;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/zy/system/mapper/UserMapper.java b/src/main/java/com/zy/system/mapper/UserMapper.java
index 0e40b22..f6e625e 100644
--- a/src/main/java/com/zy/system/mapper/UserMapper.java
+++ b/src/main/java/com/zy/system/mapper/UserMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.User;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/service/ApiService.java b/src/main/java/com/zy/system/service/ApiService.java
index 4d0dca5..313a5d6 100644
--- a/src/main/java/com/zy/system/service/ApiService.java
+++ b/src/main/java/com/zy/system/service/ApiService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Api;
public interface ApiService extends IService<Api> {
diff --git a/src/main/java/com/zy/system/service/ConfigService.java b/src/main/java/com/zy/system/service/ConfigService.java
index 7e31e9a..47276a1 100644
--- a/src/main/java/com/zy/system/service/ConfigService.java
+++ b/src/main/java/com/zy/system/service/ConfigService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Config;
public interface ConfigService extends IService<Config> {
diff --git a/src/main/java/com/zy/system/service/HostService.java b/src/main/java/com/zy/system/service/HostService.java
index 0643fe1..cc22012 100644
--- a/src/main/java/com/zy/system/service/HostService.java
+++ b/src/main/java/com/zy/system/service/HostService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Host;
public interface HostService extends IService<Host> {
diff --git a/src/main/java/com/zy/system/service/LicenseInfosService.java b/src/main/java/com/zy/system/service/LicenseInfosService.java
index b8a21a9..e349df2 100644
--- a/src/main/java/com/zy/system/service/LicenseInfosService.java
+++ b/src/main/java/com/zy/system/service/LicenseInfosService.java
@@ -1,7 +1,7 @@
package com.zy.system.service;
import com.zy.system.entity.LicenseInfos;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface LicenseInfosService extends IService<LicenseInfos> {
diff --git a/src/main/java/com/zy/system/service/OperateLogService.java b/src/main/java/com/zy/system/service/OperateLogService.java
index 4516f15..ae95457 100644
--- a/src/main/java/com/zy/system/service/OperateLogService.java
+++ b/src/main/java/com/zy/system/service/OperateLogService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.OperateLog;
import java.util.List;
diff --git a/src/main/java/com/zy/system/service/PermissionService.java b/src/main/java/com/zy/system/service/PermissionService.java
index 6e13883..fba20ed 100644
--- a/src/main/java/com/zy/system/service/PermissionService.java
+++ b/src/main/java/com/zy/system/service/PermissionService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Permission;
public interface PermissionService extends IService<Permission> {
diff --git a/src/main/java/com/zy/system/service/ResourceService.java b/src/main/java/com/zy/system/service/ResourceService.java
index 5f4df69..97cf026 100644
--- a/src/main/java/com/zy/system/service/ResourceService.java
+++ b/src/main/java/com/zy/system/service/ResourceService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Resource;
public interface ResourceService extends IService<Resource> {
diff --git a/src/main/java/com/zy/system/service/RolePermissionService.java b/src/main/java/com/zy/system/service/RolePermissionService.java
index a308902..41b11cd 100644
--- a/src/main/java/com/zy/system/service/RolePermissionService.java
+++ b/src/main/java/com/zy/system/service/RolePermissionService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.RolePermission;
public interface RolePermissionService extends IService<RolePermission> {
diff --git a/src/main/java/com/zy/system/service/RoleResourceService.java b/src/main/java/com/zy/system/service/RoleResourceService.java
index 42ef479..b3b939a 100644
--- a/src/main/java/com/zy/system/service/RoleResourceService.java
+++ b/src/main/java/com/zy/system/service/RoleResourceService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Resource;
import com.zy.system.entity.RoleResource;
diff --git a/src/main/java/com/zy/system/service/RoleService.java b/src/main/java/com/zy/system/service/RoleService.java
index 8a23ead..5a7c421 100644
--- a/src/main/java/com/zy/system/service/RoleService.java
+++ b/src/main/java/com/zy/system/service/RoleService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Role;
public interface RoleService extends IService<Role> {
diff --git a/src/main/java/com/zy/system/service/UserLoginService.java b/src/main/java/com/zy/system/service/UserLoginService.java
index 8bfa7b0..021d043 100644
--- a/src/main/java/com/zy/system/service/UserLoginService.java
+++ b/src/main/java/com/zy/system/service/UserLoginService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.UserLogin;
public interface UserLoginService extends IService<UserLogin> {
diff --git a/src/main/java/com/zy/system/service/UserService.java b/src/main/java/com/zy/system/service/UserService.java
index adf1253..44b82cd 100644
--- a/src/main/java/com/zy/system/service/UserService.java
+++ b/src/main/java/com/zy/system/service/UserService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.User;
public interface UserService extends IService<User> {
diff --git a/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java b/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java
index 4f92956..06a5e54 100644
--- a/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Api;
import com.zy.system.mapper.ApiMapper;
import com.zy.system.service.ApiService;
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index 0a8661c..6d66c66 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Config;
import com.zy.system.mapper.ConfigMapper;
import com.zy.system.service.ConfigService;
diff --git a/src/main/java/com/zy/system/service/impl/HostServiceImpl.java b/src/main/java/com/zy/system/service/impl/HostServiceImpl.java
index 8565c35..3eb2eb2 100644
--- a/src/main/java/com/zy/system/service/impl/HostServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/HostServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Host;
import com.zy.system.mapper.HostMapper;
import com.zy.system.service.HostService;
diff --git a/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java b/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java
index e738c0c..5ce2e99 100644
--- a/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java
@@ -3,7 +3,7 @@
import com.zy.system.mapper.LicenseInfosMapper;
import com.zy.system.entity.LicenseInfos;
import com.zy.system.service.LicenseInfosService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("licenseInfosService")
diff --git a/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java b/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
index 960a05f..8e8509d 100644
--- a/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.system.entity.OperateLog;
import com.zy.system.mapper.OperateLogMapper;
diff --git a/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java b/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java
index d6d3eeb..a3e8869 100644
--- a/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Permission;
import com.zy.system.mapper.PermissionMapper;
import com.zy.system.service.PermissionService;
diff --git a/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java b/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java
index 353b867..59b99d3 100644
--- a/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Resource;
import com.zy.system.mapper.ResourceMapper;
import com.zy.system.service.ResourceService;
diff --git a/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java b/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java
index 8311fb1..d6a33ca 100644
--- a/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.RolePermission;
import com.zy.system.mapper.RolePermissionMapper;
import com.zy.system.service.RolePermissionService;
diff --git a/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java b/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java
index 35aa081..174e3b0 100644
--- a/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Resource;
import com.zy.system.entity.RoleResource;
import com.zy.system.mapper.RoleResourceMapper;
diff --git a/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java b/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
index f86c513..cd8476e 100644
--- a/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Role;
import com.zy.system.mapper.RoleMapper;
import com.zy.system.service.RoleService;
diff --git a/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java b/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java
index ebe5908..72813c6 100644
--- a/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.UserLogin;
import com.zy.system.mapper.UserLoginMapper;
import com.zy.system.service.UserLoginService;
diff --git a/src/main/java/com/zy/system/service/impl/UserServiceImpl.java b/src/main/java/com/zy/system/service/impl/UserServiceImpl.java
index 67c0ce4..8e8cc52 100644
--- a/src/main/java/com/zy/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/UserServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.User;
import com.zy.system.mapper.UserMapper;
import com.zy.system.service.UserService;
diff --git a/src/main/java/com/zy/system/timer/LicenseTimer.java b/src/main/java/com/zy/system/timer/LicenseTimer.java
index 235a53c..09562fd 100644
--- a/src/main/java/com/zy/system/timer/LicenseTimer.java
+++ b/src/main/java/com/zy/system/timer/LicenseTimer.java
@@ -91,7 +91,7 @@
licenseInfos.setCreateTime(new Date());
licenseInfos.setLicenseTime(response.getString("licenseTime"));
licenseInfos.setRequestCode(requestCode);
- licenseInfosService.insert(licenseInfos);
+ licenseInfosService.save(licenseInfos);
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 056f16e..5ffc018 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 绯荤粺鐗堟湰淇℃伅
app:
- version: 1.0.5.3
+ version: 3.0.0.0
version-type: dev # prd 鎴� dev
i18n:
default-locale: zh-CN
@@ -26,17 +26,18 @@
hikari:
validation-timeout: 3000
connection-test-query: select 1
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
static-path-pattern: /**
- redis:
- host: 127.0.0.1
- port: 6379
- database: 0
- # password: 123456
+ data:
+ redis:
+ host: 127.0.0.1
+ port: 6379
+ database: 0
+ # password: 123456
task:
scheduling:
pool:
diff --git a/src/main/resources/templates/Controller.txt b/src/main/resources/templates/Controller.txt
index 682fcbc..abf4d8f 100644
--- a/src/main/resources/templates/Controller.txt
+++ b/src/main/resources/templates/Controller.txt
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.core.domain.KeyValueVo;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
@@ -28,7 +28,7 @@
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(@{SIMPLEENTITYNAME}Service.selectById(String.valueOf(id)));
+ return R.ok(@{SIMPLEENTITYNAME}Service.getById(String.valueOf(id)));
}
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/list/auth")
@@ -39,15 +39,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+ QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(@{ENTITYNAME}.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(@{SIMPLEENTITYNAME}Service.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(@{SIMPLEENTITYNAME}Service.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -63,7 +63,7 @@
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/add/auth")
@ManagerAuth
public R add(@{ENTITYNAME} @{SIMPLEENTITYNAME}) {
- @{SIMPLEENTITYNAME}Service.insert(@{SIMPLEENTITYNAME});
+ @{SIMPLEENTITYNAME}Service.save(@{SIMPLEENTITYNAME});
return R.ok();
}
@@ -81,7 +81,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") @{PRIMARYKEYTYPE}[] ids){
for (@{PRIMARYKEYTYPE} id : ids){
- @{SIMPLEENTITYNAME}Service.deleteById(id);
+ @{SIMPLEENTITYNAME}Service.removeById(id);
}
return R.ok();
}
@@ -89,20 +89,20 @@
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+ QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("@{SIMPLEENTITYNAME}"));
convert(map, wrapper);
- List<@{ENTITYNAME}> list = @{SIMPLEENTITYNAME}Service.selectList(wrapper);
+ List<@{ENTITYNAME}> list = @{SIMPLEENTITYNAME}Service.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/@{SIMPLEENTITYNAME}Query/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+ QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
wrapper.like("@{MAJORCOLUMN}", condition);
- Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(0, 10), wrapper);
+ Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (@{ENTITYNAME} @{SIMPLEENTITYNAME} : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -117,11 +117,11 @@
@ManagerAuth
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
- EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+ QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
if (!Cools.isEmpty(condition)) {
wrapper.like("@{MAJORCOLUMN}", condition);
}
- @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(1, 30), wrapper).getRecords()
+ @{SIMPLEENTITYNAME}Service.page(new Page<>(1, 30), wrapper).getRecords()
.forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.get@{UPCASEMARJORCOLUMN}()), item.get@{PRIMARYKEYCOLUMN}())));
return R.ok().add(vos);
}
@@ -129,8 +129,8 @@
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<@{ENTITYNAME}>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != @{SIMPLEENTITYNAME}Service.selectOne(wrapper)){
+ QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<@{ENTITYNAME}>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != @{SIMPLEENTITYNAME}Service.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(@{ENTITYNAME}.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/resources/templates/Entity.txt b/src/main/resources/templates/Entity.txt
index 69d0b41..92198f9 100644
--- a/src/main/resources/templates/Entity.txt
+++ b/src/main/resources/templates/Entity.txt
@@ -3,7 +3,7 @@
@{ENTITYIMPORT}
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
diff --git a/src/main/resources/templates/Mapper.txt b/src/main/resources/templates/Mapper.txt
index 97e6e38..ee5a871 100644
--- a/src/main/resources/templates/Mapper.txt
+++ b/src/main/resources/templates/Mapper.txt
@@ -1,7 +1,7 @@
package @{COMPANYNAME}.mapper;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/resources/templates/Service.txt b/src/main/resources/templates/Service.txt
index 28f8cc4..983af7c 100644
--- a/src/main/resources/templates/Service.txt
+++ b/src/main/resources/templates/Service.txt
@@ -1,7 +1,7 @@
package @{COMPANYNAME}.service;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface @{ENTITYNAME}Service extends IService<@{ENTITYNAME}> {
diff --git a/src/main/resources/templates/ServiceImpl.txt b/src/main/resources/templates/ServiceImpl.txt
index 04256bd..b24351a 100644
--- a/src/main/resources/templates/ServiceImpl.txt
+++ b/src/main/resources/templates/ServiceImpl.txt
@@ -3,7 +3,7 @@
import @{COMPANYNAME}.mapper.@{ENTITYNAME}Mapper;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("@{SIMPLEENTITYNAME}Service")
diff --git a/src/main/webapp/views/ai/diagnosis.html b/src/main/webapp/views/ai/diagnosis.html
index b424504..b2dfd1e 100644
--- a/src/main/webapp/views/ai/diagnosis.html
+++ b/src/main/webapp/views/ai/diagnosis.html
@@ -98,7 +98,7 @@
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
- <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script src="../../static/js/marked.min.js"></script>
<script src="../../static/js/purify.min.js"></script>
<script>
diff --git a/src/main/webapp/views/ai/llm_config.html b/src/main/webapp/views/ai/llm_config.html
index 8d91b18..d6e2849 100644
--- a/src/main/webapp/views/ai/llm_config.html
+++ b/src/main/webapp/views/ai/llm_config.html
@@ -472,7 +472,7 @@
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script>
new Vue({
el: '#app',
diff --git a/src/main/webapp/views/apiLog/apiLog.html b/src/main/webapp/views/apiLog/apiLog.html
index 800a016..92f9fbc 100644
--- a/src/main/webapp/views/apiLog/apiLog.html
+++ b/src/main/webapp/views/apiLog/apiLog.html
@@ -71,7 +71,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/apiLog/apiLog.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basCrnp/basCrnp.html b/src/main/webapp/views/basCrnp/basCrnp.html
index 6edd160..76ba096 100644
--- a/src/main/webapp/views/basCrnp/basCrnp.html
+++ b/src/main/webapp/views/basCrnp/basCrnp.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnp/basCrnp.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basCrnp/basCrnp_detail.html b/src/main/webapp/views/basCrnp/basCrnp_detail.html
index 9c2f438..24f8690 100644
--- a/src/main/webapp/views/basCrnp/basCrnp_detail.html
+++ b/src/main/webapp/views/basCrnp/basCrnp_detail.html
@@ -105,7 +105,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnp/basCrnp.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basCrnpErr/basCrnpErr.html b/src/main/webapp/views/basCrnpErr/basCrnpErr.html
index 64baa7b..aa1c288 100644
--- a/src/main/webapp/views/basCrnpErr/basCrnpErr.html
+++ b/src/main/webapp/views/basCrnpErr/basCrnpErr.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnpErr/basCrnpErr.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basCrnpErr/basCrnpErr_detail.html b/src/main/webapp/views/basCrnpErr/basCrnpErr_detail.html
index b02a072..afda006 100644
--- a/src/main/webapp/views/basCrnpErr/basCrnpErr_detail.html
+++ b/src/main/webapp/views/basCrnpErr/basCrnpErr_detail.html
@@ -95,7 +95,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnpErr/basCrnpErr.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog.html b/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog.html
index 104428b..d93bef8 100644
--- a/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog.html
+++ b/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnpErrLog/basCrnpErrLog.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog_detail.html b/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog_detail.html
index 7212dcf..51504be 100644
--- a/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog_detail.html
+++ b/src/main/webapp/views/basCrnpErrLog/basCrnpErrLog_detail.html
@@ -195,7 +195,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnpErrLog/basCrnpErrLog.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basCrnpOpt/basCrnpOpt.html b/src/main/webapp/views/basCrnpOpt/basCrnpOpt.html
index 15e093f..d868da4 100644
--- a/src/main/webapp/views/basCrnpOpt/basCrnpOpt.html
+++ b/src/main/webapp/views/basCrnpOpt/basCrnpOpt.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnpOpt/basCrnpOpt.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basCrnpOpt/basCrnpOpt_detail.html b/src/main/webapp/views/basCrnpOpt/basCrnpOpt_detail.html
index 93c6b2a..1e6b83a 100644
--- a/src/main/webapp/views/basCrnpOpt/basCrnpOpt_detail.html
+++ b/src/main/webapp/views/basCrnpOpt/basCrnpOpt_detail.html
@@ -135,7 +135,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basCrnpOpt/basCrnpOpt.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basDevp/basDevp.html b/src/main/webapp/views/basDevp/basDevp.html
index 215b640..73ff8d3 100644
--- a/src/main/webapp/views/basDevp/basDevp.html
+++ b/src/main/webapp/views/basDevp/basDevp.html
@@ -63,7 +63,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDevp/basDevp.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basDevp/basDevp_detail.html b/src/main/webapp/views/basDevp/basDevp_detail.html
index e6708a2..3c66b07 100644
--- a/src/main/webapp/views/basDevp/basDevp_detail.html
+++ b/src/main/webapp/views/basDevp/basDevp_detail.html
@@ -105,7 +105,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDevp/basDevp.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basDualCrnp/basDualCrnp.html b/src/main/webapp/views/basDualCrnp/basDualCrnp.html
index 64f703a..9eb6469 100644
--- a/src/main/webapp/views/basDualCrnp/basDualCrnp.html
+++ b/src/main/webapp/views/basDualCrnp/basDualCrnp.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnp/basDualCrnp.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html b/src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html
index 578aadd..ec5804c 100644
--- a/src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html
+++ b/src/main/webapp/views/basDualCrnp/basDualCrnp_detail.html
@@ -141,7 +141,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnp/basDualCrnp.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html
index d7e4cc5..be2f092 100644
--- a/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html
+++ b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnpErr/basDualCrnpErr.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html
index d49f768..b8ea7ad 100644
--- a/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html
+++ b/src/main/webapp/views/basDualCrnpErr/basDualCrnpErr_detail.html
@@ -95,7 +95,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnpErr/basDualCrnpErr.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html
index 7392c29..4604061 100644
--- a/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html
+++ b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnpErrLog/basDualCrnpErrLog.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html
index 58862d2..f18ad2b 100644
--- a/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html
+++ b/src/main/webapp/views/basDualCrnpErrLog/basDualCrnpErrLog_detail.html
@@ -195,7 +195,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnpErrLog/basDualCrnpErrLog.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html
index b26ca70..8343165 100644
--- a/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html
+++ b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnpOpt/basDualCrnpOpt.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html
index cb5ee7a..4caa327 100644
--- a/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html
+++ b/src/main/webapp/views/basDualCrnpOpt/basDualCrnpOpt_detail.html
@@ -135,7 +135,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDualCrnpOpt/basDualCrnpOpt.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basLocSts/basLocSts.html b/src/main/webapp/views/basLocSts/basLocSts.html
index 7958465..d48d1f4 100644
--- a/src/main/webapp/views/basLocSts/basLocSts.html
+++ b/src/main/webapp/views/basLocSts/basLocSts.html
@@ -43,7 +43,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basLocSts/basLocSts.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/basLocSts/basLocSts_detail.html b/src/main/webapp/views/basLocSts/basLocSts_detail.html
index e486d84..6d92c89 100644
--- a/src/main/webapp/views/basLocSts/basLocSts_detail.html
+++ b/src/main/webapp/views/basLocSts/basLocSts_detail.html
@@ -81,7 +81,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basLocSts/basLocSts.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basMap/basMap.html b/src/main/webapp/views/basMap/basMap.html
index 7142610..235672d 100644
--- a/src/main/webapp/views/basMap/basMap.html
+++ b/src/main/webapp/views/basMap/basMap.html
@@ -67,7 +67,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basMap/basMap.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basMap/basMap_detail.html b/src/main/webapp/views/basMap/basMap_detail.html
index 0689211..b411abc 100644
--- a/src/main/webapp/views/basMap/basMap_detail.html
+++ b/src/main/webapp/views/basMap/basMap_detail.html
@@ -83,7 +83,7 @@
</body>da
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basMap/basMap.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basOutStationArea/basOutStationArea.html b/src/main/webapp/views/basOutStationArea/basOutStationArea.html
index 5df0d5a..89b461d 100644
--- a/src/main/webapp/views/basOutStationArea/basOutStationArea.html
+++ b/src/main/webapp/views/basOutStationArea/basOutStationArea.html
@@ -80,7 +80,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basOutStationArea/basOutStationArea.js"></script>
</body>
</html>
diff --git a/src/main/webapp/views/basRgv/basRgv.html b/src/main/webapp/views/basRgv/basRgv.html
index 5d628dd..48e9600 100644
--- a/src/main/webapp/views/basRgv/basRgv.html
+++ b/src/main/webapp/views/basRgv/basRgv.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgv/basRgv.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basRgv/basRgv_detail.html b/src/main/webapp/views/basRgv/basRgv_detail.html
index 56f6598..e55c192 100644
--- a/src/main/webapp/views/basRgv/basRgv_detail.html
+++ b/src/main/webapp/views/basRgv/basRgv_detail.html
@@ -93,7 +93,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgv/basRgv.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basRgvErr/basRgvErr.html b/src/main/webapp/views/basRgvErr/basRgvErr.html
index 482e7fd..faac858 100644
--- a/src/main/webapp/views/basRgvErr/basRgvErr.html
+++ b/src/main/webapp/views/basRgvErr/basRgvErr.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgvErr/basRgvErr.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basRgvErr/basRgvErr_detail.html b/src/main/webapp/views/basRgvErr/basRgvErr_detail.html
index e7c7833..3443a99 100644
--- a/src/main/webapp/views/basRgvErr/basRgvErr_detail.html
+++ b/src/main/webapp/views/basRgvErr/basRgvErr_detail.html
@@ -95,7 +95,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgvErr/basRgvErr.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basRgvErrLog/basRgvErrLog.html b/src/main/webapp/views/basRgvErrLog/basRgvErrLog.html
index ab027d4..0f66b1d 100644
--- a/src/main/webapp/views/basRgvErrLog/basRgvErrLog.html
+++ b/src/main/webapp/views/basRgvErrLog/basRgvErrLog.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgvErrLog/basRgvErrLog.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basRgvErrLog/basRgvErrLog_detail.html b/src/main/webapp/views/basRgvErrLog/basRgvErrLog_detail.html
index 9100e52..f1bccae 100644
--- a/src/main/webapp/views/basRgvErrLog/basRgvErrLog_detail.html
+++ b/src/main/webapp/views/basRgvErrLog/basRgvErrLog_detail.html
@@ -195,7 +195,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgvErrLog/basRgvErrLog.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basRgvOpt/basRgvOpt.html b/src/main/webapp/views/basRgvOpt/basRgvOpt.html
index 0425e10..b96e78a 100644
--- a/src/main/webapp/views/basRgvOpt/basRgvOpt.html
+++ b/src/main/webapp/views/basRgvOpt/basRgvOpt.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgvOpt/basRgvOpt.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basRgvOpt/basRgvOpt_detail.html b/src/main/webapp/views/basRgvOpt/basRgvOpt_detail.html
index 4bc176d..3405f4c 100644
--- a/src/main/webapp/views/basRgvOpt/basRgvOpt_detail.html
+++ b/src/main/webapp/views/basRgvOpt/basRgvOpt_detail.html
@@ -135,7 +135,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basRgvOpt/basRgvOpt.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basStation/basStation.html b/src/main/webapp/views/basStation/basStation.html
index b8e6215..08134dd 100644
--- a/src/main/webapp/views/basStation/basStation.html
+++ b/src/main/webapp/views/basStation/basStation.html
@@ -57,7 +57,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basStation/basStation.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basStation/basStation_detail.html b/src/main/webapp/views/basStation/basStation_detail.html
index 98e6ea0..e843aae 100644
--- a/src/main/webapp/views/basStation/basStation_detail.html
+++ b/src/main/webapp/views/basStation/basStation_detail.html
@@ -111,7 +111,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basStation/basStation.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basStationDevice/basStationDevice.html b/src/main/webapp/views/basStationDevice/basStationDevice.html
index 3346886..fd4dd5a 100644
--- a/src/main/webapp/views/basStationDevice/basStationDevice.html
+++ b/src/main/webapp/views/basStationDevice/basStationDevice.html
@@ -263,7 +263,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basStationDevice/basStationDevice.js"></script>
</body>
</html>
diff --git a/src/main/webapp/views/basStationOpt/basStationOpt.html b/src/main/webapp/views/basStationOpt/basStationOpt.html
index a103431..042573c 100644
--- a/src/main/webapp/views/basStationOpt/basStationOpt.html
+++ b/src/main/webapp/views/basStationOpt/basStationOpt.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basStationOpt/basStationOpt.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/basStationOpt/basStationOpt_detail.html b/src/main/webapp/views/basStationOpt/basStationOpt_detail.html
index bff92d4..2e472a1 100644
--- a/src/main/webapp/views/basStationOpt/basStationOpt_detail.html
+++ b/src/main/webapp/views/basStationOpt/basStationOpt_detail.html
@@ -135,7 +135,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basStationOpt/basStationOpt.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basWrkIotype/basWrkIotype.html b/src/main/webapp/views/basWrkIotype/basWrkIotype.html
index 783d7be..af2b770 100644
--- a/src/main/webapp/views/basWrkIotype/basWrkIotype.html
+++ b/src/main/webapp/views/basWrkIotype/basWrkIotype.html
@@ -43,7 +43,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWrkIotype/basWrkIotype.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html b/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html
index e4c55ac..0c10693 100644
--- a/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html
+++ b/src/main/webapp/views/basWrkIotype/basWrkIotype_detail.html
@@ -87,7 +87,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWrkIotype/basWrkIotype.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/basWrkStatus/basWrkStatus.html b/src/main/webapp/views/basWrkStatus/basWrkStatus.html
index 80fe89d..2b82780 100644
--- a/src/main/webapp/views/basWrkStatus/basWrkStatus.html
+++ b/src/main/webapp/views/basWrkStatus/basWrkStatus.html
@@ -43,7 +43,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWrkStatus/basWrkStatus.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/basWrkStatus/basWrkStatus_detail.html b/src/main/webapp/views/basWrkStatus/basWrkStatus_detail.html
index 3023287..db48c4b 100644
--- a/src/main/webapp/views/basWrkStatus/basWrkStatus_detail.html
+++ b/src/main/webapp/views/basWrkStatus/basWrkStatus_detail.html
@@ -89,7 +89,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basWrkStatus/basWrkStatus.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/config/config.html b/src/main/webapp/views/config/config.html
index 3b94ea2..0d878ba 100644
--- a/src/main/webapp/views/config/config.html
+++ b/src/main/webapp/views/config/config.html
@@ -56,7 +56,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/config/config.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/config/config_detail.html b/src/main/webapp/views/config/config_detail.html
index 36a0ea3..729d80c 100644
--- a/src/main/webapp/views/config/config_detail.html
+++ b/src/main/webapp/views/config/config_detail.html
@@ -85,7 +85,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/config/config.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/debugParam/debugParam.html b/src/main/webapp/views/debugParam/debugParam.html
index 740f5fb..7dd00a9 100644
--- a/src/main/webapp/views/debugParam/debugParam.html
+++ b/src/main/webapp/views/debugParam/debugParam.html
@@ -6,7 +6,7 @@
<title>璋冭瘯鍙傛暟</title>
<link rel="stylesheet" href="../../static/vue/element/element.css">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
<style>
diff --git a/src/main/webapp/views/detail.html b/src/main/webapp/views/detail.html
index ed3397d..9a7739c 100644
--- a/src/main/webapp/views/detail.html
+++ b/src/main/webapp/views/detail.html
@@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
- <script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/js/common.js?v=20260309_i18n_fix1"></script>
<style>
body {
background-color: #fff;
diff --git a/src/main/webapp/views/deviceConfig/deviceConfig.html b/src/main/webapp/views/deviceConfig/deviceConfig.html
index 793403b..7818180 100644
--- a/src/main/webapp/views/deviceConfig/deviceConfig.html
+++ b/src/main/webapp/views/deviceConfig/deviceConfig.html
@@ -62,7 +62,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/deviceConfig/deviceConfig.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/deviceConfig/deviceConfig_detail.html b/src/main/webapp/views/deviceConfig/deviceConfig_detail.html
index e372fcb..aa8fdef 100644
--- a/src/main/webapp/views/deviceConfig/deviceConfig_detail.html
+++ b/src/main/webapp/views/deviceConfig/deviceConfig_detail.html
@@ -83,7 +83,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/deviceConfig/deviceConfig.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/deviceLogs/deviceLogs.html b/src/main/webapp/views/deviceLogs/deviceLogs.html
index 2af2915..1b9771a 100644
--- a/src/main/webapp/views/deviceLogs/deviceLogs.html
+++ b/src/main/webapp/views/deviceLogs/deviceLogs.html
@@ -203,7 +203,7 @@
</div>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script src="../../static/vue/js/vue.min.js"></script>
<script src="../../static/vue/element/element.js"></script>
<script src="../../components/MonitorCardKit.js"></script>
diff --git a/src/main/webapp/views/httpRequestLog/httpRequestLog.html b/src/main/webapp/views/httpRequestLog/httpRequestLog.html
index 12d3ed5..0e4c5ad 100644
--- a/src/main/webapp/views/httpRequestLog/httpRequestLog.html
+++ b/src/main/webapp/views/httpRequestLog/httpRequestLog.html
@@ -71,7 +71,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/httpRequestLog/httpRequestLog.js" charset="utf-8"></script>
</body>
diff --git a/src/main/webapp/views/httpRequestLog/httpRequestLog_detail.html b/src/main/webapp/views/httpRequestLog/httpRequestLog_detail.html
index 873be7f..3fa606a 100644
--- a/src/main/webapp/views/httpRequestLog/httpRequestLog_detail.html
+++ b/src/main/webapp/views/httpRequestLog/httpRequestLog_detail.html
@@ -65,7 +65,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/httpRequestLog/httpRequestLog.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index fad5958..9a51064 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -739,7 +739,7 @@
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
-<script type="text/javascript" src="../static/js/common.js"></script>
+<script type="text/javascript" src="../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../static/vue/element/element.js"></script>
<script>
@@ -1346,7 +1346,7 @@
script = frameDocument.createElement("script");
script.id = "wcs-i18n-bridge-script";
script.type = "text/javascript";
- script.src = baseUrl + "/static/js/common.js";
+ script.src = baseUrl + "/static/js/common.js?v=20260309_i18n_fix1";
script.onload = applyFrameI18n;
frameDocument.head.appendChild(script);
},
diff --git a/src/main/webapp/views/locMap/locMap.html b/src/main/webapp/views/locMap/locMap.html
index fdd8960..f54a265 100644
--- a/src/main/webapp/views/locMap/locMap.html
+++ b/src/main/webapp/views/locMap/locMap.html
@@ -5,7 +5,7 @@
<title>搴撲綅鍦板浘</title>
<link rel="stylesheet" href="../../static/vue/element/element.css">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
<script src="../../static/js/gsap.min.js"></script>
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index d522ce2..db2e085 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -75,7 +75,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index e10ea1d..8b2ba44 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -68,7 +68,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 6523edb..640e406 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -7,7 +7,7 @@
<link rel="icon" type="image/x-icon" href="../static/images/wcs_logo.png" />
<link rel="stylesheet" href="../static/css/animate.min.css">
<script type="text/javascript" src="../static/layui/layui.js"></script>
- <script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/js/common.js?v=20260309_i18n_fix1"></script>
<style>
html{
height: 100%;
diff --git a/src/main/webapp/views/notifyReport/notifyReport.html b/src/main/webapp/views/notifyReport/notifyReport.html
index b5cbb67..7c00400 100644
--- a/src/main/webapp/views/notifyReport/notifyReport.html
+++ b/src/main/webapp/views/notifyReport/notifyReport.html
@@ -544,7 +544,7 @@
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script>
new Vue({
el: '#app',
diff --git a/src/main/webapp/views/operateLog/operateLog.html b/src/main/webapp/views/operateLog/operateLog.html
index 827ece5..3fb63d9 100644
--- a/src/main/webapp/views/operateLog/operateLog.html
+++ b/src/main/webapp/views/operateLog/operateLog.html
@@ -59,7 +59,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/operateLog/operateLog.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/operateLog/operateLog_detail.html b/src/main/webapp/views/operateLog/operateLog_detail.html
index 73ccb9f..1334bd2 100644
--- a/src/main/webapp/views/operateLog/operateLog_detail.html
+++ b/src/main/webapp/views/operateLog/operateLog_detail.html
@@ -80,7 +80,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/operateLog/operateLog.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/password.html b/src/main/webapp/views/password.html
index 70c14d5..fc866c0 100644
--- a/src/main/webapp/views/password.html
+++ b/src/main/webapp/views/password.html
@@ -64,7 +64,7 @@
</body>
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/tools/md5.js"></script>
-<script type="text/javascript" src="../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script src="../static/layui/layui.js"></script>
<script>
layui.use(['form'], function() {
diff --git a/src/main/webapp/views/permission/permission.html b/src/main/webapp/views/permission/permission.html
index 7e2f98b..b73d0e3 100644
--- a/src/main/webapp/views/permission/permission.html
+++ b/src/main/webapp/views/permission/permission.html
@@ -55,7 +55,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/permission/permission.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/permission/permission_detail.html b/src/main/webapp/views/permission/permission_detail.html
index a238eaf..8e69961 100644
--- a/src/main/webapp/views/permission/permission_detail.html
+++ b/src/main/webapp/views/permission/permission_detail.html
@@ -72,7 +72,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/permission/permission.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/resource/resource.html b/src/main/webapp/views/resource/resource.html
index 92c2330..a762410 100644
--- a/src/main/webapp/views/resource/resource.html
+++ b/src/main/webapp/views/resource/resource.html
@@ -122,7 +122,7 @@
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script>
diff --git a/src/main/webapp/views/role/role.html b/src/main/webapp/views/role/role.html
index f5cacb1..b0635fe 100644
--- a/src/main/webapp/views/role/role.html
+++ b/src/main/webapp/views/role/role.html
@@ -49,7 +49,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/role/role.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/role/role_detail.html b/src/main/webapp/views/role/role_detail.html
index 1bac401..a3eb7a2 100644
--- a/src/main/webapp/views/role/role_detail.html
+++ b/src/main/webapp/views/role/role_detail.html
@@ -75,7 +75,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/role/role.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/role/role_power_detail.html b/src/main/webapp/views/role/role_power_detail.html
index 2395a2a..4347fcc 100644
--- a/src/main/webapp/views/role/role_power_detail.html
+++ b/src/main/webapp/views/role/role_power_detail.html
@@ -31,6 +31,6 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/js/role/rolePower.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index d2611c8..0e801b4 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -150,7 +150,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/user/user_detail.html b/src/main/webapp/views/user/user_detail.html
index e5213f4..c3f9ca7 100644
--- a/src/main/webapp/views/user/user_detail.html
+++ b/src/main/webapp/views/user/user_detail.html
@@ -79,7 +79,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/userLogin/userLogin.html b/src/main/webapp/views/userLogin/userLogin.html
index f2060b8..f63c53a 100644
--- a/src/main/webapp/views/userLogin/userLogin.html
+++ b/src/main/webapp/views/userLogin/userLogin.html
@@ -50,7 +50,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/userLogin/userLogin.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/userLogin/userLogin_detail.html b/src/main/webapp/views/userLogin/userLogin_detail.html
index 4309891..dad6154 100644
--- a/src/main/webapp/views/userLogin/userLogin_detail.html
+++ b/src/main/webapp/views/userLogin/userLogin_detail.html
@@ -62,7 +62,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/userLogin/userLogin.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 1a568dd..1656a0b 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/src/main/webapp/views/watch/console.html
@@ -509,7 +509,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
- <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
<script src="../../static/js/gsap.min.js"></script>
diff --git a/src/main/webapp/views/watch/console_html.html b/src/main/webapp/views/watch/console_html.html
index 37f7242..4499c09 100644
--- a/src/main/webapp/views/watch/console_html.html
+++ b/src/main/webapp/views/watch/console_html.html
@@ -9,7 +9,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
- <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
</head>
diff --git a/src/main/webapp/views/watch/console_pixijs.html b/src/main/webapp/views/watch/console_pixijs.html
index 9c7b52f..e4b7e49 100644
--- a/src/main/webapp/views/watch/console_pixijs.html
+++ b/src/main/webapp/views/watch/console_pixijs.html
@@ -11,7 +11,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
- <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
<script src="../../static/js/gsap.min.js"></script>
diff --git a/src/main/webapp/views/watch/stationColorConfig.html b/src/main/webapp/views/watch/stationColorConfig.html
index ae24781..7ab5755 100644
--- a/src/main/webapp/views/watch/stationColorConfig.html
+++ b/src/main/webapp/views/watch/stationColorConfig.html
@@ -284,7 +284,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/watch/stationColorConfig.js" charset="utf-8"></script>
</body>
</html>
diff --git a/src/main/webapp/views/wrkLastno/wrkLastno.html b/src/main/webapp/views/wrkLastno/wrkLastno.html
index 8b0d2da..ded83ea 100644
--- a/src/main/webapp/views/wrkLastno/wrkLastno.html
+++ b/src/main/webapp/views/wrkLastno/wrkLastno.html
@@ -47,7 +47,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkLastno/wrkLastno.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/wrkLastno/wrkLastno_detail.html b/src/main/webapp/views/wrkLastno/wrkLastno_detail.html
index f9bd3a3..f2ac0c9 100644
--- a/src/main/webapp/views/wrkLastno/wrkLastno_detail.html
+++ b/src/main/webapp/views/wrkLastno/wrkLastno_detail.html
@@ -71,7 +71,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkLastno/wrkLastno.js" charset="utf-8"></script>
</html>
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 1a611ca..40e8c5b 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../static/vue/element/element.css">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js"></script>
- <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
<style>
diff --git a/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
index 59b3ae4..026a843 100644
--- a/src/main/webapp/views/wrkMastLog/wrkMastLog.html
+++ b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -81,7 +81,7 @@
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html b/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html
index c6807ff..8e60e8d 100644
--- a/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html
+++ b/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html
@@ -189,7 +189,7 @@
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
</html>
--
Gitblit v1.9.1