From b0da63410a7aaf64b11183c95b3da38013a6457b Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 28 Oct 2025 15:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java | 2
ard-common/src/main/java/com/ard/common/filter/PropertyPreExcludeFilter.java | 2
ard-common/src/main/java/com/ard/common/core/domain/TreeEntity.java | 2
ard-common/src/main/java/com/ard/common/utils/ip/AddressUtils.java | 2
ard-common/src/main/java/com/ard/common/core/text/Convert.java | 2
ard-common/src/main/java/com/ard/common/utils/poi/ExcelUtil.java | 2
ard-admin/src/main/java/com/ard/web/core/config/SwaggerConfig.java | 2
ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java | 48
ard-route/src/main/java/com/ard/route/mapper/ArdRouteFolderMapper.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_NAS_DIRECTORY.java | 2
ard-common/src/main/java/com/ard/common/utils/PageUtils.java | 2
ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_INFO.java | 2
ard-common/src/main/java/com/ard/common/annotation/Excel.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_ACCESS_CTL_IMAGE_INFO.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java | 2
ard-common/src/main/java/com/ard/common/core/domain/model/LoginUser.java | 2
ard-common/src/main/java/com/ard/common/utils/sign/Base64.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/NetSDKLib.java | 122 +-
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_INTELLI_SHELF_INFO.java | 2
ard-common/src/main/java/com/ard/common/core/domain/entity/SysMenu.java | 2
ard-common/src/main/java/com/ard/common/core/text/CharsetKit.java | 2
ard-common/src/main/java/com/ard/common/enums/BusinessStatus.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PRIVACY_MASKING.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/constant/SDK_ALARM_Ex_TYPE.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_CONDITION.java | 2
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_START_FIND_WATERDATA_CONDITION.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PROFILE_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BURN_PARAM_INFO.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java | 2
ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java | 27
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java | 26
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_NUMBERSTAT_INFO.java | 2
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFile.java | 2
ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYTYPE.java | 2
ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_PASS_CONFIRM_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE.java | 8
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CIGARETTE_CASE_DETECTION_INFO.java | 2
ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobLogServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/utils/Arith.java | 2
ard-system/src/main/java/com/ard/system/domain/SysUserRole.java | 2
ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml | 98 ++
ard-common/src/main/java/com/ard/common/annotation/Sensitive.java | 2
ard-common/src/main/java/com/ard/common/exception/GlobalException.java | 2
ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IVS_DIALRECOGNITION_RULE_INFO.java | 2
ard-common/src/main/java/com/ard/common/exception/user/UserPasswordNotMatchException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java | 27
ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java | 2
ard-common/src/main/java/com/ard/common/core/domain/entity/SysRole.java | 2
ard-common/src/main/java/com/ard/common/config/serializer/SensitiveJsonSerializer.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ALARM_ANALOGALRM_INFO.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java | 2
ard-framework/src/main/java/com/ard/framework/config/FastJson2JsonRedisSerializer.java | 2
ard-route/pom.xml | 9
ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictType.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_CONTROL_ASG.java | 4
ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/UNPACKING_CHECK_INFO.java | 2
ard-common/src/main/java/com/ard/common/utils/ServletUtils.java | 2
ard-quartz/src/main/java/com/ard/quartz/service/ISysJobService.java | 2
ard-common/src/main/java/com/ard/common/exception/user/BlackListException.java | 2
ard-common/src/main/java/com/ard/common/exception/user/UserPasswordRetryLimitExceedException.java | 2
ard-common/src/main/java/com/ard/common/core/redis/RedisCache.java | 2
ard-common/src/main/java/com/ard/common/enums/HttpMethod.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/RADAR_REPORTS_VEHICLE_INFO.java | 4
ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java | 2
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 8
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEO_STATISTICS.java | 2
ard-work/src/main/java/com/ard/work/domain/message/ServerReplyMessage.java | 25
ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java | 2
ard-common/src/main/java/com/ard/common/utils/uuid/IdUtils.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/enums/DataSourceType.java | 2
ard-common/src/main/java/com/ard/common/filter/RepeatableFilter.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_TEMP_USERID_INFO.java | 2
ard-quartz/src/main/java/com/ard/quartz/domain/SysJobLog.java | 2
ard-common/src/main/java/com/ard/common/enums/DesensitizedType.java | 2
ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java | 13
ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java | 2
ard-framework/src/main/java/com/ard/framework/interceptor/RepeatSubmitInterceptor.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NUMBERSTAT_INFO.java | 1
ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java | 2
ard-route/src/main/java/com/ard/route/util/ToolUtils.java | 43
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PTZ_MOVING_DETECTIONRESULT.java | 12
ard-common/src/main/java/com/ard/common/exception/user/UserException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java | 2
ard-framework/src/main/java/com/ard/framework/security/filter/JwtAuthenticationTokenFilter.java | 2
ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java | 63 +
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EXTRA_PLATES.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_CUSTOM_SNAP_INFO.java | 2
ard-common/src/main/java/com/ard/common/enums/OperatorType.java | 2
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavStateManager.java | 6
ard-work/src/main/java/com/ard/work/domain/message/BaseMessage.java | 2
ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java | 2
ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java | 2
ard-system/src/main/java/com/ard/system/service/ISysRoleService.java | 2
ard-common/src/main/java/com/ard/common/utils/uuid/UUID.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDK.java | 6
ard-generator/src/main/java/com/ard/generator/domain/GenTable.java | 2
ard-common/src/main/java/com/ard/common/utils/bean/BeanValidators.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CUSTOMER_DEV_SETTING_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_TIMER.java | 2
ard-framework/src/main/java/com/ard/framework/web/service/SysPasswordService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_PROPER_INFO.java | 2
ard-system/src/main/java/com/ard/system/service/ISysUserService.java | 2
ard-common/src/main/java/com/ard/common/utils/DictUtils.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SECURITYGATE_ALARM_FACE_INFO.java | 6
ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java | 2
ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java | 2
ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java | 2
ard-admin/src/main/java/com/ard/web/controller/tool/TestController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_ABNORMAL_INFO.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/factory/FactoryType.java | 25
ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java | 2
ard-framework/src/main/java/com/ard/framework/security/context/AuthenticationContextHolder.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AC_CAPS.java | 2
ard-framework/src/main/java/com/ard/framework/aspectj/DataSourceAspect.java | 2
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 52
ard-common/src/main/java/com/ard/common/utils/ExceptionUtil.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_FIREPROOF_CLOTHES.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java | 27
ard-generator/src/main/java/com/ard/generator/util/GenUtils.java | 2
ard-work/src/main/java/com/ard/work/service/impl/UavWaylineServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/config/UavConfig.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/fVideoStatHeatMapCallBack.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PERSON_INFO_INPUT_RESULT.java | 2
ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java | 3
ard-framework/src/main/java/com/ard/framework/config/ServerConfig.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE_CONDITION.java | 2
ard-framework/src/main/java/com/ard/framework/config/ApplicationConfig.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETSTATUS.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VKINFO.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYGRADE.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_OUTPUT_STATE.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WORKSUIT_COMPARE_GROUP_INFO.java | 4
ard-route/src/main/java/com/ard/route/util/FileUtils.java | 42
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java | 11
ard-common/src/main/java/com/ard/common/utils/html/HTMLFilter.java | 2
ard-common/src/main/java/com/ard/common/constant/CameraConstants.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java | 2
ard-common/src/main/java/com/ard/common/core/domain/BaseEntity.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OPENDOOR_MATCHINFO_EX.java | 2
ard-framework/src/main/java/com/ard/framework/config/I18nConfig.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java | 2
ard-common/src/main/java/com/ard/common/annotation/DataScope.java | 2
ard-common/src/main/java/com/ard/common/filter/XssHttpServletRequestWrapper.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BOAT_OBJECT.java | 4
ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java | 2
ard-framework/src/main/java/com/ard/framework/web/service/TokenService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_NET_INFO.java | 6
ard-framework/src/main/java/com/ard/framework/web/service/PermissionService.java | 4
ard-framework/src/main/java/com/ard/framework/config/properties/PermitAllUrlProperties.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREATE_TRANSMIT_TUNNEL.java | 4
ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java | 2
ard-quartz/src/main/java/com/ard/quartz/util/AbstractQuartzJob.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_THINGS_GET_NETSTATE.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CROSSLINE_STAT_INFO.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/ServerController.java | 2
ard-framework/src/main/java/com/ard/framework/config/CaptchaConfig.java | 2
ard-common/src/main/java/com/ard/common/exception/user/CaptchaExpireException.java | 2
ard-quartz/src/main/java/com/ard/quartz/controller/SysJobController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_CLOTHES.java | 4
ard-framework/src/main/java/com/ard/framework/config/DruidConfig.java | 2
ard-route/src/main/java/com/ard/route/service/UavRouteService.java | 13
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java | 10
ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java | 2
ard-common/src/main/java/com/ard/common/utils/bean/BeanUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CONSUMPTION_STRATEGY_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_STEREO.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/xss/Xss.java | 2
ard-route/src/main/java/com/ard/route/service/IArdRouteFileService.java | 2
ard-common/src/main/java/com/ard/common/filter/XssFilter.java | 2
ard-system/src/main/java/com/ard/system/domain/SysPost.java | 2
ard-framework/src/main/java/com/ard/framework/config/KaptchaTextCreator.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_CURRENTSTATUSGET_STATUS.java | 2
ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml | 32
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_BREED_DETECTION_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATER_DETECTION_UPLOAD_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_EAP.java | 4
ard-admin/src/main/java/com/ard/ArdUavServletInitializer.java | 2
ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java | 2
ard-common/src/main/java/com/ard/common/core/domain/AjaxResult.java | 2
ard-common/src/main/java/com/ard/common/utils/LogUtils.java | 2
ard-generator/src/main/java/com/ard/generator/util/VelocityUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_NAS_DIRECTORY_GET_INFO.java | 2
ard-framework/src/main/java/com/ard/framework/config/FilterConfig.java | 2
ard-common/src/main/java/com/ard/common/constant/DeviceConstants.java | 2
ard-work/src/main/java/com/ard/work/component/websocket/utils/WebSocketUtil.java | 14
ard-common/src/main/java/com/ard/common/annotation/Excels.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER.java | 8
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_ALARMMODE.java | 2
ard-common/src/main/java/com/ard/common/utils/html/EscapeUtil.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DETECT_BIG_PIC_INFO_EX.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_FILE_INFO_BY_PATH_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_GLASSES_RELATED_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_ENCLOSURE_INFO_EX.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_2DCODE.java | 2
ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictData.java | 2
ard-common/src/main/java/com/ard/common/utils/SecurityUtils.java | 2
ard-common/src/main/java/com/ard/common/core/domain/R.java | 2
ard-common/src/main/java/com/ard/common/utils/ByteUtils.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java | 2
ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSource.java | 2
ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRAFFICSTARTFINDSTAT.java | 4
ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/utils/ip/IpUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_WATERDATA_STAT_SERVER_GETDATA_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_QR_CODE_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_NOTIFY_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_CAR_MEASUREMENT_INFO.java | 10
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_BYPASSMODE.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETCAPS_INFO.java | 4
ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_ACCESS_CALL_LIFT.java | 6
ard-common/src/main/java/com/ard/common/utils/sql/SqlUtil.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_INSULATOR_DETECT.java | 2
ard-common/src/main/java/com/ard/common/utils/file/FileTypeUtils.java | 6
ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java | 2
README.md | 2
ard-framework/src/main/java/com/ard/framework/web/domain/server/Jvm.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java | 2
ard-generator/src/main/java/com/ard/generator/config/GenConfig.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HUMAN_ANIMAL_COEXISTENCE_INFO.java | 6
ard-common/src/main/java/com/ard/common/utils/file/ImageUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SECURITYGATE_PERSONALARM_INFO.java | 6
ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobMapper.java | 2
ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml | 34
ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java | 2
ard-generator/src/main/java/com/ard/generator/service/IGenTableService.java | 2
ard-system/src/main/java/com/ard/system/vo/MetaVo.java | 2
ard-common/src/main/java/com/ard/common/constant/CacheConstants.java | 7
ard-common/src/main/java/com/ard/common/utils/DesensitizedUtil.java | 2
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 19
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fXRayAttachPackageStatistics.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java | 2
ard-system/src/main/java/com/ard/system/domain/SysNotice.java | 2
ard-common/src/main/java/com/ard/common/exception/ServiceException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_INFO.java | 4
ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java | 2
ard-common/src/main/java/com/ard/common/constant/ScheduleConstants.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_SET_BYPASS.java | 2
ard-common/src/main/java/com/ard/common/exception/user/UserNotExistsException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fSecurityGateAttachAlarmStatistics.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PERSON_FREQUENCY_INFO.java | 2
ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java | 7
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java | 93 +
ard-admin/src/main/java/com/ard/web/controller/system/SysIndexController.java | 6
ard-common/src/main/java/com/ard/common/utils/uuid/Seq.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AIRBORNE_DETECT.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ARMING_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROJECT_TASK.java | 2
ard-framework/src/main/java/com/ard/framework/config/SecurityConfig.java | 2
ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/constant/HttpStatus.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HEAT_IMAGING_TEMPER_INFO.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_DIALRECOGNITION_INFO.java | 2
ard-generator/src/main/java/com/ard/generator/mapper/GenTableMapper.java | 2
ard-common/src/main/java/com/ard/common/filter/RepeatedlyRequestWrapper.java | 2
ard-framework/src/main/java/com/ard/framework/config/properties/DruidProperties.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_SIM_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TEMPERATUREEX_VALUE.java | 2
ard-common/src/main/java/com/ard/common/utils/StringUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RESPIRATOR_DETECT.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_COMMUNICATIONKEY_INFO.java | 2
ard-framework/src/main/java/com/ard/framework/config/MybatisPlusConfig.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java | 2
ard-common/src/main/java/com/ard/common/constant/Constants.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_COVER_PLATE_DETECT.java | 2
ard-common/src/main/java/com/ard/common/utils/spring/SpringUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NAS_DIRECTORY_CFG_INFO.java | 4
ard-common/src/main/java/com/ard/common/constant/UserConstants.java | 2
ard-framework/src/main/java/com/ard/framework/security/handle/CustomAuthenticationSuccessHandler.java | 3
ard-common/src/main/java/com/ard/common/exception/base/BaseException.java | 2
ard-common/src/main/java/com/ard/common/core/domain/TreeSelect.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_GROUP.java | 6
ard-common/src/main/java/com/ard/common/utils/Threads.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_EXTERNAL_WIFI_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_STARTMULTIFIND_FACERECONGNITION_EX.java | 2
ard-framework/src/main/java/com/ard/framework/web/domain/server/Cpu.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_STREAM.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATERDATA_STAT_SERVER_INFO.java | 2
ard-common/src/main/java/com/ard/common/exception/file/FileUploadException.java | 2
ard-admin/src/main/java/com/ard/web/controller/work/wayline/UavWaylineController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEO_IN_FOCUS_UNIT.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROPERTIES_INFO.java | 2
ard-common/src/main/java/com/ard/common/utils/http/HttpHelper.java | 2
ard-framework/src/main/java/com/ard/framework/aspectj/RateLimiterAspect.java | 2
ard-common/src/main/java/com/ard/common/exception/file/InvalidExtensionException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_LEVEL_INFO.java | 4
ard-framework/src/main/java/com/ard/framework/security/handle/AuthenticationEntryPointImpl.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_NONMOTOR_INFO.java | 2
ard-common/src/main/java/com/ard/common/core/page/TableSupport.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_REAREND_ACCIDENT_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_UNIFIEDINFOCOLLECT_GET_DEVSTATUS.java | 2
ard-admin/pom.xml | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java | 2
ard-common/src/main/java/com/ard/common/utils/file/FileUtils.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETCAPS.java | 4
ard-generator/src/main/java/com/ard/generator/util/VelocityInitializer.java | 2
ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java | 10
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java | 16
ard-common/src/main/java/com/ard/common/exception/DemoModeException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_GENEAL_ATTITUDE_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_SPECIAL_VEHICLE_INFO.java | 2
ard-common/src/main/java/com/ard/common/core/domain/model/LoginBody.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_PLACEMENT_DETECTION_INFO.java | 2
ard-system/src/main/java/com/ard/system/domain/SysConfig.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_CAPS.java | 2
ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java | 2
ard-quartz/src/main/java/com/ard/quartz/config/ScheduleConfig.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java | 2
ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java | 2
ard-common/src/main/java/com/ard/common/core/text/StrFormatter.java | 2
ard-admin/src/main/resources/application.yml | 2
ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java | 1
ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java | 7
ard-generator/src/main/java/com/ard/generator/domain/GenTableColumn.java | 2
ard-framework/src/main/java/com/ard/framework/security/context/PermissionContextHolder.java | 2
ard-framework/src/main/java/com/ard/framework/security/handle/LogoutSuccessHandlerImpl.java | 2
ard-common/src/main/java/com/ard/common/core/page/TableDataInfo.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_ARMING_FAILURE_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRESSING_PLATE_DETECT.java | 2
ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobLogMapper.java | 2
ard-common/src/main/java/com/ard/common/exception/ControlException.java | 2
ard-system/src/main/java/com/ard/system/service/ISysConfigService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAALARM_INFO.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_INFO.java | 2
ard-work/src/main/java/com/ard/work/domain/dto/control/SpeedControlDTO.java | 5
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DIAL_DETECT.java | 2
ard-quartz/src/main/java/com/ard/quartz/util/CronUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_RADAR_REGION_DETECTION_INFO.java | 4
ard-quartz/src/main/java/com/ard/quartz/util/ScheduleUtils.java | 2
ard-common/src/main/java/com/ard/common/exception/file/FileNameLengthLimitExceededException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java | 2
ard-system/src/main/java/com/ard/system/service/ISysDeptService.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java | 2
ard-generator/src/main/java/com/ard/generator/service/GenTableColumnServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/annotation/RepeatSubmit.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_IMAGE_INFO.java | 2
ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java | 2
ard-work/src/main/java/com/ard/work/service/impl/GimbalSpeedService.java | 113 ++
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_HAT.java | 2
ard-quartz/src/main/java/com/ard/quartz/controller/SysJobLogController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_PROPERTY.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TRAFFIC_LATTICE_SCREEN_LOGO_INFO.java | 2
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java | 4
ard-framework/src/main/java/com/ard/framework/config/ThreadPoolConfig.java | 2
ard-common/src/main/java/com/ard/common/core/domain/model/RegisterBody.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAARM_MODECHANGE_INFO.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ACCESSCONTROL_CAPTURE_CMD.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DOOR_DETECT.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WIRELESS_INFO.java | 12
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RFIDELETAG_INFO.java | 10
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_INTELLIPARKING.java | 2
ard-work/src/main/java/com/ard/work/service/IGimbalSpeedService.java | 16
ard-framework/src/main/java/com/ard/framework/web/domain/Server.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java | 2
ard-common/src/main/java/com/ard/common/constant/GenConstants.java | 2
ard-common/src/main/java/com/ard/common/exception/job/TaskException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRUCKNOTCLEAN_FOR_PRMA_INFO.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java | 2
ard-common/src/main/java/com/ard/common/utils/reflect/ReflectUtils.java | 2
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SUBLINK_SERVER_CALLBACK.java | 2
ard-work/src/main/java/com/ard/work/component/websocket/handler/BaseSubscriptionManager.java | 23
ard-common/src/main/java/com/ard/common/core/controller/BaseController.java | 2
ard-common/src/main/java/com/ard/common/utils/sign/Md5Utils.java | 2
ard-common/src/main/java/com/ard/common/annotation/Log.java | 2
ard-common/src/main/java/com/ard/common/enums/BusinessType.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_MODIFIED_INFO.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_ACTION_SETPROPERTY.java | 2
ard-framework/src/main/java/com/ard/framework/web/domain/server/Sys.java | 2
ard-generator/src/main/java/com/ard/generator/service/IGenTableColumnService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/MEDIAFILE_SMART_KITCHEN_CLOTHES_DETECTION_INFO.java | 8
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_RADAR_REGIONDETECTION_INFO.java | 2
ard-admin/src/main/java/com/ard/web/controller/work/UavRealDataController.java | 1
ard-route/src/main/java/com/ard/route/mapper/ArdRouteInformationMapper.java | 63 +
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_TRAFFICCAR_INFO.java | 8
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_TANK_CAPACITY_DETECTION.java | 2
ard-quartz/src/main/java/com/ard/quartz/util/QuartzJobExecution.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_MASK.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_WIRELESSDEV_LOWPOWER_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_COMPRESSION_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_VAULTDOOR_STATE_INFO.java | 4
ard-common/src/main/java/com/ard/common/core/domain/entity/SysDept.java | 2
ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_DYNAMIC_LOCK_RANDOM_PUBLICKEY_INFO.java | 2
ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java | 2
ard-quartz/src/main/java/com/ard/quartz/util/QuartzDisallowConcurrentExecution.java | 2
ard-work/src/main/java/com/ard/work/domain/dto/state/UavState.java | 12
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_DEVICE_MODIFIED_INFO.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_REGIONNUM_STAT_INFO.java | 2
ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_INFO.java | 2
ard-common/src/main/java/com/ard/common/utils/MessageUtils.java | 2
ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSourceContextHolder.java | 2
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInformation.java | 37
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREAT_SUB_BUSINESS_MDL_INFO.java | 4
ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java | 2
ard-system/src/main/java/com/ard/system/domain/SysCache.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_BUTTON_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java | 2
ard-common/src/main/java/com/ard/common/enums/LimitType.java | 2
ard-framework/src/main/java/com/ard/framework/config/ResourcesConfig.java | 2
ard-framework/src/main/java/com/ard/framework/config/RedisConfig.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IMAGE_INFO.java | 2
ard-common/src/main/java/com/ard/common/enums/UserStatus.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_FACEBODY_DETECT_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEOSATA_SUMMARY_INFO.java | 2
ard-framework/src/main/java/com/ard/framework/interceptor/impl/SameUrlDataInterceptor.java | 2
ard-quartz/src/main/java/com/ard/quartz/service/ISysJobLogService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ARM_OPTIONS.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_TRIGGER.java | 2
ard-common/src/main/java/com/ard/common/annotation/Anonymous.java | 2
ard-admin/src/main/resources/application-prod.yml | 2
ard-generator/src/main/java/com/ard/generator/service/GenTableServiceImpl.java | 2
ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java | 22
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_THINGS_ATTACH.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_CONDITION_PROPERTY.java | 2
ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/factory/CameraSDKFactory.java | 14
ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_POWER_INFO.java | 2
ard-work/src/main/java/com/ard/work/domain/entity/UavWayline.java | 2
ard-generator/src/main/java/com/ard/generator/mapper/GenTableColumnMapper.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_REMOVAL_DETECTION_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_HISTORY_TRAFFIC_CAR_INFO.java | 8
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WIEGAND_INFO.java | 6
ard-generator/src/main/resources/generator.yml | 2
ard-system/src/main/java/com/ard/system/vo/RouterVo.java | 2
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMOTE_STREAM_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_APPEND_EXTENDED_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_CONFIG.java | 8
ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_EXAM_RECORDING_PLANS.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEOSTAT_STREAM.java | 2
ard-framework/src/main/java/com/ard/framework/web/domain/server/SysFile.java | 2
ard-admin/src/main/java/com/ard/ArdUavApplication.java | 2
ard-framework/src/main/java/com/ard/framework/manager/AsyncManager.java | 2
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 146 ++
ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PUSH_PICFILE_BYRULE_INFO.java | 2
ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java | 2
ard-quartz/src/main/java/com/ard/quartz/domain/SysJob.java | 2
ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java | 35
ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_ONECLICKARMING.java | 8
ard-common/src/main/java/com/ard/common/exception/file/FileException.java | 2
ard-framework/src/main/java/com/ard/framework/manager/ShutdownManager.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPEN_CODE_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_TEMPERATUREEX.java | 2
ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java | 20
ard-common/src/main/java/com/ard/common/utils/poi/ExcelHandlerAdapter.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/optimized/LAMP_GROUP_INFO_V1.java | 2
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EM_CFG_USER_PASS_DATA_COUNT_CLEAR_INFO.java | 2
ard-work/src/main/java/com/ard/work/mapper/UavWaylineMapper.java | 2
ard-work/src/main/java/com/ard/work/service/IUavWaylineService.java | 2
ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_CONSUMPTION_EVENT_INFO.java | 14
ard-system/src/main/java/com/ard/system/service/ISysMenuService.java | 2
ard-quartz/src/main/java/com/ard/quartz/util/JobInvokeUtil.java | 2
ard-system/src/main/java/com/ard/system/domain/SysOperLog.java | 2
ard-common/src/main/java/com/ard/common/core/page/PageDomain.java | 2
ard-common/src/main/java/com/ard/common/utils/http/HttpUtils.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CTRL_ARM_DISARM_PARAM_EX_IN.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_QUERULE_RULECONTENT.java | 2
ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ELECTRICFAULTDETECT_INFO.java | 2
ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_CREATE_TRANSMIT_TUNNEL.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_EVENT_IVS_TYPE.java | 8
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_RELAY_INFO.java | 2
ard-common/src/main/java/com/ard/common/annotation/DataSource.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_FACE_RECOGNITION_DETECT_MULTI_FACE_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROHELMET_ATTRIBUTE.java | 4
ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java | 2
ard-common/src/main/java/com/ard/common/annotation/RateLimiter.java | 2
ard-common/src/main/java/com/ard/common/exception/file/FileSizeLimitExceededException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VAOBJECT_ANIMAL_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRANSFER_SUBLINK_INFO.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/hik/service/impl/HikVisionSDK.java | 21
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java | 111 ++
ard-system/src/main/java/com/ard/system/service/ISysPostService.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_DOFIND_FACERECONGNITION_EX.java | 2
ard-common/src/main/java/com/ard/common/xss/XssValidator.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_MULTILEVEL_DETECT_CFG_INFO.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_UPDATE_INFO.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_VISIBILITY_INFO.java | 2
ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVO.java | 25
ard-common/src/main/java/com/ard/common/exception/user/CaptchaException.java | 2
ard-common/src/main/java/com/ard/common/utils/DateUtils.java | 2
ard-quartz/src/main/java/com/ard/quartz/task/RyTask.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_ACTION.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_START_REDIRECT_SERVICE.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPENKEY_INFO.java | 2
ard-generator/src/main/java/com/ard/generator/controller/GenController.java | 4
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NAS_INFO_NEW.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_VIDEO_NORMAL_DETECTION_INFO.java | 2
ard-system/src/main/java/com/ard/system/domain/SysUserPost.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_HISTORYDATA_PROPER_INFO.java | 2
ard-common/src/main/java/com/ard/common/exception/UtilException.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_MULTI_APPEND_TO_VEHICLE_REG_DB.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RECORD_ACCESS_CTL_CONSUMPTION_INFO.java | 10
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_GENERAL_INFO.java | 2
ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java | 2
ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java | 2
ard-device/src/main/java/com/ard/device/component/sdk/common/GlobalVariable.java | 6
ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETDATA_INFO.java | 4
540 files changed, 1,940 insertions(+), 904 deletions(-)
diff --git a/README.md b/README.md
index b9f5493..6bd1232 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
## 平台简介
-这是一套基于六合协议的无人机平台。
+这是一套基于边缘服务器协议的无人机平台。
* 前端采用Vue、Element UI。
* 后端采用Spring Boot、Spring Security、Redis & Jwt。
diff --git a/ard-admin/pom.xml b/ard-admin/pom.xml
index a333632..d70e00a 100644
--- a/ard-admin/pom.xml
+++ b/ard-admin/pom.xml
@@ -23,7 +23,7 @@
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
- <!-- ruoyi-springboot2 / swagger knife4j 配置 -->
+ <!-- ard-springboot2 / swagger knife4j 配置 -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
diff --git a/ard-admin/src/main/java/com/ard/ArdUavApplication.java b/ard-admin/src/main/java/com/ard/ArdUavApplication.java
index 033b5e6..e4e8b80 100644
--- a/ard-admin/src/main/java/com/ard/ArdUavApplication.java
+++ b/ard-admin/src/main/java/com/ard/ArdUavApplication.java
@@ -8,7 +8,7 @@
/**
* 启动程序
*
- * @author ruoyi
+ * @author ard
*/
@EnableScheduling
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
diff --git a/ard-admin/src/main/java/com/ard/ArdUavServletInitializer.java b/ard-admin/src/main/java/com/ard/ArdUavServletInitializer.java
index 3d8bff1..bb1fecd 100644
--- a/ard-admin/src/main/java/com/ard/ArdUavServletInitializer.java
+++ b/ard-admin/src/main/java/com/ard/ArdUavServletInitializer.java
@@ -6,7 +6,7 @@
/**
* web容器中进行部署
*
- * @author ruoyi
+ * @author ard
*/
public class ArdUavServletInitializer extends SpringBootServletInitializer
{
diff --git a/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java b/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
index f264278..52ac9a9 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/common/CaptchaController.java
@@ -23,7 +23,7 @@
/**
* 验证码操作处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
public class CaptchaController
diff --git a/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java b/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java
index a8a6965..c5d568c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java
@@ -23,7 +23,7 @@
/**
* 通用请求处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/common")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
index 0c91912..b1aa9a4 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
@@ -25,7 +25,7 @@
/**
* 禁飞区管理Controller
*
- * @author ruoyi
+ * @author ard
* @date 2025-10-14
*/
@Api(tags = "禁飞区管理")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java b/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
index d017422..c24b65e 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
@@ -24,7 +24,7 @@
/**
* 相机设备Controller
*
- * @author ruoyi
+ * @author ard
* @date 2023-01-31
*/
@Slf4j
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
index 1328f06..d33b084 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/CacheController.java
@@ -25,7 +25,7 @@
/**
* 缓存监控
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/monitor/cache")
@@ -44,6 +44,7 @@
caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
caches.add(new SysCache(CacheConstants.CAMERA_LIST_KEY, "相机列表"));
+ caches.add(new SysCache(CacheConstants.UAV_ONLINE_KEY, "在线无人机"));
}
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/ServerController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/ServerController.java
index b1749f3..c7c4fda 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/ServerController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/ServerController.java
@@ -10,7 +10,7 @@
/**
* 服务器监控
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/monitor/server")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
index 1cebd93..6ef64e4 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysLogininforController.java
@@ -23,7 +23,7 @@
/**
* 系统访问记录
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/monitor/logininfor")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
index 4343e17..58a361c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysOperlogController.java
@@ -22,7 +22,7 @@
/**
* 操作日志记录
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/monitor/operlog")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
index 3e7b2da..504a20b 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/monitor/SysUserOnlineController.java
@@ -26,7 +26,7 @@
/**
* 在线用户监控
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/monitor/online")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
index 3fa81b3..b7d018d 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
@@ -21,7 +21,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteFile;
import com.ard.route.service.IArdRouteFileService;
/**
@@ -32,7 +32,7 @@
*/
@Api(tags = "文件")
@RestController
-@RequestMapping("/file")
+@RequestMapping("/route/file")
public class ArdRouteFileController extends BaseController {
@Autowired
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
index f60b012..85b1bd4 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
@@ -22,7 +22,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ard.route.domain.ArdRouteFolder;
+import com.ard.route.domain.route.ArdRouteFolder;
import com.ard.route.service.IArdRouteFolderService;
/**
@@ -33,7 +33,7 @@
*/
@Api(tags = "文件夹")
@RestController
-@RequestMapping("/folder")
+@RequestMapping("/route/folder")
public class ArdRouteFolderController extends BaseController {
@Autowired
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java
new file mode 100644
index 0000000..fc0f9a8
--- /dev/null
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java
@@ -0,0 +1,111 @@
+package com.ard.web.controller.route;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ard.common.utils.poi.ExcelUtil;
+import com.ard.route.domain.route.ArdRouteInformation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ard.common.annotation.Log;
+import com.ard.common.core.controller.BaseController;
+import com.ard.common.core.domain.AjaxResult;
+import com.ard.common.enums.BusinessType;
+import com.ard.route.service.IArdRouteInformationService;
+import com.ard.common.core.page.TableDataInfo;
+
+/**
+ * 航线(kmz)Controller
+ *
+ * @author xia
+ * @date 2025-10-23
+ */
+@Api(tags = "航线信息接口")
+@RestController
+@RequestMapping("/route/information")
+public class ArdRouteInformationController extends BaseController {
+
+ @Autowired
+ private IArdRouteInformationService ardRouteInformationService;
+
+ /**
+ * 查询航线(kmz)列表
+ */
+ @ApiOperation("查询航线(kmz)列表")
+ @PreAuthorize("@ss.hasPermi('route:information:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ArdRouteInformation ardRouteInformation) {
+ startPage();
+ List<ArdRouteInformation> list = ardRouteInformationService.selectArdRouteInformationList(ardRouteInformation);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出航线(kmz)列表
+ */
+ @ApiOperation("导出航线(kmz)列表")
+ @PreAuthorize("@ss.hasPermi('route:information:export')")
+ @Log(title = "航线(kmz)", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ArdRouteInformation ardRouteInformation) {
+ List<ArdRouteInformation> list = ardRouteInformationService.selectArdRouteInformationList(ardRouteInformation);
+ ExcelUtil<ArdRouteInformation> util = new ExcelUtil<ArdRouteInformation>(ArdRouteInformation.class);
+ util.exportExcel(response, list, "航线(kmz)数据");
+ }
+
+ /**
+ * 获取航线(kmz)详细信息
+ */
+ @ApiOperation("获取航线(kmz)详细信息")
+ @PreAuthorize("@ss.hasPermi('route:information:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return success(ardRouteInformationService.selectArdRouteInformationById(id));
+ }
+
+ /**
+ * 新增航线(kmz)
+ */
+ @ApiOperation("新增航线(kmz)")
+ @PreAuthorize("@ss.hasPermi('route:information:add')")
+ @Log(title = "航线(kmz)", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ArdRouteInformation ardRouteInformation) {
+ ardRouteInformation.setCreateBy(getUsername());
+ return toAjax(ardRouteInformationService.insertArdRouteInformation(ardRouteInformation));
+ }
+
+ /**
+ * 修改航线(kmz)
+ */
+ @ApiOperation("修改航线(kmz)")
+ @PreAuthorize("@ss.hasPermi('route:information:edit')")
+ @Log(title = "航线(kmz)", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ArdRouteInformation ardRouteInformation) {
+ ardRouteInformation.setUpdateBy(getUsername());
+ return toAjax(ardRouteInformationService.updateArdRouteInformation(ardRouteInformation));
+ }
+
+ /**
+ * 删除航线(kmz)
+ */
+ @ApiOperation("删除航线(kmz)")
+ @PreAuthorize("@ss.hasPermi('route:information:remove')")
+ @Log(title = "航线(kmz)", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids) {
+ return toAjax(ardRouteInformationService.deleteArdRouteInformationByIds(ids));
+ }
+
+}
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
index 10d0cb0..a099c2c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/UavRouteController.java
@@ -1,18 +1,21 @@
package com.ard.web.controller.route;
+import com.ard.common.core.domain.AjaxResult;
import com.ard.route.domain.UavRouteReq;
import com.ard.route.service.UavRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.IOException;
+
+import static com.ard.common.core.domain.AjaxResult.success;
+
@Api(tags = "KMZ文件接口")
-@RequestMapping("/kmz")
+@RequestMapping("/route/kmz")
@RestController
public class UavRouteController {
@@ -23,18 +26,30 @@
* 编辑kmz文件
*/
@ApiOperation("编辑kmz文件")
+ @PreAuthorize("@ss.hasPermi('route:kmz:updateKmz')")
@PostMapping("/updateKmz")
- public void updateKmz(@RequestBody UavRouteReq uavRouteReq) {
- routeService.updateKmz(uavRouteReq);
+ public AjaxResult updateKmz(@RequestBody UavRouteReq uavRouteReq) {
+ return success(routeService.updateKmz(uavRouteReq));
}
/**
* 生成kmz文件
*/
@ApiOperation("生成kmz文件")
- @PostMapping("/buildKmz")
- public void buildKmz(@RequestBody UavRouteReq uavRouteReq){
- routeService.buildKmz(uavRouteReq);
+ @PreAuthorize("@ss.hasPermi('route:kmz:buildKmz')")
+ @PostMapping("/buildKmz/{fileName}")
+ public AjaxResult buildKmz(@RequestBody UavRouteReq uavRouteReq,@PathVariable("fileName") String fileName){
+ return success(routeService.buildKmz(uavRouteReq,fileName));
+ }
+
+ /**
+ * 解析kmz文件
+ */
+ @ApiOperation("解析kmz文件")
+ @PreAuthorize("@ss.hasPermi('route:kmz:parseKmz')")
+ @PostMapping("/parseKmz")
+ public AjaxResult parseKmz(@RequestParam("fileUrl") String fileUrl) throws IOException {
+ return success(routeService.parseKmz(fileUrl));
}
}
diff --git a/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java b/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java
index c09d70e..c1abb0a 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/storage/FileUploadController.java
@@ -15,7 +15,7 @@
/**
* 文件上传管理接口
*
- * @author ruoyi
+ * @author ard
*/
@Api(tags = "文件上传管理接口")
@RestController
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
index 1e23abc..e789efc 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysConfigController.java
@@ -25,7 +25,7 @@
/**
* 参数配置 信息操作处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/config")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
index 8414417..0b14250 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDeptController.java
@@ -25,7 +25,7 @@
/**
* 部门信息
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/dept")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
index 3f20dd7..76c1cc1 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictDataController.java
@@ -28,7 +28,7 @@
/**
* 数据字典信息
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/dict/data")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
index 548d2bb..19d7b02 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysDictTypeController.java
@@ -25,7 +25,7 @@
/**
* 数据字典信息
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/dict/type")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysIndexController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysIndexController.java
index f829cd4..761b6db 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysIndexController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysIndexController.java
@@ -9,14 +9,14 @@
/**
* 首页
*
- * @author ruoyi
+ * @author ard
*/
@RestController
public class SysIndexController
{
/** 系统基础配置 */
@Autowired
- private UavConfig ruoyiConfig;
+ private UavConfig ardConfig;
/**
* 访问首页，提示语
@@ -24,6 +24,6 @@
@RequestMapping("/")
public String index()
{
- return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+ return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ardConfig.getName(), ardConfig.getVersion());
}
}
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
index 9ba7d34..72f9738 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysLoginController.java
@@ -27,7 +27,7 @@
/**
* 登录验证
*
- * @author ruoyi
+ * @author ard
*/
@Api(tags = "登录接口")
@ApiSort(1)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
index d785d89..fa80202 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysMenuController.java
@@ -24,7 +24,7 @@
/**
* 菜单信息
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/menu")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
index 13ea9b7..c01cb33 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysNoticeController.java
@@ -23,7 +23,7 @@
/**
* 公告 信息操作处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/notice")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
index 5202be8..3654eba 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysPostController.java
@@ -25,7 +25,7 @@
/**
* 岗位信息操作处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/post")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
index 572c205..3087ac0 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysProfileController.java
@@ -26,7 +26,7 @@
/**
* 个人信息 业务处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/user/profile")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
index 95cb7f0..0d9e5c2 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysRegisterController.java
@@ -14,7 +14,7 @@
/**
* 注册验证
*
- * @author ruoyi
+ * @author ard
*/
@RestController
public class SysRegisterController extends BaseController
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
index 749453c..6158d8c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysRoleController.java
@@ -34,7 +34,7 @@
/**
* 角色信息
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/system/role")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java b/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
index 0b9de9b..0b6ba12 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/system/SysUserController.java
@@ -38,7 +38,7 @@
/**
* 用户信息
*
- * @author ruoyi
+ * @author ard
*/
@Api(tags = "用户信息")
@RestController
diff --git a/ard-admin/src/main/java/com/ard/web/controller/tool/TestController.java b/ard-admin/src/main/java/com/ard/web/controller/tool/TestController.java
index 5e4f350..3b6cb9d 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/tool/TestController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/tool/TestController.java
@@ -26,7 +26,7 @@
/**
* swagger 用户测试方法
*
- * @author ruoyi
+ * @author ard
*/
@ApiIgnore
@Api(tags = "用户信息管理")
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java
index aad82b9..18e83e8 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavGimbalController.java
@@ -4,12 +4,16 @@
import com.ard.work.domain.dto.control.AbsAngleControlDTO;
import com.ard.work.domain.dto.control.AngleControlDTO;
import com.ard.work.domain.dto.control.SpeedControlDTO;
+import com.ard.work.service.IGimbalSpeedService;
import com.ard.work.service.ITyService;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -26,9 +30,12 @@
@Resource
private ITyService tyService;
+ @Resource
+ private IGimbalSpeedService gimbalSpeedService;
- @ApiOperation(value = "云台转动(基于角度)", notes = "actionCode值：0-回中,1-上,2-右上,3-右,4-右下,5-下,6-左下,7-左,8-左上,254-停止 \r\n rotationAngle值：取值范围:0~255【云台实际转动角度= 转动角度/100+2.5 单位：度】")
+ @ApiOperation(value = "云台转动(基于角度)", notes = "actionCode值：0-回中,1-上,2-右上,3-右,4-右下,5-下,6-左下,7-左,8-左上,254-停止 \r\n " +
+ "rotationAngle值：取值范围:0~255【云台实际转动角度= 转动角度/100+2.5 单位：度】")
@ApiOperationSupport(order = 1)
@PostMapping("/angleControl")
public AjaxResult angleControl(@RequestBody AngleControlDTO angleControlDto) {
@@ -52,4 +59,15 @@
return AjaxResult.success();
}
+ @ApiOperation(value = "云台速度控制(开始/停止统一接口)")
+ @ApiOperationSupport(order = 4)
+ @PostMapping("/speedControlSimple")
+ public AjaxResult speedControlSimple(@RequestBody @Validated SpeedControlDTO speedControlDto) {
+ if (speedControlDto.isStart()) {
+ gimbalSpeedService.startControl(speedControlDto);
+ } else {
+ gimbalSpeedService.stopControl(speedControlDto.getBoxSn());
+ }
+ return AjaxResult.success();
+ }
}
\ No newline at end of file
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavRealDataController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavRealDataController.java
index e918481..21d43a7 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavRealDataController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavRealDataController.java
@@ -29,7 +29,6 @@
@GetMapping("/getUavState")
public AjaxResult getUavState(String boxSn) {
UavState uavState = tyService.getUavState(boxSn);
- uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
return AjaxResult.success(uavState);
}
diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/wayline/UavWaylineController.java b/ard-admin/src/main/java/com/ard/web/controller/work/wayline/UavWaylineController.java
index 3d024bd..bb00f8b 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/wayline/UavWaylineController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/wayline/UavWaylineController.java
@@ -20,7 +20,7 @@
/**
* 航线Controller
*
- * @author ruoyi
+ * @author ard
* @date 2025-06-27
*/
@Api(tags = "无人机航线管理接口")
diff --git a/ard-admin/src/main/java/com/ard/web/core/config/SwaggerConfig.java b/ard-admin/src/main/java/com/ard/web/core/config/SwaggerConfig.java
index 8ff77a1..dfeb8d7 100644
--- a/ard-admin/src/main/java/com/ard/web/core/config/SwaggerConfig.java
+++ b/ard-admin/src/main/java/com/ard/web/core/config/SwaggerConfig.java
@@ -24,7 +24,7 @@
/**
* Swagger2的接口配置
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class SwaggerConfig {
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index 5fc752a..ef2d25d 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -6,7 +6,7 @@
# token配置
token:
# 是否允许账户多终端同时登录（true允许 false不允许）
- soloLogin: true
+ soloLogin: false
# 日志配置
logging:
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index cd292d3..7e78448 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -44,7 +44,7 @@
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
- expireTime: 720
+ expireTime: 10
# 是否允许账户多终端同时登录（true允许 false不允许）
soloLogin: true
diff --git a/ard-common/src/main/java/com/ard/common/annotation/Anonymous.java b/ard-common/src/main/java/com/ard/common/annotation/Anonymous.java
index 5096686..d8e1c3d 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/Anonymous.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/Anonymous.java
@@ -9,7 +9,7 @@
/**
* 匿名访问不鉴权注解
*
- * @author ruoyi
+ * @author ard
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ard-common/src/main/java/com/ard/common/annotation/DataScope.java b/ard-common/src/main/java/com/ard/common/annotation/DataScope.java
index 7202a65..afc3c43 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/DataScope.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/DataScope.java
@@ -9,7 +9,7 @@
/**
* 数据权限过滤注解
*
- * @author ruoyi
+ * @author ard
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ard-common/src/main/java/com/ard/common/annotation/DataSource.java b/ard-common/src/main/java/com/ard/common/annotation/DataSource.java
index 42931e5..a86da1f 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/DataSource.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/DataSource.java
@@ -13,7 +13,7 @@
*
* 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
*
- * @author ruoyi
+ * @author ard
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ard-common/src/main/java/com/ard/common/annotation/Excel.java b/ard-common/src/main/java/com/ard/common/annotation/Excel.java
index 5ae6f5b..8c79fbe 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/Excel.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/Excel.java
@@ -12,7 +12,7 @@
/**
* 自定义导出Excel数据注解
*
- * @author ruoyi
+ * @author ard
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
diff --git a/ard-common/src/main/java/com/ard/common/annotation/Excels.java b/ard-common/src/main/java/com/ard/common/annotation/Excels.java
index b7b6078..ecb0906 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/Excels.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/Excels.java
@@ -8,7 +8,7 @@
/**
* Excel注解集
*
- * @author ruoyi
+ * @author ard
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ard-common/src/main/java/com/ard/common/annotation/Log.java b/ard-common/src/main/java/com/ard/common/annotation/Log.java
index c4cc8e7..5491323 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/Log.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/Log.java
@@ -11,7 +11,7 @@
/**
* 自定义操作日志记录注解
*
- * @author ruoyi
+ * @author ard
*
*/
@Target({ ElementType.PARAMETER, ElementType.METHOD })
diff --git a/ard-common/src/main/java/com/ard/common/annotation/RateLimiter.java b/ard-common/src/main/java/com/ard/common/annotation/RateLimiter.java
index 029688f..bce24e5 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/RateLimiter.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/RateLimiter.java
@@ -11,7 +11,7 @@
/**
* 限流注解
*
- * @author ruoyi
+ * @author ard
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ard-common/src/main/java/com/ard/common/annotation/RepeatSubmit.java b/ard-common/src/main/java/com/ard/common/annotation/RepeatSubmit.java
index 2cd2e1b..a3b3435 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/RepeatSubmit.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/RepeatSubmit.java
@@ -10,7 +10,7 @@
/**
* 自定义注解防止表单重复提交
*
- * @author ruoyi
+ * @author ard
*
*/
@Inherited
diff --git a/ard-common/src/main/java/com/ard/common/annotation/Sensitive.java b/ard-common/src/main/java/com/ard/common/annotation/Sensitive.java
index 4e73318..c915996 100644
--- a/ard-common/src/main/java/com/ard/common/annotation/Sensitive.java
+++ b/ard-common/src/main/java/com/ard/common/annotation/Sensitive.java
@@ -12,7 +12,7 @@
/**
* 数据脱敏注解
*
- * @author ruoyi
+ * @author ard
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
diff --git a/ard-common/src/main/java/com/ard/common/config/UavConfig.java b/ard-common/src/main/java/com/ard/common/config/UavConfig.java
index 53b4097..8add99b 100644
--- a/ard-common/src/main/java/com/ard/common/config/UavConfig.java
+++ b/ard-common/src/main/java/com/ard/common/config/UavConfig.java
@@ -6,7 +6,7 @@
/**
* 读取项目相关配置
*
- * @author ruoyi
+ * @author ard
*/
@Component
@ConfigurationProperties(prefix = "uav")
diff --git a/ard-common/src/main/java/com/ard/common/config/serializer/SensitiveJsonSerializer.java b/ard-common/src/main/java/com/ard/common/config/serializer/SensitiveJsonSerializer.java
index aa4e322..79aff49 100644
--- a/ard-common/src/main/java/com/ard/common/config/serializer/SensitiveJsonSerializer.java
+++ b/ard-common/src/main/java/com/ard/common/config/serializer/SensitiveJsonSerializer.java
@@ -16,7 +16,7 @@
/**
* 数据脱敏序列化过滤
*
- * @author ruoyi
+ * @author ard
*/
public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer
{
diff --git a/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java b/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java
index 7fe59b7..227b406 100644
--- a/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/CacheConstants.java
@@ -3,7 +3,7 @@
/**
* 缓存的key 常量
*
- * @author ruoyi
+ * @author ard
*/
public class CacheConstants
{
@@ -51,4 +51,9 @@
* 所有相机 redis key
*/
public static final String CAMERA_LIST_KEY = "camera_list:";
+
+ /**
+ * 在线无人机 redis key
+ */
+ public static final String UAV_ONLINE_KEY = "uav_online:";
}
diff --git a/ard-common/src/main/java/com/ard/common/constant/CameraConstants.java b/ard-common/src/main/java/com/ard/common/constant/CameraConstants.java
index c494b3c..245abc4 100644
--- a/ard-common/src/main/java/com/ard/common/constant/CameraConstants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/CameraConstants.java
@@ -3,7 +3,7 @@
/**
* 相机常量信息
*
- * @author ruoyi
+ * @author ard
*/
public class CameraConstants
{
diff --git a/ard-common/src/main/java/com/ard/common/constant/Constants.java b/ard-common/src/main/java/com/ard/common/constant/Constants.java
index 2addc7a..152af4e 100644
--- a/ard-common/src/main/java/com/ard/common/constant/Constants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/Constants.java
@@ -6,7 +6,7 @@
/**
* 通用常量信息
*
- * @author ruoyi
+ * @author ard
*/
public class Constants
{
diff --git a/ard-common/src/main/java/com/ard/common/constant/DeviceConstants.java b/ard-common/src/main/java/com/ard/common/constant/DeviceConstants.java
index d173bb8..b906f9f 100644
--- a/ard-common/src/main/java/com/ard/common/constant/DeviceConstants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/DeviceConstants.java
@@ -3,7 +3,7 @@
/**
* 相机常量信息
*
- * @author ruoyi
+ * @author ard
*/
public class DeviceConstants
{
diff --git a/ard-common/src/main/java/com/ard/common/constant/GenConstants.java b/ard-common/src/main/java/com/ard/common/constant/GenConstants.java
index 96702b2..841528f 100644
--- a/ard-common/src/main/java/com/ard/common/constant/GenConstants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/GenConstants.java
@@ -3,7 +3,7 @@
/**
* 代码生成通用常量
*
- * @author ruoyi
+ * @author ard
*/
public class GenConstants
{
diff --git a/ard-common/src/main/java/com/ard/common/constant/HttpStatus.java b/ard-common/src/main/java/com/ard/common/constant/HttpStatus.java
index b15225f..d08f8f9 100644
--- a/ard-common/src/main/java/com/ard/common/constant/HttpStatus.java
+++ b/ard-common/src/main/java/com/ard/common/constant/HttpStatus.java
@@ -3,7 +3,7 @@
/**
* 返回状态码
*
- * @author ruoyi
+ * @author ard
*/
public class HttpStatus
{
diff --git a/ard-common/src/main/java/com/ard/common/constant/ScheduleConstants.java b/ard-common/src/main/java/com/ard/common/constant/ScheduleConstants.java
index 6251446..9a7df99 100644
--- a/ard-common/src/main/java/com/ard/common/constant/ScheduleConstants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/ScheduleConstants.java
@@ -3,7 +3,7 @@
/**
* 任务调度通用常量
*
- * @author ruoyi
+ * @author ard
*/
public class ScheduleConstants
{
diff --git a/ard-common/src/main/java/com/ard/common/constant/UserConstants.java b/ard-common/src/main/java/com/ard/common/constant/UserConstants.java
index 5a9c5df..f093430 100644
--- a/ard-common/src/main/java/com/ard/common/constant/UserConstants.java
+++ b/ard-common/src/main/java/com/ard/common/constant/UserConstants.java
@@ -3,7 +3,7 @@
/**
* 用户常量信息
*
- * @author ruoyi
+ * @author ard
*/
public class UserConstants
{
diff --git a/ard-common/src/main/java/com/ard/common/core/controller/BaseController.java b/ard-common/src/main/java/com/ard/common/core/controller/BaseController.java
index 0847863..3fd648a 100644
--- a/ard-common/src/main/java/com/ard/common/core/controller/BaseController.java
+++ b/ard-common/src/main/java/com/ard/common/core/controller/BaseController.java
@@ -24,7 +24,7 @@
/**
* web层通用数据处理
*
- * @author ruoyi
+ * @author ard
*/
public class BaseController
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/AjaxResult.java b/ard-common/src/main/java/com/ard/common/core/domain/AjaxResult.java
index 50d8572..b99a88f 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/AjaxResult.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/AjaxResult.java
@@ -8,7 +8,7 @@
/**
* 操作消息提醒
*
- * @author ruoyi
+ * @author ard
*/
public class AjaxResult extends HashMap<String, Object>
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/BaseEntity.java b/ard-common/src/main/java/com/ard/common/core/domain/BaseEntity.java
index 503d7a2..b67de3b 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/BaseEntity.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/BaseEntity.java
@@ -11,7 +11,7 @@
/**
* Entity基类
*
- * @author ruoyi
+ * @author ard
*/
public class BaseEntity implements Serializable
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/R.java b/ard-common/src/main/java/com/ard/common/core/domain/R.java
index 7868629..7466d44 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/R.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/R.java
@@ -6,7 +6,7 @@
/**
* 响应信息主体
*
- * @author ruoyi
+ * @author ard
*/
public class R<T> implements Serializable
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/TreeEntity.java b/ard-common/src/main/java/com/ard/common/core/domain/TreeEntity.java
index 82ec446..633d173 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/TreeEntity.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/TreeEntity.java
@@ -6,7 +6,7 @@
/**
* Tree基类
*
- * @author ruoyi
+ * @author ard
*/
public class TreeEntity extends BaseEntity
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/TreeSelect.java b/ard-common/src/main/java/com/ard/common/core/domain/TreeSelect.java
index 95d8a78..231a695 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/TreeSelect.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/TreeSelect.java
@@ -10,7 +10,7 @@
/**
* Treeselect树结构实体类
*
- * @author ruoyi
+ * @author ard
*/
public class TreeSelect implements Serializable
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDept.java b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDept.java
index cf2f1ef..c3c26ca 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDept.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDept.java
@@ -13,7 +13,7 @@
/**
* 部门表 sys_dept
*
- * @author ruoyi
+ * @author ard
*/
public class SysDept extends BaseEntity
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictData.java b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictData.java
index 1ff839a..e157deb 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictData.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictData.java
@@ -12,7 +12,7 @@
/**
* 字典数据表 sys_dict_data
*
- * @author ruoyi
+ * @author ard
*/
public class SysDictData extends BaseEntity
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictType.java b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictType.java
index efeb30d..7b92e87 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictType.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysDictType.java
@@ -12,7 +12,7 @@
/**
* 字典类型表 sys_dict_type
*
- * @author ruoyi
+ * @author ard
*/
public class SysDictType extends BaseEntity
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysMenu.java b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysMenu.java
index 3980adf..1cd86c8 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysMenu.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysMenu.java
@@ -12,7 +12,7 @@
/**
* 菜单权限表 sys_menu
*
- * @author ruoyi
+ * @author ard
*/
public class SysMenu extends BaseEntity
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysRole.java b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysRole.java
index c1e325d..d0c2eeb 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysRole.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysRole.java
@@ -17,7 +17,7 @@
/**
* 角色表 sys_role
*
- * @author ruoyi
+ * @author ard
*/
public class SysRole extends BaseEntity
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java
index bc3f7ce..7366e6a 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java
@@ -17,7 +17,7 @@
/**
* 用户对象 sys_user
*
- * @author ruoyi
+ * @author ard
*/
public class SysUser extends BaseEntity
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/model/LoginBody.java b/ard-common/src/main/java/com/ard/common/core/domain/model/LoginBody.java
index 33f63c9..280d473 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/model/LoginBody.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/model/LoginBody.java
@@ -3,7 +3,7 @@
/**
* 用户登录对象
*
- * @author ruoyi
+ * @author ard
*/
public class LoginBody
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/model/LoginUser.java b/ard-common/src/main/java/com/ard/common/core/domain/model/LoginUser.java
index 981e07e..5b0181a 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/model/LoginUser.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/model/LoginUser.java
@@ -10,7 +10,7 @@
/**
* 登录用户身份权限
*
- * @author ruoyi
+ * @author ard
*/
public class LoginUser implements UserDetails
{
diff --git a/ard-common/src/main/java/com/ard/common/core/domain/model/RegisterBody.java b/ard-common/src/main/java/com/ard/common/core/domain/model/RegisterBody.java
index 82409ea..a9c244f 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/model/RegisterBody.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/model/RegisterBody.java
@@ -3,7 +3,7 @@
/**
* 用户注册对象
*
- * @author ruoyi
+ * @author ard
*/
public class RegisterBody extends LoginBody
{
diff --git a/ard-common/src/main/java/com/ard/common/core/page/PageDomain.java b/ard-common/src/main/java/com/ard/common/core/page/PageDomain.java
index b90e382..9ae3814 100644
--- a/ard-common/src/main/java/com/ard/common/core/page/PageDomain.java
+++ b/ard-common/src/main/java/com/ard/common/core/page/PageDomain.java
@@ -5,7 +5,7 @@
/**
* 分页数据
*
- * @author ruoyi
+ * @author ard
*/
public class PageDomain
{
diff --git a/ard-common/src/main/java/com/ard/common/core/page/TableDataInfo.java b/ard-common/src/main/java/com/ard/common/core/page/TableDataInfo.java
index 2aae8c4..fe653e9 100644
--- a/ard-common/src/main/java/com/ard/common/core/page/TableDataInfo.java
+++ b/ard-common/src/main/java/com/ard/common/core/page/TableDataInfo.java
@@ -6,7 +6,7 @@
/**
* 表格分页数据对象
*
- * @author ruoyi
+ * @author ard
*/
public class TableDataInfo implements Serializable
{
diff --git a/ard-common/src/main/java/com/ard/common/core/page/TableSupport.java b/ard-common/src/main/java/com/ard/common/core/page/TableSupport.java
index 03317dd..fd361e9 100644
--- a/ard-common/src/main/java/com/ard/common/core/page/TableSupport.java
+++ b/ard-common/src/main/java/com/ard/common/core/page/TableSupport.java
@@ -6,7 +6,7 @@
/**
* 表格数据处理
*
- * @author ruoyi
+ * @author ard
*/
public class TableSupport
{
diff --git a/ard-common/src/main/java/com/ard/common/core/redis/RedisCache.java b/ard-common/src/main/java/com/ard/common/core/redis/RedisCache.java
index 62fd1e2..ef44326 100644
--- a/ard-common/src/main/java/com/ard/common/core/redis/RedisCache.java
+++ b/ard-common/src/main/java/com/ard/common/core/redis/RedisCache.java
@@ -16,7 +16,7 @@
/**
* spring redis 工具类
*
- * @author ruoyi
+ * @author ard
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component
diff --git a/ard-common/src/main/java/com/ard/common/core/text/CharsetKit.java b/ard-common/src/main/java/com/ard/common/core/text/CharsetKit.java
index 8bb707a..536acf1 100644
--- a/ard-common/src/main/java/com/ard/common/core/text/CharsetKit.java
+++ b/ard-common/src/main/java/com/ard/common/core/text/CharsetKit.java
@@ -7,7 +7,7 @@
/**
* 字符集工具类
*
- * @author ruoyi
+ * @author ard
*/
public class CharsetKit
{
diff --git a/ard-common/src/main/java/com/ard/common/core/text/Convert.java b/ard-common/src/main/java/com/ard/common/core/text/Convert.java
index 95009e3..e7f3463 100644
--- a/ard-common/src/main/java/com/ard/common/core/text/Convert.java
+++ b/ard-common/src/main/java/com/ard/common/core/text/Convert.java
@@ -13,7 +13,7 @@
/**
* 类型转换器
*
- * @author ruoyi
+ * @author ard
*/
public class Convert
{
diff --git a/ard-common/src/main/java/com/ard/common/core/text/StrFormatter.java b/ard-common/src/main/java/com/ard/common/core/text/StrFormatter.java
index 18b30b3..cead7f7 100644
--- a/ard-common/src/main/java/com/ard/common/core/text/StrFormatter.java
+++ b/ard-common/src/main/java/com/ard/common/core/text/StrFormatter.java
@@ -5,7 +5,7 @@
/**
* 字符串格式化
*
- * @author ruoyi
+ * @author ard
*/
public class StrFormatter
{
diff --git a/ard-common/src/main/java/com/ard/common/enums/BusinessStatus.java b/ard-common/src/main/java/com/ard/common/enums/BusinessStatus.java
index 4cbf79e..7ff9b1b 100644
--- a/ard-common/src/main/java/com/ard/common/enums/BusinessStatus.java
+++ b/ard-common/src/main/java/com/ard/common/enums/BusinessStatus.java
@@ -3,7 +3,7 @@
/**
* 操作状态
*
- * @author ruoyi
+ * @author ard
*
*/
public enum BusinessStatus
diff --git a/ard-common/src/main/java/com/ard/common/enums/BusinessType.java b/ard-common/src/main/java/com/ard/common/enums/BusinessType.java
index a54cd21..1b17f5e 100644
--- a/ard-common/src/main/java/com/ard/common/enums/BusinessType.java
+++ b/ard-common/src/main/java/com/ard/common/enums/BusinessType.java
@@ -3,7 +3,7 @@
/**
* 业务操作类型
*
- * @author ruoyi
+ * @author ard
*/
public enum BusinessType
{
diff --git a/ard-common/src/main/java/com/ard/common/enums/DataSourceType.java b/ard-common/src/main/java/com/ard/common/enums/DataSourceType.java
index f1192ed..4ac3ddf 100644
--- a/ard-common/src/main/java/com/ard/common/enums/DataSourceType.java
+++ b/ard-common/src/main/java/com/ard/common/enums/DataSourceType.java
@@ -3,7 +3,7 @@
/**
* 数据源
*
- * @author ruoyi
+ * @author ard
*/
public enum DataSourceType
{
diff --git a/ard-common/src/main/java/com/ard/common/enums/DesensitizedType.java b/ard-common/src/main/java/com/ard/common/enums/DesensitizedType.java
index 88afa07..5ad8386 100644
--- a/ard-common/src/main/java/com/ard/common/enums/DesensitizedType.java
+++ b/ard-common/src/main/java/com/ard/common/enums/DesensitizedType.java
@@ -6,7 +6,7 @@
/**
* 脱敏类型
*
- * @author ruoyi
+ * @author ard
*/
public enum DesensitizedType
{
diff --git a/ard-common/src/main/java/com/ard/common/enums/HttpMethod.java b/ard-common/src/main/java/com/ard/common/enums/HttpMethod.java
index 0639c7e..b07478c 100644
--- a/ard-common/src/main/java/com/ard/common/enums/HttpMethod.java
+++ b/ard-common/src/main/java/com/ard/common/enums/HttpMethod.java
@@ -7,7 +7,7 @@
/**
* 请求方式
*
- * @author ruoyi
+ * @author ard
*/
public enum HttpMethod
{
diff --git a/ard-common/src/main/java/com/ard/common/enums/LimitType.java b/ard-common/src/main/java/com/ard/common/enums/LimitType.java
index 22d7c6e..5f88560 100644
--- a/ard-common/src/main/java/com/ard/common/enums/LimitType.java
+++ b/ard-common/src/main/java/com/ard/common/enums/LimitType.java
@@ -3,7 +3,7 @@
/**
* 限流类型
*
- * @author ruoyi
+ * @author ard
*/
public enum LimitType
diff --git a/ard-common/src/main/java/com/ard/common/enums/OperatorType.java b/ard-common/src/main/java/com/ard/common/enums/OperatorType.java
index ea50997..ee0ae93 100644
--- a/ard-common/src/main/java/com/ard/common/enums/OperatorType.java
+++ b/ard-common/src/main/java/com/ard/common/enums/OperatorType.java
@@ -3,7 +3,7 @@
/**
* 操作人类别
*
- * @author ruoyi
+ * @author ard
*/
public enum OperatorType
{
diff --git a/ard-common/src/main/java/com/ard/common/enums/UserStatus.java b/ard-common/src/main/java/com/ard/common/enums/UserStatus.java
index a71b3cf..c0d773e 100644
--- a/ard-common/src/main/java/com/ard/common/enums/UserStatus.java
+++ b/ard-common/src/main/java/com/ard/common/enums/UserStatus.java
@@ -3,7 +3,7 @@
/**
* 用户状态
*
- * @author ruoyi
+ * @author ard
*/
public enum UserStatus
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/ControlException.java b/ard-common/src/main/java/com/ard/common/exception/ControlException.java
index 8a2bf34..0cc71ea 100644
--- a/ard-common/src/main/java/com/ard/common/exception/ControlException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/ControlException.java
@@ -3,7 +3,7 @@
/**
* 无人机控制异常
*
- * @author ruoyi
+ * @author ard
*/
public class ControlException extends RuntimeException {
public ControlException(String message) {
diff --git a/ard-common/src/main/java/com/ard/common/exception/DemoModeException.java b/ard-common/src/main/java/com/ard/common/exception/DemoModeException.java
index 4b8ae8f..f5d7f64 100644
--- a/ard-common/src/main/java/com/ard/common/exception/DemoModeException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/DemoModeException.java
@@ -3,7 +3,7 @@
/**
* 演示模式异常
*
- * @author ruoyi
+ * @author ard
*/
public class DemoModeException extends RuntimeException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/GlobalException.java b/ard-common/src/main/java/com/ard/common/exception/GlobalException.java
index 87dea0b..f4f3077 100644
--- a/ard-common/src/main/java/com/ard/common/exception/GlobalException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/GlobalException.java
@@ -3,7 +3,7 @@
/**
* 全局异常
*
- * @author ruoyi
+ * @author ard
*/
public class GlobalException extends RuntimeException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/ServiceException.java b/ard-common/src/main/java/com/ard/common/exception/ServiceException.java
index 7bbcf10..f1de428 100644
--- a/ard-common/src/main/java/com/ard/common/exception/ServiceException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/ServiceException.java
@@ -3,7 +3,7 @@
/**
* 业务异常
*
- * @author ruoyi
+ * @author ard
*/
public final class ServiceException extends RuntimeException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/UtilException.java b/ard-common/src/main/java/com/ard/common/exception/UtilException.java
index 2e066cf..4c8fcc0 100644
--- a/ard-common/src/main/java/com/ard/common/exception/UtilException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/UtilException.java
@@ -3,7 +3,7 @@
/**
* 工具类异常
*
- * @author ruoyi
+ * @author ard
*/
public class UtilException extends RuntimeException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/base/BaseException.java b/ard-common/src/main/java/com/ard/common/exception/base/BaseException.java
index c666a9c..bd3b08f 100644
--- a/ard-common/src/main/java/com/ard/common/exception/base/BaseException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/base/BaseException.java
@@ -6,7 +6,7 @@
/**
* 基础异常
*
- * @author ruoyi
+ * @author ard
*/
public class BaseException extends RuntimeException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/file/FileException.java b/ard-common/src/main/java/com/ard/common/exception/file/FileException.java
index 275a26b..02f678e 100644
--- a/ard-common/src/main/java/com/ard/common/exception/file/FileException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/file/FileException.java
@@ -5,7 +5,7 @@
/**
* 文件信息异常类
*
- * @author ruoyi
+ * @author ard
*/
public class FileException extends BaseException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/file/FileNameLengthLimitExceededException.java b/ard-common/src/main/java/com/ard/common/exception/file/FileNameLengthLimitExceededException.java
index f93e78d..0c85d86 100644
--- a/ard-common/src/main/java/com/ard/common/exception/file/FileNameLengthLimitExceededException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/file/FileNameLengthLimitExceededException.java
@@ -3,7 +3,7 @@
/**
* 文件名称超长限制异常类
*
- * @author ruoyi
+ * @author ard
*/
public class FileNameLengthLimitExceededException extends FileException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/file/FileSizeLimitExceededException.java b/ard-common/src/main/java/com/ard/common/exception/file/FileSizeLimitExceededException.java
index 5fe04c3..659bf74 100644
--- a/ard-common/src/main/java/com/ard/common/exception/file/FileSizeLimitExceededException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/file/FileSizeLimitExceededException.java
@@ -3,7 +3,7 @@
/**
* 文件名大小限制异常类
*
- * @author ruoyi
+ * @author ard
*/
public class FileSizeLimitExceededException extends FileException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/file/FileUploadException.java b/ard-common/src/main/java/com/ard/common/exception/file/FileUploadException.java
index c05dc0f..18d726c 100644
--- a/ard-common/src/main/java/com/ard/common/exception/file/FileUploadException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/file/FileUploadException.java
@@ -6,7 +6,7 @@
/**
* 文件上传异常类
*
- * @author ruoyi
+ * @author ard
*/
public class FileUploadException extends Exception
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/file/InvalidExtensionException.java b/ard-common/src/main/java/com/ard/common/exception/file/InvalidExtensionException.java
index e3ccc3b..c6aeab5 100644
--- a/ard-common/src/main/java/com/ard/common/exception/file/InvalidExtensionException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/file/InvalidExtensionException.java
@@ -5,7 +5,7 @@
/**
* 文件上传 误异常类
*
- * @author ruoyi
+ * @author ard
*/
public class InvalidExtensionException extends FileUploadException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/job/TaskException.java b/ard-common/src/main/java/com/ard/common/exception/job/TaskException.java
index bee4823..7784b15 100644
--- a/ard-common/src/main/java/com/ard/common/exception/job/TaskException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/job/TaskException.java
@@ -3,7 +3,7 @@
/**
* 计划策略异常
*
- * @author ruoyi
+ * @author ard
*/
public class TaskException extends Exception
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/user/BlackListException.java b/ard-common/src/main/java/com/ard/common/exception/user/BlackListException.java
index 85eb0f3..1ae447b 100644
--- a/ard-common/src/main/java/com/ard/common/exception/user/BlackListException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/user/BlackListException.java
@@ -3,7 +3,7 @@
/**
* 黑名单IP异常类
*
- * @author ruoyi
+ * @author ard
*/
public class BlackListException extends UserException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/user/CaptchaException.java b/ard-common/src/main/java/com/ard/common/exception/user/CaptchaException.java
index 4392f26..eecf71b 100644
--- a/ard-common/src/main/java/com/ard/common/exception/user/CaptchaException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/user/CaptchaException.java
@@ -3,7 +3,7 @@
/**
* 验证码错误异常类
*
- * @author ruoyi
+ * @author ard
*/
public class CaptchaException extends UserException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/user/CaptchaExpireException.java b/ard-common/src/main/java/com/ard/common/exception/user/CaptchaExpireException.java
index 6cd3b24..96bb6df 100644
--- a/ard-common/src/main/java/com/ard/common/exception/user/CaptchaExpireException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/user/CaptchaExpireException.java
@@ -3,7 +3,7 @@
/**
* 验证码失效异常类
*
- * @author ruoyi
+ * @author ard
*/
public class CaptchaExpireException extends UserException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/user/UserException.java b/ard-common/src/main/java/com/ard/common/exception/user/UserException.java
index 2de7736..764c98e 100644
--- a/ard-common/src/main/java/com/ard/common/exception/user/UserException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/user/UserException.java
@@ -5,7 +5,7 @@
/**
* 用户信息异常类
*
- * @author ruoyi
+ * @author ard
*/
public class UserException extends BaseException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/user/UserNotExistsException.java b/ard-common/src/main/java/com/ard/common/exception/user/UserNotExistsException.java
index 0f4d21d..99067c7 100644
--- a/ard-common/src/main/java/com/ard/common/exception/user/UserNotExistsException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/user/UserNotExistsException.java
@@ -3,7 +3,7 @@
/**
* 用户不存在异常类
*
- * @author ruoyi
+ * @author ard
*/
public class UserNotExistsException extends UserException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordNotMatchException.java b/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordNotMatchException.java
index d3f8748..b9c26d2 100644
--- a/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordNotMatchException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordNotMatchException.java
@@ -3,7 +3,7 @@
/**
* 用户密码不正确或不符合规范异常类
*
- * @author ruoyi
+ * @author ard
*/
public class UserPasswordNotMatchException extends UserException
{
diff --git a/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordRetryLimitExceedException.java b/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordRetryLimitExceedException.java
index 19684e6..1e45395 100644
--- a/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordRetryLimitExceedException.java
+++ b/ard-common/src/main/java/com/ard/common/exception/user/UserPasswordRetryLimitExceedException.java
@@ -3,7 +3,7 @@
/**
* 用户错误最大次数异常类
*
- * @author ruoyi
+ * @author ard
*/
public class UserPasswordRetryLimitExceedException extends UserException
{
diff --git a/ard-common/src/main/java/com/ard/common/filter/PropertyPreExcludeFilter.java b/ard-common/src/main/java/com/ard/common/filter/PropertyPreExcludeFilter.java
index 0fdd996..7447189 100644
--- a/ard-common/src/main/java/com/ard/common/filter/PropertyPreExcludeFilter.java
+++ b/ard-common/src/main/java/com/ard/common/filter/PropertyPreExcludeFilter.java
@@ -5,7 +5,7 @@
/**
* 排除JSON敏感属性
*
- * @author ruoyi
+ * @author ard
*/
public class PropertyPreExcludeFilter extends SimplePropertyPreFilter
{
diff --git a/ard-common/src/main/java/com/ard/common/filter/RepeatableFilter.java b/ard-common/src/main/java/com/ard/common/filter/RepeatableFilter.java
index 286fd44..ef6e650 100644
--- a/ard-common/src/main/java/com/ard/common/filter/RepeatableFilter.java
+++ b/ard-common/src/main/java/com/ard/common/filter/RepeatableFilter.java
@@ -14,7 +14,7 @@
/**
* Repeatable 过滤器
*
- * @author ruoyi
+ * @author ard
*/
public class RepeatableFilter implements Filter
{
diff --git a/ard-common/src/main/java/com/ard/common/filter/RepeatedlyRequestWrapper.java b/ard-common/src/main/java/com/ard/common/filter/RepeatedlyRequestWrapper.java
index b382dd3..5fe3056 100644
--- a/ard-common/src/main/java/com/ard/common/filter/RepeatedlyRequestWrapper.java
+++ b/ard-common/src/main/java/com/ard/common/filter/RepeatedlyRequestWrapper.java
@@ -15,7 +15,7 @@
/**
* 构建可重复读取inputStream的request
*
- * @author ruoyi
+ * @author ard
*/
public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
{
diff --git a/ard-common/src/main/java/com/ard/common/filter/XssFilter.java b/ard-common/src/main/java/com/ard/common/filter/XssFilter.java
index b2c080b..f4cf4f2 100644
--- a/ard-common/src/main/java/com/ard/common/filter/XssFilter.java
+++ b/ard-common/src/main/java/com/ard/common/filter/XssFilter.java
@@ -17,7 +17,7 @@
/**
* 防止XSS攻击的过滤器
*
- * @author ruoyi
+ * @author ard
*/
public class XssFilter implements Filter
{
diff --git a/ard-common/src/main/java/com/ard/common/filter/XssHttpServletRequestWrapper.java b/ard-common/src/main/java/com/ard/common/filter/XssHttpServletRequestWrapper.java
index 7e8805a..567460a 100644
--- a/ard-common/src/main/java/com/ard/common/filter/XssHttpServletRequestWrapper.java
+++ b/ard-common/src/main/java/com/ard/common/filter/XssHttpServletRequestWrapper.java
@@ -15,7 +15,7 @@
/**
* XSS过滤处理
*
- * @author ruoyi
+ * @author ard
*/
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/Arith.java b/ard-common/src/main/java/com/ard/common/utils/Arith.java
index 033f23a..8d09d6a 100644
--- a/ard-common/src/main/java/com/ard/common/utils/Arith.java
+++ b/ard-common/src/main/java/com/ard/common/utils/Arith.java
@@ -6,7 +6,7 @@
/**
* 精确的浮点数运算
*
- * @author ruoyi
+ * @author ard
*/
public class Arith
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/ByteUtils.java b/ard-common/src/main/java/com/ard/common/utils/ByteUtils.java
index a744ebc..3d7da0e 100644
--- a/ard-common/src/main/java/com/ard/common/utils/ByteUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/ByteUtils.java
@@ -2,7 +2,7 @@
/**
* 字节工具类
*
- * @author ruoyi
+ * @author ard
*/
public class ByteUtils {
diff --git a/ard-common/src/main/java/com/ard/common/utils/DateUtils.java b/ard-common/src/main/java/com/ard/common/utils/DateUtils.java
index c518fc6..245bc20 100644
--- a/ard-common/src/main/java/com/ard/common/utils/DateUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/DateUtils.java
@@ -14,7 +14,7 @@
/**
* 时间工具类
*
- * @author ruoyi
+ * @author ard
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/DesensitizedUtil.java b/ard-common/src/main/java/com/ard/common/utils/DesensitizedUtil.java
index 7e63c85..6389ff3 100644
--- a/ard-common/src/main/java/com/ard/common/utils/DesensitizedUtil.java
+++ b/ard-common/src/main/java/com/ard/common/utils/DesensitizedUtil.java
@@ -3,7 +3,7 @@
/**
* 脱敏工具类
*
- * @author ruoyi
+ * @author ard
*/
public class DesensitizedUtil
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/DictUtils.java b/ard-common/src/main/java/com/ard/common/utils/DictUtils.java
index 4a84a27..c5ef3ff 100644
--- a/ard-common/src/main/java/com/ard/common/utils/DictUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/DictUtils.java
@@ -11,7 +11,7 @@
/**
* 字典工具类
*
- * @author ruoyi
+ * @author ard
*/
public class DictUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/ExceptionUtil.java b/ard-common/src/main/java/com/ard/common/utils/ExceptionUtil.java
index 21c3f69..ff30891 100644
--- a/ard-common/src/main/java/com/ard/common/utils/ExceptionUtil.java
+++ b/ard-common/src/main/java/com/ard/common/utils/ExceptionUtil.java
@@ -7,7 +7,7 @@
/**
* 错误信息处理类。
*
- * @author ruoyi
+ * @author ard
*/
public class ExceptionUtil
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/LogUtils.java b/ard-common/src/main/java/com/ard/common/utils/LogUtils.java
index baea5d2..8839d29 100644
--- a/ard-common/src/main/java/com/ard/common/utils/LogUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/LogUtils.java
@@ -3,7 +3,7 @@
/**
* 处理并记录日志文件
*
- * @author ruoyi
+ * @author ard
*/
public class LogUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/MessageUtils.java b/ard-common/src/main/java/com/ard/common/utils/MessageUtils.java
index 8f17d2e..d860ae0 100644
--- a/ard-common/src/main/java/com/ard/common/utils/MessageUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/MessageUtils.java
@@ -7,7 +7,7 @@
/**
* 获取i18n资源文件
*
- * @author ruoyi
+ * @author ard
*/
public class MessageUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/PageUtils.java b/ard-common/src/main/java/com/ard/common/utils/PageUtils.java
index b34e973..5542c83 100644
--- a/ard-common/src/main/java/com/ard/common/utils/PageUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/PageUtils.java
@@ -8,7 +8,7 @@
/**
* 分页工具类
*
- * @author ruoyi
+ * @author ard
*/
public class PageUtils extends PageHelper
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/SecurityUtils.java b/ard-common/src/main/java/com/ard/common/utils/SecurityUtils.java
index 134f65d..2105543 100644
--- a/ard-common/src/main/java/com/ard/common/utils/SecurityUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/SecurityUtils.java
@@ -16,7 +16,7 @@
/**
* 安全服务工具类
*
- * @author ruoyi
+ * @author ard
*/
public class SecurityUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/ServletUtils.java b/ard-common/src/main/java/com/ard/common/utils/ServletUtils.java
index 5c4c8c5..2a4646b 100644
--- a/ard-common/src/main/java/com/ard/common/utils/ServletUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/ServletUtils.java
@@ -20,7 +20,7 @@
/**
* 客户端工具类
*
- * @author ruoyi
+ * @author ard
*/
public class ServletUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/StringUtils.java b/ard-common/src/main/java/com/ard/common/utils/StringUtils.java
index 1ceb0e0..3756670 100644
--- a/ard-common/src/main/java/com/ard/common/utils/StringUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/StringUtils.java
@@ -13,7 +13,7 @@
/**
* 字符串工具类
*
- * @author ruoyi
+ * @author ard
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/Threads.java b/ard-common/src/main/java/com/ard/common/utils/Threads.java
index bac0728..30df15b 100644
--- a/ard-common/src/main/java/com/ard/common/utils/Threads.java
+++ b/ard-common/src/main/java/com/ard/common/utils/Threads.java
@@ -11,7 +11,7 @@
/**
* 线程相关工具类.
*
- * @author ruoyi
+ * @author ard
*/
public class Threads
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/bean/BeanUtils.java b/ard-common/src/main/java/com/ard/common/utils/bean/BeanUtils.java
index 8240bbf..df0390c 100644
--- a/ard-common/src/main/java/com/ard/common/utils/bean/BeanUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/bean/BeanUtils.java
@@ -9,7 +9,7 @@
/**
* Bean 工具类
*
- * @author ruoyi
+ * @author ard
*/
public class BeanUtils extends org.springframework.beans.BeanUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/bean/BeanValidators.java b/ard-common/src/main/java/com/ard/common/utils/bean/BeanValidators.java
index b38e820..670297b 100644
--- a/ard-common/src/main/java/com/ard/common/utils/bean/BeanValidators.java
+++ b/ard-common/src/main/java/com/ard/common/utils/bean/BeanValidators.java
@@ -8,7 +8,7 @@
/**
* bean对象属性验证
*
- * @author ruoyi
+ * @author ard
*/
public class BeanValidators
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/file/FileTypeUtils.java b/ard-common/src/main/java/com/ard/common/utils/file/FileTypeUtils.java
index f67b23f..248202f 100644
--- a/ard-common/src/main/java/com/ard/common/utils/file/FileTypeUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/file/FileTypeUtils.java
@@ -6,14 +6,14 @@
/**
* 文件类型工具类
*
- * @author ruoyi
+ * @author ard
*/
public class FileTypeUtils
{
/**
* 获取文件类型
* <p>
- * 例如: ruoyi.txt, 返回: txt
+ * 例如: ard.txt, 返回: txt
*
* @param file 文件名
* @return 后缀（不含".")
@@ -30,7 +30,7 @@
/**
* 获取文件类型
* <p>
- * 例如: ruoyi.txt, 返回: txt
+ * 例如: ard.txt, 返回: txt
*
* @param fileName 文件名
* @return 后缀（不含".")
diff --git a/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java b/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java
index bb5976b..e9f892d 100644
--- a/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/file/FileUploadUtils.java
@@ -19,7 +19,7 @@
/**
* 文件上传工具类
*
- * @author ruoyi
+ * @author ard
*/
public class FileUploadUtils {
/**
diff --git a/ard-common/src/main/java/com/ard/common/utils/file/FileUtils.java b/ard-common/src/main/java/com/ard/common/utils/file/FileUtils.java
index dd2b9e2..f8e4ee0 100644
--- a/ard-common/src/main/java/com/ard/common/utils/file/FileUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/file/FileUtils.java
@@ -22,7 +22,7 @@
/**
* 文件处理工具类
*
- * @author ruoyi
+ * @author ard
*/
public class FileUtils
{
@@ -256,7 +256,7 @@
}
/**
- * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
+ * 获取文件名称 /profile/upload/2022/04/16/ard.png -- ard.png
*
* @param fileName 路径名称
* @return 没有文件路径的名称
@@ -274,7 +274,7 @@
}
/**
- * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
+ * 获取不带后缀文件名称 /profile/upload/2022/04/16/ard.png -- ard
*
* @param fileName 路径名称
* @return 没有文件路径和后缀的名称
diff --git a/ard-common/src/main/java/com/ard/common/utils/file/ImageUtils.java b/ard-common/src/main/java/com/ard/common/utils/file/ImageUtils.java
index a3b0879..3e6e571 100644
--- a/ard-common/src/main/java/com/ard/common/utils/file/ImageUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/file/ImageUtils.java
@@ -16,7 +16,7 @@
/**
* 图片处理工具类
*
- * @author ruoyi
+ * @author ard
*/
public class ImageUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java b/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java
index 6897856..9d85813 100644
--- a/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java
@@ -3,7 +3,7 @@
/**
* 媒体类型工具类
*
- * @author ruoyi
+ * @author ard
*/
public class MimeTypeUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/html/EscapeUtil.java b/ard-common/src/main/java/com/ard/common/utils/html/EscapeUtil.java
index de16050..9aad5bc 100644
--- a/ard-common/src/main/java/com/ard/common/utils/html/EscapeUtil.java
+++ b/ard-common/src/main/java/com/ard/common/utils/html/EscapeUtil.java
@@ -5,7 +5,7 @@
/**
* 转义和反转义工具类
*
- * @author ruoyi
+ * @author ard
*/
public class EscapeUtil
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/html/HTMLFilter.java b/ard-common/src/main/java/com/ard/common/utils/html/HTMLFilter.java
index e47093d..da3002d 100644
--- a/ard-common/src/main/java/com/ard/common/utils/html/HTMLFilter.java
+++ b/ard-common/src/main/java/com/ard/common/utils/html/HTMLFilter.java
@@ -13,7 +13,7 @@
/**
* HTML过滤器，用于去除XSS漏洞隐患。
*
- * @author ruoyi
+ * @author ard
*/
public final class HTMLFilter
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/http/HttpHelper.java b/ard-common/src/main/java/com/ard/common/utils/http/HttpHelper.java
index ed8db15..c6598c3 100644
--- a/ard-common/src/main/java/com/ard/common/utils/http/HttpHelper.java
+++ b/ard-common/src/main/java/com/ard/common/utils/http/HttpHelper.java
@@ -13,7 +13,7 @@
/**
* 通用http工具封装
*
- * @author ruoyi
+ * @author ard
*/
public class HttpHelper
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/http/HttpUtils.java b/ard-common/src/main/java/com/ard/common/utils/http/HttpUtils.java
index b2d557e..023c54d 100644
--- a/ard-common/src/main/java/com/ard/common/utils/http/HttpUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/http/HttpUtils.java
@@ -25,7 +25,7 @@
/**
* 通用http发送方法
*
- * @author ruoyi
+ * @author ard
*/
public class HttpUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/ip/AddressUtils.java b/ard-common/src/main/java/com/ard/common/utils/ip/AddressUtils.java
index 8d22309..fa0f6dc 100644
--- a/ard-common/src/main/java/com/ard/common/utils/ip/AddressUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/ip/AddressUtils.java
@@ -12,7 +12,7 @@
/**
* 获取地址类
*
- * @author ruoyi
+ * @author ard
*/
public class AddressUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/ip/IpUtils.java b/ard-common/src/main/java/com/ard/common/utils/ip/IpUtils.java
index 547da24..1ef0c63 100644
--- a/ard-common/src/main/java/com/ard/common/utils/ip/IpUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/ip/IpUtils.java
@@ -9,7 +9,7 @@
/**
* 获取IP方法
*
- * @author ruoyi
+ * @author ard
*/
public class IpUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/poi/ExcelHandlerAdapter.java b/ard-common/src/main/java/com/ard/common/utils/poi/ExcelHandlerAdapter.java
index a283db4..946ff93 100644
--- a/ard-common/src/main/java/com/ard/common/utils/poi/ExcelHandlerAdapter.java
+++ b/ard-common/src/main/java/com/ard/common/utils/poi/ExcelHandlerAdapter.java
@@ -6,7 +6,7 @@
/**
* Excel数据格式处理适配器
*
- * @author ruoyi
+ * @author ard
*/
public interface ExcelHandlerAdapter
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/poi/ExcelUtil.java b/ard-common/src/main/java/com/ard/common/utils/poi/ExcelUtil.java
index f34b283..63ef875 100644
--- a/ard-common/src/main/java/com/ard/common/utils/poi/ExcelUtil.java
+++ b/ard-common/src/main/java/com/ard/common/utils/poi/ExcelUtil.java
@@ -89,7 +89,7 @@
/**
* Excel相关处理
*
- * @author ruoyi
+ * @author ard
*/
public class ExcelUtil<T>
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/reflect/ReflectUtils.java b/ard-common/src/main/java/com/ard/common/utils/reflect/ReflectUtils.java
index 9c5a7b7..cd67d19 100644
--- a/ard-common/src/main/java/com/ard/common/utils/reflect/ReflectUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/reflect/ReflectUtils.java
@@ -18,7 +18,7 @@
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
*
- * @author ruoyi
+ * @author ard
*/
@SuppressWarnings("rawtypes")
public class ReflectUtils
diff --git a/ard-common/src/main/java/com/ard/common/utils/sign/Base64.java b/ard-common/src/main/java/com/ard/common/utils/sign/Base64.java
index 5a8e215..96c2529 100644
--- a/ard-common/src/main/java/com/ard/common/utils/sign/Base64.java
+++ b/ard-common/src/main/java/com/ard/common/utils/sign/Base64.java
@@ -3,7 +3,7 @@
/**
* Base64工具类
*
- * @author ruoyi
+ * @author ard
*/
public final class Base64
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/sign/Md5Utils.java b/ard-common/src/main/java/com/ard/common/utils/sign/Md5Utils.java
index f031083..b9ec64b 100644
--- a/ard-common/src/main/java/com/ard/common/utils/sign/Md5Utils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/sign/Md5Utils.java
@@ -8,7 +8,7 @@
/**
* Md5加密方法
*
- * @author ruoyi
+ * @author ard
*/
public class Md5Utils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/spring/SpringUtils.java b/ard-common/src/main/java/com/ard/common/utils/spring/SpringUtils.java
index 1761728..0a1035a 100644
--- a/ard-common/src/main/java/com/ard/common/utils/spring/SpringUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/spring/SpringUtils.java
@@ -13,7 +13,7 @@
/**
* spring工具类 方便在非spring管理环境中获取bean
*
- * @author ruoyi
+ * @author ard
*/
@Component
public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
diff --git a/ard-common/src/main/java/com/ard/common/utils/sql/SqlUtil.java b/ard-common/src/main/java/com/ard/common/utils/sql/SqlUtil.java
index f8130d2..f0c0d14 100644
--- a/ard-common/src/main/java/com/ard/common/utils/sql/SqlUtil.java
+++ b/ard-common/src/main/java/com/ard/common/utils/sql/SqlUtil.java
@@ -6,7 +6,7 @@
/**
* sql操作工具类
*
- * @author ruoyi
+ * @author ard
*/
public class SqlUtil
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/uuid/IdUtils.java b/ard-common/src/main/java/com/ard/common/utils/uuid/IdUtils.java
index 5befab7..ecd9d62 100644
--- a/ard-common/src/main/java/com/ard/common/utils/uuid/IdUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/uuid/IdUtils.java
@@ -3,7 +3,7 @@
/**
* ID生成器工具类
*
- * @author ruoyi
+ * @author ard
*/
public class IdUtils
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/uuid/Seq.java b/ard-common/src/main/java/com/ard/common/utils/uuid/Seq.java
index 5bfc5a8..7f02ea4 100644
--- a/ard-common/src/main/java/com/ard/common/utils/uuid/Seq.java
+++ b/ard-common/src/main/java/com/ard/common/utils/uuid/Seq.java
@@ -5,7 +5,7 @@
import com.ard.common.utils.StringUtils;
/**
- * @author ruoyi 序列生成类
+ * @author ard 序列生成类
*/
public class Seq
{
diff --git a/ard-common/src/main/java/com/ard/common/utils/uuid/UUID.java b/ard-common/src/main/java/com/ard/common/utils/uuid/UUID.java
index 2c4234b..4ae0908 100644
--- a/ard-common/src/main/java/com/ard/common/utils/uuid/UUID.java
+++ b/ard-common/src/main/java/com/ard/common/utils/uuid/UUID.java
@@ -10,7 +10,7 @@
/**
* 提供通用唯一识别码（universally unique identifier）（UUID）实现
*
- * @author ruoyi
+ * @author ard
*/
public final class UUID implements java.io.Serializable, Comparable<UUID>
{
diff --git a/ard-common/src/main/java/com/ard/common/xss/Xss.java b/ard-common/src/main/java/com/ard/common/xss/Xss.java
index 55335cb..91c21cd 100644
--- a/ard-common/src/main/java/com/ard/common/xss/Xss.java
+++ b/ard-common/src/main/java/com/ard/common/xss/Xss.java
@@ -10,7 +10,7 @@
/**
* 自定义xss校验注解
*
- * @author ruoyi
+ * @author ard
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER })
diff --git a/ard-common/src/main/java/com/ard/common/xss/XssValidator.java b/ard-common/src/main/java/com/ard/common/xss/XssValidator.java
index cd8e2da..ed27376 100644
--- a/ard-common/src/main/java/com/ard/common/xss/XssValidator.java
+++ b/ard-common/src/main/java/com/ard/common/xss/XssValidator.java
@@ -9,7 +9,7 @@
/**
* 自定义xss校验注解实现
*
- * @author ruoyi
+ * @author ard
*/
public class XssValidator implements ConstraintValidator<Xss, String>
{
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/common/GlobalVariable.java b/ard-device/src/main/java/com/ard/device/component/sdk/common/GlobalVariable.java
index 97c4ead..f76ae07 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/common/GlobalVariable.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/common/GlobalVariable.java
@@ -2,6 +2,7 @@
import com.ard.device.camera.domain.ArdCamera;
import lombok.Data;
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -19,9 +20,4 @@
public static Map<String, Object> loginMap = new ConcurrentHashMap<>();
//保存相机登录信息(loginId:Camera)
public static Map<Integer, ArdCamera> hikLoginMap = new ConcurrentHashMap<>();
-
- //相机预览字典
- public static Map<String, Object> previewMap = new ConcurrentHashMap<>();
- //线程字典
- public static Map<String, String> threadMap = new ConcurrentHashMap<>();
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/NetSDKLib.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/NetSDKLib.java
index 235ee99..373f755 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/NetSDKLib.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/NetSDKLib.java
@@ -4771,7 +4771,7 @@
public int emRegisterDbType; // 注册库类型，详见EM_REGISTER_DB_TYPE
public NET_TIME stuEffectiveTime; // 有效期时间
/**
- * 建模失败原因,对应{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PERSON_FEATURE_ERRCODE}
+ * 建模失败原因,对应{@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_PERSON_FEATURE_ERRCODE}
*/
public int emFeatureErrCode;
public int wFacePicNumEx; // 人脸图片张数
@@ -4979,19 +4979,19 @@
public EVENT_INTELLI_COMM_INFO stuIntelliCommInfo; // 智能事件公共信息
public byte[] szReserved1 = new byte[4];
/**
- * 眼睛状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EYE_STATE_TYPE}
+ * 眼睛状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_EYE_STATE_TYPE}
*/
public int emEye;
/**
- * 嘴巴状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_MOUTH_STATE_TYPE}
+ * 嘴巴状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_MOUTH_STATE_TYPE}
*/
public int emMouth;
/**
- * 口罩状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_MASK_STATE_TYPE}
+ * 口罩状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_MASK_STATE_TYPE}
*/
public int emMask;
/**
- * 胡子状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_MASK_STATE_TYPE}
+ * 胡子状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_MASK_STATE_TYPE}
*/
public int emBeard;
public int nAttractive; // 魅力值, -1表示无效, 0未识别，识别时范围1-100,得分高魅力高
@@ -5348,7 +5348,7 @@
public int nExtraPlateCount; // 额外车牌数量
public byte[] szExtraPlateNumer = new byte[3 * 32]; // 额外车牌信息
/**
- * 海外车辆类型中的子类别 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OVERSEA_VEHICLE_CATEGORY_TYPE}
+ * 海外车辆类型中的子类别 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_OVERSEA_VEHICLE_CATEGORY_TYPE}
*/
public int emOverseaVehicleCategory;
/**
@@ -5570,7 +5570,7 @@
public NET_TRAFFICCAR_BLACK_LIST stuBlackList; // 禁止名单信息
public int emFlowDirection; // 车流量方向 EM_VEHICLE_DIRECTION
/**
- * 收费公路车辆通行费车型分类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TOLLS_VEHICLE_TYPE}
+ * 收费公路车辆通行费车型分类 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_TOLLS_VEHICLE_TYPE}
*/
public int emTollsVehicleType;
/**
@@ -5606,7 +5606,7 @@
*/
public int nTrafficLightType;
/**
- * 车牌属性 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PLATE_ATTRIBUTE}
+ * 车牌属性 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_PLATE_ATTRIBUTE}
*/
public int emPlateAttribute;
/**
@@ -5634,7 +5634,7 @@
*/
public NET_TIME stuCancelTime = new NET_TIME();
/**
- * 布控类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_TRAFFIC_CAR_CONTROL_TYPE}
+ * 布控类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_NET_TRAFFIC_CAR_CONTROL_TYPE}
*/
public int emControlType;
/**
@@ -6179,15 +6179,15 @@
*/
public byte[] szNonMotorFeatureVersion = new byte[32];
/**
- * 非机动车的角度 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OBJECT_NONMOTORANGLE_TYPE}
+ * 非机动车的角度 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_OBJECT_NONMOTORANGLE_TYPE}
*/
public int emNonMotorAngle;
/**
- * 非机动车车篮 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OBJECT_BASKET_TYPE}
+ * 非机动车车篮 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_OBJECT_BASKET_TYPE}
*/
public int emBasket;
/**
- * 非机动车后备箱 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OBJECT_STORAGEBOX_TYPE}
+ * 非机动车后备箱 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_OBJECT_STORAGEBOX_TYPE}
*/
public int emStorageBox;
/**
@@ -6219,7 +6219,7 @@
*/
public int nAbsScore;
/**
- * 雨棚（伞）类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RAIN_SHED_TYPE}
+ * 雨棚（伞）类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_RAIN_SHED_TYPE}
*/
public int emRainShedType;
/**
@@ -15729,7 +15729,7 @@
public NET_TIME_EX stuStartTime; // 开始时间,nAction为2时上报此字段
public NET_GPS_STATUS_INFO stuGPS; // GPS信息
/**
- * 采集源分辨率 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_VIFORMAT_TYPE}
+ * 采集源分辨率 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_NET_VIFORMAT_TYPE}
*/
public int emViFormat;
/**
@@ -18542,15 +18542,15 @@
public byte[] szCompanyName = new byte[200]; // 公司名称
public int nScore; // 人脸质量评分
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_FACE_CHECK}
+ * {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_FACE_CHECK}
*/
public int emFaceCheck; // 刷卡开门时，门禁后台校验人脸是否是同一个人()
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_QRCODE_IS_EXPIRED}
+ * {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_QRCODE_IS_EXPIRED}
*/
public int emQRCodeIsExpired; // 二维码是否过期。默认值0
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_QRCODE_STATE}
+ * {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_QRCODE_STATE}
*/
public int emQRCodeState; // 二维码状态
public NET_TIME stuQRCodeValidTo; // 二维码截止日期
@@ -18558,7 +18558,7 @@
public byte[] szSection = new byte[64]; // 部门名称
public byte[] szWorkClass = new byte[256]; // 工作班级
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TEST_ITEMS }
+ * {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_TEST_ITEMS }
*/
public int emTestItems; // 测试项目
public NET_TEST_RESULT stuTestResult; // ESD阻值测试结果
@@ -22257,7 +22257,7 @@
public NET_INTELLIGENCE_IMAGE_INFO stuSceneImage; // 球机变到最小倍下的抓图
public NET_FLOATINGOBJECT_MASK_INFO stuObjectMaskInfo; // 堆积物点阵图信息
/**
- * 用来区分是普通漂浮物场景还是泡沫检测场景 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_FLOATINGOBJECT_DETECTION_SENCE_TYPE}
+ * 用来区分是普通漂浮物场景还是泡沫检测场景 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_FLOATINGOBJECT_DETECTION_SENCE_TYPE}
*/
public int emDetectSenceType;
/**
@@ -22706,7 +22706,7 @@
*/
public NET_TIME stuStartTimeInPeriodOfValidity = new NET_TIME();
/**
- * 测试项目 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TEST_ITEMS }
+ * 测试项目 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_TEST_ITEMS }
*/
public int emTestItems;
/**
@@ -22730,11 +22730,11 @@
*/
public int nAuthOverdueTime;
/**
- * 人员健康状态（添加） {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GREENCNHEALTH_STATUS}
+ * 人员健康状态（添加） {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_GREENCNHEALTH_STATUS}
*/
public int emGreenCNHealthStatus;
/**
- * 电子通行证状态（添加） {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ALLOW_PERMIT_FLAG}
+ * 电子通行证状态（添加） {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_ALLOW_PERMIT_FLAG}
*/
public int emAllowPermitFlag;
/**
@@ -29500,7 +29500,7 @@
*/
public byte[] szRuleName = new byte[128];
/**
- * 检测模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EVENT_DETECT_TYPE}
+ * 检测模式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_EVENT_DETECT_TYPE}
*/
public int emDetectType;
/**
@@ -30700,7 +30700,7 @@
*/
public int emAnalyseState;
/**
- * 错误码 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ANALYSE_TASK_ERROR}
+ * 错误码 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_ANALYSE_TASK_ERROR}
*/
public int emErrorCode;
/**
@@ -30724,7 +30724,7 @@
*/
public int emClassType;
/**
- * 数据源类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DATA_SOURCE_TYPE}
+ * 数据源类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_DATA_SOURCE_TYPE}
*/
public int emSourceType;
/**
@@ -32777,15 +32777,15 @@
public NET_TRAFFIC_LATTICE_SCREEN_SHOW_INFO stuCarPass = new NET_TRAFFIC_LATTICE_SCREEN_SHOW_INFO(); // 过车时
public int emShowType;
/**
- * 显示方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_LATTICE_SCREEN_SHOW_TYPE}
+ * 显示方式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_LATTICE_SCREEN_SHOW_TYPE}
*/
public int emControlType;
/**
- * 控制方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_LATTICE_SCREEN_CONTROL_TYPE}
+ * 控制方式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_LATTICE_SCREEN_CONTROL_TYPE}
*/
public int emBackgroundMode;
/**
- * 逻辑屏背景风格模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_LATTICE_SCREEN_BACKGROUND_MODE}
+ * 逻辑屏背景风格模式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_LATTICE_SCREEN_BACKGROUND_MODE}
*/
public byte[] szPlayList = new byte[10 * 64]; // 资源文件播放列表,支持视频文件和图片文件播放,按照数组顺序循环播放
public int nPlayListNum; // 资料文件个数
@@ -34148,8 +34148,8 @@
* 设置二维码信息
*
* @param lLoginID 登录句柄
- * @param pInParam 入参,对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_SET_2DCODE}
- * @param pOutParam 出参,对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_SET_2DCODE}
+ * @param pInParam 入参,对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_SET_2DCODE}
+ * @param pOutParam 出参,对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_SET_2DCODE}
* @param nWaitTime 超时时间
* @return
*/
@@ -34159,11 +34159,11 @@
* 订阅热度图数据,pInParam与pOutParam内存由用户申请释放
*
* @param lLoginID 登录句柄
- * @param pInParam 入参,对应结构体 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_ATTACH_VIDEOSTAT_HEATMAP}
+ * @param pInParam 入参,对应结构体 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_ATTACH_VIDEOSTAT_HEATMAP}
* @param nWaitTime 超时时间
* @return
- * @Param pOutParam 出参,对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_ATTACH_VIDEOSTAT_HEATMAP}
- * 也可使用{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.EmptyStructure}
+ * @Param pOutParam 出参,对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_ATTACH_VIDEOSTAT_HEATMAP}
+ * 也可使用{@link com.ard.utils.sdk.dhsdk.lib.structure.EmptyStructure}
*/
public LLong CLIENT_AttachVideoStatHeatMap(LLong lLoginID, Pointer pInParam, Pointer pOutParam, int nWaitTime);
@@ -34171,8 +34171,8 @@
* 获取热图数据,pInParam与pOutParam内存由用户申请释放
*
* @param lAttachHandle 热度图订阅句柄
- * @param pInParam 入参,对应结构体 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_GET_VIDEOSTAT_HEATMAP}
- * @param pOutParam 出参,对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_VIDEOSTAT_HEATMAP}
+ * @param pInParam 入参,对应结构体 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_GET_VIDEOSTAT_HEATMAP}
+ * @param pOutParam 出参,对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_VIDEOSTAT_HEATMAP}
* @param nWaitTime 超时时间
* @return
*/
@@ -34199,8 +34199,8 @@
* 计算两张人脸图片的相似度faceRecognitionServer.matchTwoFace,pstInParam与pstOutParam内存由用户申请释放
*
* @param lLoginID 登录句柄
- * @param pstInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_MATCH_TWO_FACE_IN}
- * @param pstOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_MATCH_TWO_FACE_OUT}
+ * @param pstInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_MATCH_TWO_FACE_IN}
+ * @param pstOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_MATCH_TWO_FACE_OUT}
* @param nWaitTime 接口超时时间,默认超时时间为3000
* @return
*/
@@ -34211,8 +34211,8 @@
* 设置相机参数, pInParam 和pOutParam 资源由用户申请和释放
*
* @param lLoginID 登录句柄
- * @param pInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_SET_CAMERA_CFG}
- * @param pOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_SET_CAMERA_CFG}
+ * @param pInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_SET_CAMERA_CFG}
+ * @param pOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_SET_CAMERA_CFG}
* @param nWaitTime
* @return
*/
@@ -34223,8 +34223,8 @@
* 获取相机参数, pInParam 和pOutParam 资源由用户申请和释放
*
* @param lLoginID 登录句柄
- * @param pInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_GET_CAMERA_CFG}
- * @param pOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_CAMERA_CFG}
+ * @param pInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_GET_CAMERA_CFG}
+ * @param pOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_CAMERA_CFG}
* @param nWaitTime
* @return
*/
@@ -34235,8 +34235,8 @@
* 设置通道参数, pInParam 和pOutParam 资源由用户申请和释放
*
* @param lLoginID 登录句柄
- * @param pInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_SET_CHANNEL_CFG}
- * @param pOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_SET_CHANNEL_CFG}
+ * @param pInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_SET_CHANNEL_CFG}
+ * @param pOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_SET_CHANNEL_CFG}
* @param nWaitTime
* @return
*/
@@ -34247,8 +34247,8 @@
* 获取通道参数, pInParam 和pOutParam 资源由用户申请和释放
*
* @param lLoginID 登录句柄
- * @param pInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_GET_CHANNEL_CFG}
- * @param pOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_CHANNEL_CFG}
+ * @param pInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_GET_CHANNEL_CFG}
+ * @param pOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_CHANNEL_CFG}
* @param nWaitTime
* @return
*/
@@ -34277,8 +34277,8 @@
* 交通灯信号检测-获取相机信息, pInParam 和pOutParam 资源由用户申请和释放
*
* @param lLoginID 登录句柄
- * @param pInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_GET_CAMERA_INFO}
- * @param pOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_CAMERA_INFO}
+ * @param pInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_GET_CAMERA_INFO}
+ * @param pOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_CAMERA_INFO}
* @param nWaitTime
* @return
*/
@@ -34289,8 +34289,8 @@
* 主动获取每个热成像点的像素温度
*
* @param lLoginID 登录句柄
- * @param pstInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_GET_HEATMAPS_INFO}
- * @param pstOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_HEATMAPS_INFO}
+ * @param pstInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_GET_HEATMAPS_INFO}
+ * @param pstOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_HEATMAPS_INFO}
* @param nWaitTime 接口超时时间,默认超时时间为 3000
* @return
*/
@@ -34392,8 +34392,8 @@
* 获取IPC设备的存储信息
*
* @param lLoginID 登录句柄
- * @param pstInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_GET_DEVICE_AII_INFO}
- * @param pstOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_DEVICE_AII_INFO}
+ * @param pstInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_GET_DEVICE_AII_INFO}
+ * @param pstOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_GET_DEVICE_AII_INFO}
* @param nWaitTime
* @return
*/
@@ -34408,8 +34408,8 @@
* 订阅交通信号灯状态 , pInParam 和pOutParam 资源由用户申请和释放
*
* @param lLoginID 登录句柄
- * @param pInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_ATTACH_TRAFFICLIGHT_INFO}
- * @param pOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_ATTACH_TRAFFICLIGHT_INFO}
+ * @param pInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_ATTACH_TRAFFICLIGHT_INFO}
+ * @param pOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_ATTACH_TRAFFICLIGHT_INFO}
* @param nWaitTime
* @return
*/
@@ -34427,8 +34427,8 @@
* 订阅雷达的报警点信息 , pInParam 和pOutParam 资源由用户申请和释放
*
* @param lLoginID 登录句柄
- * @param pstInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_RADAR_ALARMPOINTINFO}
- * @param pstOutParam 出参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_RADAR_ALARMPOINTINFO}
+ * @param pstInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_RADAR_ALARMPOINTINFO}
+ * @param pstOutParam 出参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_RADAR_ALARMPOINTINFO}
* @param nWaitTime
* @return
*/
@@ -34449,7 +34449,7 @@
/**
* @param lLoginId 登录句柄
* @param lAttachHandle 订阅句柄
- * @param pBuf {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_RADAR_NOTIFY_ALARMPOINTINFO}
+ * @param pBuf {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_RADAR_NOTIFY_ALARMPOINTINFO}
* @param dwBufLen pBuf中结构体的长度
* @param pReserved 保留数据
* @param dwUser 用户自定义数据
@@ -34471,8 +34471,8 @@
* 订阅云台元数据接口,pstuInPtzStatusProc与pstuOutPtzStatusProc内存由用户申请释放
*
* @param lLoginID 登录句柄
- * @param pstInParam 入参 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_PTZ_STATUS_PROC}
- * @param pstOutParam 出参{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_OUT_PTZ_STATUS_PROC}
+ * @param pstInParam 入参 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_PTZ_STATUS_PROC}
+ * @param pstOutParam 出参{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_OUT_PTZ_STATUS_PROC}
* @param nWaitTime
* @return
*/
@@ -35561,7 +35561,7 @@
/**
* @param lLoginId 登录句柄
* @param lAttachHandle 订阅句柄
- * @param pBuf {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_MINI_RADAR_NOTIFY_ALARMPOINTINFO}
+ * @param pBuf {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_MINI_RADAR_NOTIFY_ALARMPOINTINFO}
* @param dwBufLen pBuf中结构体的长度
* @param pReserved 保留数据
* @param dwUser 用户自定义数据
@@ -36119,8 +36119,8 @@
/**
* 获取电视墙预案,pInParam与pOutParam内存由用户申请释放
- * param[in] pInParam 接口输入参数, 内存资源由用户申请和释放,{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.optimized.NET_IN_WM_GET_COLLECTIONS_V1}
- * param[out]pOutParam 接口输出参数, 内存资源由用户申请和释放 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.optimized.NET_OUT_WM_GET_COLLECTIONS_V1}
+ * param[in] pInParam 接口输入参数, 内存资源由用户申请和释放,{@link com.ard.utils.sdk.dhsdk.lib.structure.optimized.NET_IN_WM_GET_COLLECTIONS_V1}
+ * param[out]pOutParam 接口输出参数, 内存资源由用户申请和释放 {@link com.ard.utils.sdk.dhsdk.lib.structure.optimized.NET_OUT_WM_GET_COLLECTIONS_V1}
* param[in] nWaitTime 接口超时时间, 单位毫秒
*/
public boolean CLIENT_GetMonitorWallCollectionsV1(LLong lLoginID, Pointer pInParam, Pointer pOutParam, int nWaitTime);
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/fVideoStatHeatMapCallBack.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/fVideoStatHeatMapCallBack.java
index 5746341..b2ef9c9 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/fVideoStatHeatMapCallBack.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/fVideoStatHeatMapCallBack.java
@@ -13,7 +13,7 @@
public interface fVideoStatHeatMapCallBack extends Callback {
/**
* @param lAttachHandle 订阅句柄
- * @param pBuf 回调上来的数据，对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_CB_VIDEOSTAT_HEATMAP}
+ * @param pBuf 回调上来的数据，对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_CB_VIDEOSTAT_HEATMAP}
* @param pBinData 回调上来的二进制数据
* @param dwBinDataLen 二进制数据长度
* @param dwUser 用户数据
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fSecurityGateAttachAlarmStatistics.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fSecurityGateAttachAlarmStatistics.java
index 2a742ad..57f3180 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fSecurityGateAttachAlarmStatistics.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fSecurityGateAttachAlarmStatistics.java
@@ -14,7 +14,7 @@
/**
* @param lAttachHandle 订阅句柄
- * @param pInfo 安全门报警统计信息，对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_SECURITYGATE_ALARM_STATISTICS_INFO}
+ * @param pInfo 安全门报警统计信息，对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_SECURITYGATE_ALARM_STATISTICS_INFO}
* @param dwUser 用户数据
*/
void invoke(
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fXRayAttachPackageStatistics.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fXRayAttachPackageStatistics.java
index 35e8c07..219fcfb 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fXRayAttachPackageStatistics.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/callback/securityCheck/fXRayAttachPackageStatistics.java
@@ -12,7 +12,7 @@
public interface fXRayAttachPackageStatistics extends Callback {
/**
* @param lAttachHandle 订阅句柄
- * @param pInfo 包裹信息回调函数，对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_IN_XRAY_PACKAGE_STATISTICS_INFO}
+ * @param pInfo 包裹信息回调函数，对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_IN_XRAY_PACKAGE_STATISTICS_INFO}
* @param dwUser 用户数据
*/
void invoke(
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/constant/SDK_ALARM_Ex_TYPE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/constant/SDK_ALARM_Ex_TYPE.java
index 1764258..094b0b2 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/constant/SDK_ALARM_Ex_TYPE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/constant/SDK_ALARM_Ex_TYPE.java
@@ -17,7 +17,7 @@
*/
public class SDK_ALARM_Ex_TYPE {
/**
- * 太阳能系统信息上报(对应结构体 {@link ALARM_SOLARCELL_SYSTEM_INFO}),枚举值对应的回调接口{@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.fMessCallBack#invoke(int, NetSDKLib.LLong, Pointer, int, String, NativeLong, Pointer)}
+ * 太阳能系统信息上报(对应结构体 {@link ALARM_SOLARCELL_SYSTEM_INFO}),枚举值对应的回调接口{@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.fMessCallBack#invoke(int, NetSDKLib.LLong, Pointer, int, String, NativeLong, Pointer)}
* 对应的接口{@link NetSDKLib#CLIENT_StartListenEx(NetSDKLib.LLong)}
*/
public static final int SDK_ALARM_SOLARCELL_SYSTEM_INFO = 0x345F;
@@ -35,7 +35,7 @@
*/
public static final int SDK_DISKERROR_ALARM_EX = 0x2107;
/**
- * 无硬盘报警,对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.ALARM_NO_DISK_INFO}
+ * 无硬盘报警,对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.ALARM_NO_DISK_INFO}
* 对应的回调接口{@link NetSDKLib.fMessCallBack#invoke(int, NetSDKLib.LLong, Pointer, int, String, NativeLong, Pointer)}
* 对应的接口{@link NetSDKLib#CLIENT_StartListenEx(NetSDKLib.LLong)}
*/
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_EVENT_IVS_TYPE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_EVENT_IVS_TYPE.java
index e175301..94cc885 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_EVENT_IVS_TYPE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_EVENT_IVS_TYPE.java
@@ -9,7 +9,7 @@
* @author 47081
* @version 1.0
* @description 智能分析事件类型
- * 对应接口{@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib#CLIENT_RealLoadPictureEx(NetSDKLib.LLong, int, int, int, Callback, Pointer, Pointer)}
+ * 对应接口{@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib#CLIENT_RealLoadPictureEx(NetSDKLib.LLong, int, int, int, Callback, Pointer, Pointer)}
* @date 2020/10/14
*/
public enum EM_EVENT_IVS_TYPE {
@@ -357,7 +357,7 @@
*/
EVENT_IVS_TRAFFIC_DRIVER_CALLING(0x0000013A, "驾驶员打电话事件"),
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO}
+ * {@link com.ard.utils.sdk.dhsdk.lib.structure.DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO}
*/
EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT(0x0000013B, "行人闯红灯事件"),
/**
@@ -654,13 +654,13 @@
EVENT_IVS_ANIMAL_DETECTION(0x00000286, "动物检测事件"), // (对应 DEV_EVENT_ANIMAL_DETECTION_INFO)
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.DEV_EVENT_SHOP_WINDOW_POST_INFO}
+ * {@link com.ard.utils.sdk.dhsdk.lib.structure.DEV_EVENT_SHOP_WINDOW_POST_INFO}
*/
EVENT_IVS_SHOP_WINDOW_POST(0x00000287, "橱窗张贴事件"),
/**
* (对应 DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO)
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO}
+ * {@link com.ard.utils.sdk.dhsdk.lib.structure.DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO}
*/
EVENT_IVS_SHOP_SIGN_ABNORMAL(0x00000288, "店招异常事件"),
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_CONFIG.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_CONFIG.java
index 0acec1c..4b2520a 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_CONFIG.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_CONFIG.java
@@ -123,13 +123,13 @@
CFG_CMD_PICINPIC("PicInPic"),
/** 空闲动作配置(CFG_IDLE_MOTION_INFO) */
CFG_CMD_IDLEMOTION_INFO("IdleMotion"),
- /** 语音激励(对应 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_AUDIO_SPIRIT}) */
+ /** 语音激励(对应 {@link com.ard.utils.sdk.dhsdk.lib.structure.CFG_AUDIO_SPIRIT}) */
CFG_CMD_AUDIO_SPIRIT("AudioSpirit"),
- /** 设备安装位置的GPS坐标信息(对应 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_DEVLOCATION_INFO}) */
+ /** 设备安装位置的GPS坐标信息(对应 {@link com.ard.utils.sdk.dhsdk.lib.structure.CFG_DEVLOCATION_INFO}) */
CFG_CMD_DEVLOCATION("DevLocation"),
- /** 设备参数标定配置(对应 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_LOCATION_CALIBRATE_INFO}) */
+ /** 设备参数标定配置(对应 {@link com.ard.utils.sdk.dhsdk.lib.structure.CFG_LOCATION_CALIBRATE_INFO}) */
CFG_CMD_LOCATION_CALIBRATE("LocationCalibrate"),
- /** 门禁基本配置(对应 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_ACCESS_GENERAL_INFO}) */
+ /** 门禁基本配置(对应 {@link com.ard.utils.sdk.dhsdk.lib.structure.CFG_ACCESS_GENERAL_INFO}) */
CFG_CMD_ACCESS_GENERAL("AccessControlGeneral"),
/** 无线网络连接设置(对应 CFG_WIRELESS_INFO) */
CFG_CMD_WIRELESS("Wireless"),
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java
index 36d6984..bc73fe4 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java
@@ -12,7 +12,7 @@
* @author 47081
* @version 1.0
* @description 能力集命令枚举, 对应接口
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib#CLIENT_QueryNewSystemInfo(NetSDKLib.LLong, String, int, byte[], int, IntByReference, int)}
+ * {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib#CLIENT_QueryNewSystemInfo(NetSDKLib.LLong, String, int, byte[], int, IntByReference, int)}
* @date 2020/11/9
*/
public enum EM_NEW_QUERY_SYSTEM_INFO {
@@ -130,7 +130,7 @@
CFG_CAP_CMD_BURN_MANAGER("BurnManager.getCaps"),
/**
* 获取云台能力集
- * 对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_PTZ_PROTOCOL_CAPS_INFO}
+ * 对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.CFG_PTZ_PROTOCOL_CAPS_INFO}
*/
CFG_CAP_CMD_PTZ("ptz.getCurrentProtocolCaps"),
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java
index 76a30e2..0f9f1b2 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java
@@ -172,12 +172,12 @@
public static final int NET_EM_CFG_COMPOSE_PLAN =
1403; // 合成通道的预案分割配置, 对应结构体 NET_COMPOSE_PLAN_INFO
/**
- * 合成通道配置, 对应结构体{@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_COMPOSE_CHANNEL_INFO}
+ * 合成通道配置, 对应结构体{@link com.ard.utils.sdk.dhsdk.lib.structure.NET_COMPOSE_CHANNEL_INFO}
*/
public static final int NET_EM_CFG_COMPOSE_CHANNEL =
1401; // 合成通道配置, 对应结构体 NET_COMPOSE_CHANNEL_INFO
/**
- * 刻录参数, 对应结构体 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_BURN_PARAM_INFO}
+ * 刻录参数, 对应结构体 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_BURN_PARAM_INFO}
*/
public static final int NET_EM_CFG_BURN_PARAM = 1402; // 刻录参数, 对应结构体 NET_BURN_PARAM_INFO
@@ -283,7 +283,7 @@
public static final int NET_EM_CFG_ACCESSCTL_BLACKLIST_LINK =
3901; // 门禁禁止名单报警联动配置,对应结构体 NET_CFG_ALARM_MSG_HANDLE
/**
- * 门禁节假日组配置, 对应结构体 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO}
+ * 门禁节假日组配置, 对应结构体 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO}
*/
public static final int NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP =
3902; // 门禁节假日组配置, 对应结构体 NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO
@@ -301,12 +301,12 @@
public static final int NET_EM_CFG_ACS_FACE_RECOGNITION_SCHEME =
3905; // 门禁目标识别相关配置,对应结构体 NET_CFG_ACS_FACE_RECOGNITION_SCHEME
/**
- * 广告禁用时段配置, 对应结构体 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_CFG_FORBIDDEN_ADVERT_PLAY}, 通道无关，通道号填-1
+ * 广告禁用时段配置, 对应结构体 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_CFG_FORBIDDEN_ADVERT_PLAY}, 通道无关，通道号填-1
*/
public static final int NET_EM_CFG_FORBIDDEN_ADVERT_PLAY =
3906; // 广告禁用时段配置, 对应结构体 NET_CFG_FORBIDDEN_ADVERT_PLAY, 通道无关，通道号填-1
/**
- * 门禁设备当前模式配置, 对应结构体 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_CFG_BGY_CUSTOMERCFG}, 通道无关，通道号填-1
+ * 门禁设备当前模式配置, 对应结构体 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_CFG_BGY_CUSTOMERCFG}, 通道无关，通道号填-1
*/
public static final int NET_EM_CFG_BGY_CUSTOMERCFG =
3907; // 门禁设备当前模式配置, 对应结构体 NET_CFG_BGY_CUSTOMERCFG, 通道无关，通道号填-1
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAALARM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAALARM_INFO.java
index 6a82b4f..cc7f7ed 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAALARM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAALARM_INFO.java
@@ -25,7 +25,7 @@
*/
public byte[] szName=new byte[128];
/**
-防区类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DEFENCE_AREA_TYPE}
+防区类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DEFENCE_AREA_TYPE}
*/
public int emDefenceAreaType;
/**
@@ -33,7 +33,7 @@
*/
public int nIndex;
/**
-触发类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_AREAALARM_TRIGGER_TYPE}
+触发类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_AREAALARM_TRIGGER_TYPE}
*/
public int emTrigerType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAARM_MODECHANGE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAARM_MODECHANGE_INFO.java
index a61b656..f81dbe4 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAARM_MODECHANGE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_AREAARM_MODECHANGE_INFO.java
@@ -21,12 +21,12 @@
*/
public NET_TIME_EX UTC = new NET_TIME_EX();
/**
- * 操作方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_AREAARM_TRIGGERMODE}
+ * 操作方式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_AREAARM_TRIGGERMODE}
*/
public int emTriggerMode;
/**
* 操作用户，仅emTriggerMode = EM_AREAARM_USER_USER时有效
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_AREAARM_USER}
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_AREAARM_USER}
*/
public int emUser;
/**
@@ -35,7 +35,7 @@
*/
public int nID;
/**
- * 布撤防状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ARM_STATE}
+ * 布撤防状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ARM_STATE}
*/
public int emArmState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_ENCLOSURE_INFO_EX.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_ENCLOSURE_INFO_EX.java
index e354a99..3b84bc3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_ENCLOSURE_INFO_EX.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_ENCLOSURE_INFO_EX.java
@@ -21,7 +21,7 @@
*/
public NET_TIME_EX stuUTC = new NET_TIME_EX();
/**
- * 围栏报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ENCLOSURE_TYPE_EX}
+ * 围栏报警类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ENCLOSURE_TYPE_EX}
*/
public int emType;
/**
@@ -29,7 +29,7 @@
*/
public int nActionNum;
/**
- * 详细类型,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ENCLOSURE_ALARM_TYPE_EX}
+ * 详细类型,参考枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ENCLOSURE_ALARM_TYPE_EX}
*/
public int[] emAction = new int[16];
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_RADAR_REGIONDETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_RADAR_REGIONDETECTION_INFO.java
index 05d3fc5..918f1d1 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_RADAR_REGIONDETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_RADAR_REGIONDETECTION_INFO.java
@@ -46,7 +46,7 @@
*/
public NetSDKLib.NET_POINT[] stuDetectRegion=new NetSDKLib.NET_POINT[20];
/**
-报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_ALARM_TYPE}
+报警类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_RADAR_ALARM_TYPE}
*/
public int emAlarmType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_WIRELESSDEV_LOWPOWER_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_WIRELESSDEV_LOWPOWER_INFO.java
index 4d43b50..f619f1b 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_WIRELESSDEV_LOWPOWER_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/ALARM_WIRELESSDEV_LOWPOWER_INFO.java
@@ -21,7 +21,7 @@
*/
public int nId;
/**
- * 无线设备类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_WIRELESSDEV_LOWPOWER_TYPE}
+ * 无线设备类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_WIRELESSDEV_LOWPOWER_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_CONTROL_ASG.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_CONTROL_ASG.java
index 4bd0fb9..f8cfa27 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_CONTROL_ASG.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_CONTROL_ASG.java
@@ -10,7 +10,7 @@
* @date 2021/2/7
*/
public class CFG_ACCESS_CONTROL_ASG extends NetSDKLib.SdkStructure {
- /** 通行模式,{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PASS_MODE} */
+ /** 通行模式,{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PASS_MODE} */
public int emPassMode;
/** 开门速度档位, 范围:0-7,对应1-8档 */
public int nOpenDoorSpeed;
@@ -28,7 +28,7 @@
public int emCollisionMode;
/** 设备音量等级共8档, 范围:0-7, 0级表示静音 */
public int nVolumeLevel;
- /** 闸机断电以后门摆动放向,{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DIRECTION_AFTER_POWER_OFF} */
+ /** 闸机断电以后门摆动放向,{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DIRECTION_AFTER_POWER_OFF} */
public int emDirectionAfterPowerOff;
/** 工作模式,{@link EM_ASG_WORK_MODE} */
public int emWorkMode; // 工作模式
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_GENERAL_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_GENERAL_INFO.java
index d1315c5..78dc7a6 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_GENERAL_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_ACCESS_GENERAL_INFO.java
@@ -39,7 +39,7 @@
/** 工程密码 */
public byte[] szProjectPassword = new byte[MAX_PASSWORD_LEN];
- /** 门禁通道单双向配置,对应枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.CFG_ACCESS_PROPERTY_TYPE} */
+ /** 门禁通道单双向配置,对应枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.CFG_ACCESS_PROPERTY_TYPE} */
public int emAccessProperty;
/** AB互锁信息 */
public CFG_ABLOCK_INFO stuABLockInfo;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NAS_INFO_NEW.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NAS_INFO_NEW.java
index f78e7be..611b89a 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NAS_INFO_NEW.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NAS_INFO_NEW.java
@@ -57,7 +57,7 @@
*/
public CFG_NET_TIME_EX stuUpdateTime = new CFG_NET_TIME_EX();
/**
- * 云存储协议类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_NAS_CLOUDPROTOCOL_TYPE}
+ * 云存储协议类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_NAS_CLOUDPROTOCOL_TYPE}
*/
public int emCloudProtocol;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NUMBERSTAT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NUMBERSTAT_INFO.java
index 89c9557..9f2f211 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NUMBERSTAT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_NUMBERSTAT_INFO.java
@@ -59,7 +59,6 @@
public int nPtzPresetId;
/**
* 数量统计类型 支持："Region" 区域类型 "Entrance" 出入口类型
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.CFG_LINK_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PROFILE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PROFILE_INFO.java
index 42caca1..1f4659c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PROFILE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PROFILE_INFO.java
@@ -17,7 +17,7 @@
*/
public byte[] szBrand = new byte[64];
/**
- * 情景模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMARTHOME_SCENE_MODE}
+ * 情景模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SMARTHOME_SCENE_MODE}
*/
public int emScene;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PRIVACY_MASKING.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PRIVACY_MASKING.java
index 7bdea5e..205b85f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PRIVACY_MASKING.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PRIVACY_MASKING.java
@@ -35,7 +35,7 @@
public int nMaskTypeCount;
/**
* 支持的遮挡块形状，没有该项配置时默认支持矩形
- * 枚举参考{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_MASK_TYPE}
+ * 枚举参考{@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_MASK_TYPE}
*/
public int[] emMaskType = new int[MAX_MASKTYPE_COUNT];
/**
@@ -56,7 +56,7 @@
public int nMosaicTypeCount;
/**
* 支持的马赛克类型(SetMosaicSupport为true时该能力有效，没有该项配置时默认支持24x24大小马赛克)
- * 枚举值参考{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_MOSAIC_TYPE}
+ * 枚举值参考{@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_MOSAIC_TYPE}
*/
public int[] emMosaicType = new int[MAX_MOSAICTYPE_COUNT];
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java
index b9b10a6..4ffb667 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java
@@ -215,7 +215,7 @@
public int dwSupportViewRangeType;
/**
- * 支持的支持的焦距模式掩码,从低位到高位依次数,见{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUPPORT_FOCUS_MODE}
+ * 支持的支持的焦距模式掩码,从低位到高位依次数,见{@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SUPPORT_FOCUS_MODE}
*/
public int dwSupportFocusMode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEOSATA_SUMMARY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEOSATA_SUMMARY_INFO.java
index 03c9d05..187c438 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEOSATA_SUMMARY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEOSATA_SUMMARY_INFO.java
@@ -99,7 +99,7 @@
*/
public int nInsideSubTotal;
/**
- * 规则类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_RULE_TYPE}
+ * 规则类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_RULE_TYPE}
*/
public int emRuleType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEO_IN_FOCUS_UNIT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEO_IN_FOCUS_UNIT.java
index d35ec16..ed1313d 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEO_IN_FOCUS_UNIT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_VIDEO_IN_FOCUS_UNIT.java
@@ -21,7 +21,7 @@
*/
public int nIRCorrection;
/**
- * 聚焦极限 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_FOCUS_LIMIT_SELECT_MODE}
+ * 聚焦极限 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_FOCUS_LIMIT_SELECT_MODE}
*/
public int emFocusMode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WIRELESS_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WIRELESS_INFO.java
index abe26e1..ad528f7 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WIRELESS_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WIRELESS_INFO.java
@@ -17,7 +17,7 @@
*/
public int nKeepAlive;
/**
- * 接入的2G网络名称 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_APN}
+ * 接入的2G网络名称 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_APN}
*/
public int emAPN;
/**
@@ -29,7 +29,7 @@
*/
public byte[] szPassword = new byte[64];
/**
- * 每日流量控制策略 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_DAY3GFLUXTACTIC}
+ * 每日流量控制策略 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_DAY3GFLUXTACTIC}
*/
public int emDay3GFluxTactic;
/**
@@ -41,7 +41,7 @@
*/
public int dwDay3GFluxUse;
/**
- * 流量报警策略 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_DAY3GFLUXACTION}
+ * 流量报警策略 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_DAY3GFLUXACTION}
*/
public int emDay3GFluxAction;
/**
@@ -49,7 +49,7 @@
*/
public NetSDKLib.TIME_SECTION_WEEK_DAY_6[] stuTimeSection = new NetSDKLib.TIME_SECTION_WEEK_DAY_6[7];
/**
- * 鉴权模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_AUTHMODE}
+ * 鉴权模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_AUTHMODE}
*/
public int emAuthMode;
/**
@@ -61,7 +61,7 @@
*/
public int n3GFlux;
/**
- * 流量使用策略{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_3GFLUXTACTIC}
+ * 流量使用策略{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_3GFLUXTACTIC}
*/
public int em3GFluxTactic;
/**
@@ -69,7 +69,7 @@
*/
public int n3GFluxUp;
/**
- * 工作模式选择 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_WORKMODE}
+ * 工作模式选择 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_WORKMODE}
*/
public int emWorkMode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_EAP.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_EAP.java
index 74d8dda..100712e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_EAP.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_EAP.java
@@ -9,11 +9,11 @@
*/
public class CFG_WLAN_EAP extends NetSDKLib.SdkStructure {
/**
- * EAP方法 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_EAP_METHOD}
+ * EAP方法 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_EAP_METHOD}
*/
public int emMethod;
/**
- * EAP身份验证方法 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_EAP_AUTH_TYPE}
+ * EAP身份验证方法 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_EAP_AUTH_TYPE}
*/
public int emAuthType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_INFO.java
index bc48463..26877db 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CFG_WLAN_INFO.java
@@ -58,11 +58,11 @@
*/
public int nEncryption;
/**
- * 认证方式, 暂时没用 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_WIRELESS_AUTHENTICATION}
+ * 认证方式, 暂时没用 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_WIRELESS_AUTHENTICATION}
*/
public int emAuthentication;
/**
- * 数据加密方式, 暂时没用 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_WIRELESS_DATA_ENCRYPT}
+ * 数据加密方式, 暂时没用 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_WIRELESS_DATA_ENCRYPT}
*/
public int emDataEncryption;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CTRL_ARM_DISARM_PARAM_EX_IN.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CTRL_ARM_DISARM_PARAM_EX_IN.java
index 6a33a29..4128c1c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CTRL_ARM_DISARM_PARAM_EX_IN.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/CTRL_ARM_DISARM_PARAM_EX_IN.java
@@ -15,7 +15,7 @@
public int dwSize;
/**
- * 布撤防状态，参考枚举 { @link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ALARM_MODE}
+ * 布撤防状态，参考枚举 { @link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ALARM_MODE}
*/
public int emState;
@@ -25,7 +25,7 @@
public Pointer szDevPwd;
/**
- * 情景模式，参考枚举 { @link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_SCENE_MODE}
+ * 情景模式，参考枚举 { @link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_SCENE_MODE}
*/
public int emSceneMode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_ACCESS_CTL_IMAGE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_ACCESS_CTL_IMAGE_INFO.java
index 03238e9..597c9b8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_ACCESS_CTL_IMAGE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_ACCESS_CTL_IMAGE_INFO.java
@@ -10,7 +10,7 @@
*/
public class DEV_ACCESS_CTL_IMAGE_INFO extends NetSDKLib.SdkStructure {
/**
-图片类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_ACCESS_CTL_IMAGE_TYPE}
+图片类型
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ALARM_ANALOGALRM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ALARM_ANALOGALRM_INFO.java
index 1842057..dbfb2d5 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ALARM_ANALOGALRM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ALARM_ANALOGALRM_INFO.java
@@ -42,7 +42,7 @@
*/
public int nIndex;
/**
- * 传感器类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_SENSE_METHOD}
+ * 传感器类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_SENSE_METHOD}
*/
public int emSensor;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_BREED_DETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_BREED_DETECTION_INFO.java
index 070dad9..ec87595 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_BREED_DETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_BREED_DETECTION_INFO.java
@@ -42,7 +42,7 @@
*/
public int nSequence;
/**
-智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_CLASS_TYPE}
+智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClassType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_CONSUMPTION_EVENT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_CONSUMPTION_EVENT_INFO.java
index a878e55..a45f517 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_CONSUMPTION_EVENT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_CONSUMPTION_EVENT_INFO.java
@@ -50,27 +50,27 @@
*/
public int nBlockId;
/**
-事件类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESS_CTL_EVENT_TYPE }
+事件类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESS_CTL_EVENT_TYPE }
*/
public int emType;
/**
-消费结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CONSUMPTION_STATUS }
+消费结果 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CONSUMPTION_STATUS }
*/
public int emStatus;
/**
-卡类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESSCTLCARD_TYPE }
+卡类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESSCTLCARD_TYPE }
*/
public int emCardType;
/**
-用户类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_USER_TYPE }
+用户类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_USER_TYPE }
*/
public int emUserType;
/**
-卡状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESSCTLCARD_STATE }
+卡状态 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESSCTLCARD_STATE }
*/
public int emCardStatus;
/**
-开门方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESS_DOOROPEN_METHOD }
+开门方式 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESS_DOOROPEN_METHOD }
*/
public int emMethod;
/**
@@ -135,7 +135,7 @@
*/
public int nSimilarity;
/**
-记录类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CONSUMPTION_EVENT_TYPE }
+记录类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_CONSUMPTION_EVENT_TYPE }
*/
public int emEventType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_DIALRECOGNITION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_DIALRECOGNITION_INFO.java
index b292cf5..28c22ba 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_DIALRECOGNITION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_DIALRECOGNITION_INFO.java
@@ -21,7 +21,7 @@
*/
public byte[] szTaskID = new byte[64];
/**
- * 仪表类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_INSTRUMENT_TYPE}
+ * 仪表类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_INSTRUMENT_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ELECTRICFAULTDETECT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ELECTRICFAULTDETECT_INFO.java
index a40d408..c4e8837 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ELECTRICFAULTDETECT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_ELECTRICFAULTDETECT_INFO.java
@@ -10,7 +10,7 @@
*/
public class DEV_EVENT_ELECTRICFAULTDETECT_INFO extends NetSDKLib.SdkStructure {
/**
-智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLASS_TYPE}
+智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClassType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_FACEBODY_DETECT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_FACEBODY_DETECT_INFO.java
index 0f52a7b..0f07130 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_FACEBODY_DETECT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_FACEBODY_DETECT_INFO.java
@@ -15,7 +15,7 @@
public byte[] szName=new byte[128]; // 事件名称
public double PTS; // 时间戳(单位是毫秒)
public NET_TIME_EX UTC=new NET_TIME_EX(); // 事件发生的时间
- /** {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_CLASS_TYPE} */
+ /** {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_CLASS_TYPE} */
public int emClassType; // 智能事件所属大类
public int nEventID; // 事件ID
public int nObjectID; // 物体ID
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_GENEAL_ATTITUDE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_GENEAL_ATTITUDE_INFO.java
index 989cbea..63e8165 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_GENEAL_ATTITUDE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_GENEAL_ATTITUDE_INFO.java
@@ -54,7 +54,7 @@
*/
public NetSDKLib.SCENE_IMAGE_INFO stuSceneImage=new NetSDKLib.SCENE_IMAGE_INFO();
/**
-姿态类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_ATTITUDE_TYPE}
+姿态类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_ATTITUDE_TYPE}
*/
public int emAttitudeType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HEAT_IMAGING_TEMPER_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HEAT_IMAGING_TEMPER_INFO.java
index 09a81f2..c574ec8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HEAT_IMAGING_TEMPER_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HEAT_IMAGING_TEMPER_INFO.java
@@ -18,11 +18,11 @@
public int nAlarmId;
/**
* 报警结果值 fTemperatureValue 的类型
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_RADIOMETRY_RESULT}
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_RADIOMETRY_RESULT}
*/
public int emResult;
/**
- * 报警条件 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_RADIOMETRY_ALARMCONTION}
+ * 报警条件 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_RADIOMETRY_ALARMCONTION}
*/
public int emAlarmContion;
/**
@@ -30,7 +30,7 @@
*/
public float fTemperatureValue;
/**
- * 温度单位(当前配置的温度单位) {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_TEMPERATURE_UNIT }
+ * 温度单位(当前配置的温度单位) {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_TEMPERATURE_UNIT }
*/
public int emTemperatureUnit;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HUMAN_ANIMAL_COEXISTENCE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HUMAN_ANIMAL_COEXISTENCE_INFO.java
index f39dd22..e31593e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HUMAN_ANIMAL_COEXISTENCE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_HUMAN_ANIMAL_COEXISTENCE_INFO.java
@@ -33,7 +33,7 @@
*/
public int nUTCMS;
/**
- * 智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SCENE_CLASS_TYPE}
+ * 智能事件所属大类 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SCENE_CLASS_TYPE}
*/
public int emClassType;
/**
@@ -61,11 +61,11 @@
*/
public int nPresetID;
/**
- * 事件报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_HUMAN_ANIMAL_ALARM_TYPE}
+ * 事件报警类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_HUMAN_ANIMAL_ALARM_TYPE}
*/
public int emAlarmType;
/**
- * 场景类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DETECTION_SCENE_TYPE}
+ * 场景类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_DETECTION_SCENE_TYPE}
*/
public int emDetectionSceneType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_INTELLI_SHELF_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_INTELLI_SHELF_INFO.java
index 5a27107..da040e8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_INTELLI_SHELF_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_INTELLI_SHELF_INFO.java
@@ -33,7 +33,7 @@
*/
public int nEventID;
/**
- * 智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_CLASS_TYPE}
+ * 智能事件所属大类 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_CLASS_TYPE}
*/
public int emClassType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_NUMBERSTAT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_NUMBERSTAT_INFO.java
index daaa71f..760ff68 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_NUMBERSTAT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_NUMBERSTAT_INFO.java
@@ -87,7 +87,7 @@
*/
public int bIsCompliant;
/**
- * 表示人数越上限类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NUMBER_STAT_TYPE}
+ * 表示人数越上限类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_NUMBER_STAT_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_ABNORMAL_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_ABNORMAL_INFO.java
index d5e5999..32af7b9 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_ABNORMAL_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_ABNORMAL_INFO.java
@@ -37,7 +37,7 @@
*/
public NET_EVENT_IMAGE_OFFSET_INFO stuSceneImage = new NET_EVENT_IMAGE_OFFSET_INFO();
/**
- * 智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLASS_TYPE}
+ * 智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClassType;
/**
@@ -57,11 +57,11 @@
*/
public int nObjectInfoNum;
/**
- * 目标类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ABNORMAL_OBJECT_TYPE}
+ * 目标类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ABNORMAL_OBJECT_TYPE}
*/
public int emObjectType;
/**
- * 异常行为 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OBJECT_ABNORMAL_TYPE}
+ * 异常行为 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_OBJECT_ABNORMAL_TYPE}
*/
public int emAbnormalType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_PLACEMENT_DETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_PLACEMENT_DETECTION_INFO.java
index 7f41ccc..d12c5ea 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_PLACEMENT_DETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_PLACEMENT_DETECTION_INFO.java
@@ -38,7 +38,7 @@
*/
public int nEventID;
/**
- * 智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLASS_TYPE}
+ * 智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClassType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_REMOVAL_DETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_REMOVAL_DETECTION_INFO.java
index 47482df..8653975 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_REMOVAL_DETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_OBJECT_REMOVAL_DETECTION_INFO.java
@@ -38,7 +38,7 @@
*/
public int nEventID;
/**
- * 智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLASS_TYPE}
+ * 智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClassType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_RADAR_REGION_DETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_RADAR_REGION_DETECTION_INFO.java
index 5db9f43..47daaff 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_RADAR_REGION_DETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_RADAR_REGION_DETECTION_INFO.java
@@ -38,7 +38,7 @@
*/
public int nRuleID;
/**
-智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLASS_TYPE}
+智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClassType;
/**
@@ -70,7 +70,7 @@
*/
public NetSDKLib.SCENE_IMAGE_INFO_EX stuSceneImage=new NetSDKLib.SCENE_IMAGE_INFO_EX();
/**
-报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_ALARM_TYPE}
+报警类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_RADAR_ALARM_TYPE}
*/
public int emAlarmType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SECURITYGATE_PERSONALARM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SECURITYGATE_PERSONALARM_INFO.java
index 82ddcdd..1407cf7 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SECURITYGATE_PERSONALARM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SECURITYGATE_PERSONALARM_INFO.java
@@ -16,12 +16,12 @@
public NET_TIME_EX UTC = new NET_TIME_EX(); // 时间
public int nEventID; // 事件ID
/**
- * 人员通过方向枚举,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_PERSON_PASS_DIRECTION }
+ * 人员通过方向枚举,参考枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SECURITYGATE_PERSON_PASS_DIRECTION }
*/
public int emDirection; // 人员通过方向
/**
- * 报警级别,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_ALARM_LEVEL }
+ * 报警级别,参考枚举{@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_ALARM_LEVEL }
*/
public int emAlarmLevel; // 报警级别
public int nChannelIn; // 关联进入通道
@@ -30,7 +30,7 @@
public int nAlarmPositionNum; // 报警位置个数
/**
- * 报警位置,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_ALARM_POSITION }
+ * 报警位置,参考枚举{@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_ALARM_POSITION }
*/
public int[] emAlarmPosition = new int[18]; // 报警位置
public NET_SECURITYGATE_ALARM_FACEIMAGE_INFO stuFaceImageInfo = new NET_SECURITYGATE_ALARM_FACEIMAGE_INFO(); // 人脸小图
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java
index ba84637..031654c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java
@@ -9,7 +9,7 @@
* @author 47081
* @version 1.0
* @description 事件类型
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_SIGN_ABNORMAL}(店招异常事件)对应的数据块描述信息
+ * {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_SIGN_ABNORMAL}(店招异常事件)对应的数据块描述信息
* @date 2020/11/17
*/
public class DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO extends NetSDKLib.SdkStructure {
@@ -43,7 +43,7 @@
public short nRuleID;
/**
* 智能事件所属大类,对应枚举
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_CLASS_TYPE}
+ * {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_CLASS_TYPE}
*/
public int emClassType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java
index 526fe4d..562e441 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java
@@ -9,7 +9,7 @@
* @author 47081
* @version 1.0
* @description 事件类型
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_WINDOW_POST}(橱窗张贴事件)对应的数据块描述信息
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_WINDOW_POST}(橱窗张贴事件)对应的数据块描述信息
* @date 2020/11/16
*/
public class DEV_EVENT_SHOP_WINDOW_POST_INFO extends NetSDKLib.SdkStructure {
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_CAR_MEASUREMENT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_CAR_MEASUREMENT_INFO.java
index 1934d7f..167c4d6 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_CAR_MEASUREMENT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_CAR_MEASUREMENT_INFO.java
@@ -42,11 +42,11 @@
*/
public int nSpeed;
/**
-触发类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRIGGER_TYPE}
+触发类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRIGGER_TYPE}
*/
public int emTriggerType;
/**
-触发时机 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRIGGER_OCCUR_TYPE}
+触发时机 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRIGGER_OCCUR_TYPE}
*/
public int emTriggerOccur;
/**
@@ -70,7 +70,7 @@
*/
public NET_TIME_EX stuRedLightStartTime=new NET_TIME_EX();
/**
-抓拍过程 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CAPTURE_PROCESS_END_TYPE}
+抓拍过程 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CAPTURE_PROCESS_END_TYPE}
*/
public int emCaptureProcess;
/**
@@ -78,11 +78,11 @@
*/
public NetSDKLib.EVENT_CARD_INFO stuCardInfo=new NetSDKLib.EVENT_CARD_INFO();
/**
-车辆行驶方向(相对车道方向) {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_VEHICLE_DRIVING_DIRECTION}
+车辆行驶方向(相对车道方向) {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_VEHICLE_DRIVING_DIRECTION}
*/
public int emDrivingDirection;
/**
-交通信号灯类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRFAFFIC_LIGHT_TYPE}
+交通信号灯类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRFAFFIC_LIGHT_TYPE}
*/
public int emLightState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_NONMOTOR_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_NONMOTOR_INFO.java
index e483225..63caa3f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_NONMOTOR_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_NONMOTOR_INFO.java
@@ -46,7 +46,7 @@
*/
public NetSDKLib.NET_MSG_OBJECT stuObject = new NetSDKLib.NET_MSG_OBJECT();
/**
- * 触发类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRIGGER_TYPE}
+ * 触发类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRIGGER_TYPE}
*/
public int emTriggerType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java
index f363ebc..0b93e47 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java
@@ -8,7 +8,7 @@
* @author 47081
* @version 1.0
* @description 事件类型
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT}
+ * {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT}
* (交通-行人闯红灯事件)对应的数据块描述信息
* @date 2020/10/14
*/
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_REAREND_ACCIDENT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_REAREND_ACCIDENT_INFO.java
index e32e293..9dc96e3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_REAREND_ACCIDENT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_REAREND_ACCIDENT_INFO.java
@@ -54,7 +54,7 @@
*/
public NetSDKLib.EVENT_COMM_INFO stuCommInfo = new NetSDKLib.EVENT_COMM_INFO();
/**
- * 抓拍过程 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CAPTURE_PROCESS_END_TYPE}
+ * 抓拍过程 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CAPTURE_PROCESS_END_TYPE}
*/
public int emCaptureProcess;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_SPECIAL_VEHICLE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_SPECIAL_VEHICLE_INFO.java
index b597843..9dec34c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_SPECIAL_VEHICLE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_SPECIAL_VEHICLE_INFO.java
@@ -50,7 +50,7 @@
*/
public NetSDKLib.DH_MSG_OBJECT stuVehicle = new NetSDKLib.DH_MSG_OBJECT();
/**
- * 触发类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRIGGER_TYPE}
+ * 触发类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRIGGER_TYPE}
*/
public int emTriggerType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_TRAFFICCAR_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_TRAFFICCAR_INFO.java
index df53ba1..0298d2f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_TRAFFICCAR_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_TRAFFICCAR_INFO.java
@@ -199,7 +199,7 @@
public byte[] byReserved2 = new byte[3];
/**
- * 车辆行驶方向 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRAFFICCAR_MOVE_DIRECTION}
+ * 车辆行驶方向 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRAFFICCAR_MOVE_DIRECTION}
*/
public int emMovingDirection;
/**
@@ -215,11 +215,11 @@
*/
public NetSDKLib.NET_TRAFFICCAR_WHITE_LIST stuWhiteList = new NetSDKLib.NET_TRAFFICCAR_WHITE_LIST();
/**
- * 车辆类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRAFFICCAR_CAR_TYPE}
+ * 车辆类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRAFFICCAR_CAR_TYPE}
*/
public int emCarType;
/**
- * 车道类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRAFFICCAR_LANE_TYPE}
+ * 车道类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRAFFICCAR_LANE_TYPE}
*/
public int emLaneType;
/**
@@ -239,7 +239,7 @@
*/
public int emFlowDirection;
/**
- * 收费公路车辆通行费车型分类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TOLLS_VEHICLE_TYPE}
+ * 收费公路车辆通行费车型分类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TOLLS_VEHICLE_TYPE}
*/
public int emTollsVehicleType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_VISIBILITY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_VISIBILITY_INFO.java
index ef92797..4132911 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_VISIBILITY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRAFFIC_VISIBILITY_INFO.java
@@ -46,7 +46,7 @@
*/
public NetSDKLib.NET_MSG_OBJECT stuObject = new NetSDKLib.NET_MSG_OBJECT();
/**
- * 触发类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRIGGER_TYPE}
+ * 触发类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TRIGGER_TYPE}
*/
public int emTriggerType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRUCKNOTCLEAN_FOR_PRMA_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRUCKNOTCLEAN_FOR_PRMA_INFO.java
index 1dc15a6..a889d5b 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRUCKNOTCLEAN_FOR_PRMA_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_TRUCKNOTCLEAN_FOR_PRMA_INFO.java
@@ -38,7 +38,7 @@
*/
public NetSDKLib.NET_EVENT_FILE_INFO stuFileInfo=new NetSDKLib.NET_EVENT_FILE_INFO();
/**
-智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLASS_TYPE}
+智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClass;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_VIDEO_NORMAL_DETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_VIDEO_NORMAL_DETECTION_INFO.java
index 07c4d8d..6553ed5 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_VIDEO_NORMAL_DETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/DEV_EVENT_VIDEO_NORMAL_DETECTION_INFO.java
@@ -30,7 +30,7 @@
*/
public double dbPTS;
/**
-视频检测类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_VIDEO_ABNORMAL_DETECT_TYPE}
+视频检测类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_VIDEO_ABNORMAL_DETECT_TYPE}
*/
public int emDetectType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/MEDIAFILE_SMART_KITCHEN_CLOTHES_DETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/MEDIAFILE_SMART_KITCHEN_CLOTHES_DETECTION_INFO.java
index 8545322..dfd3cec 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/MEDIAFILE_SMART_KITCHEN_CLOTHES_DETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/MEDIAFILE_SMART_KITCHEN_CLOTHES_DETECTION_INFO.java
@@ -14,10 +14,10 @@
public int nChannelID; // 通道号从0开始,-1表示查询所有通道
public NetSDKLib.NET_TIME stuStartTime; // 开始时间
public NetSDKLib.NET_TIME stuEndTime; // 结束时间
- public int emHasMask; /** 厨师口罩状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
- public int emHasChefHat; /** 厨师帽状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
- public int emHasChefClothes; /** 厨师服状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
- public int emChefClothesColor; /**厨师服颜色 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_COLOUR} */
+ public int emHasMask; /** 厨师口罩状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
+ public int emHasChefHat; /** 厨师帽状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
+ public int emHasChefClothes; /** 厨师服状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
+ public int emChefClothesColor; /**厨师服颜色 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_COLOUR} */
public byte[] szFaceImagePath=new byte[260]; // 人脸小图路径
public int nFaceImageLength; // 人脸小图图片大小，单位字节
public byte[] szHumanImagePath=new byte[260]; // 人体小图路径
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NAS_DIRECTORY_CFG_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NAS_DIRECTORY_CFG_INFO.java
index 93bd02b..9de045f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NAS_DIRECTORY_CFG_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NAS_DIRECTORY_CFG_INFO.java
@@ -54,11 +54,11 @@
*/
public int nBlockSize;
/**
-共享类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_NAS_DIRECTORY_PROTOCAL}
+共享类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_NAS_DIRECTORY_PROTOCAL}
*/
public int emProtocal;
/**
-缓存类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CFG_NAS_DIRECTORY_CACHE_TYPE}
+缓存类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CFG_NAS_DIRECTORY_CACHE_TYPE}
*/
public int emCacheType;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AC_CAPS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AC_CAPS.java
index efa3fda..0948a37 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AC_CAPS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AC_CAPS.java
@@ -63,7 +63,7 @@
*/
public int[] emUnlockModes=new int[128];
/**
-支持安全帽功能 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUPPORT_HELMET_TYPE}
+支持安全帽功能 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SUPPORT_HELMET_TYPE}
*/
public int emSupportHelmetType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AIRBORNE_DETECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AIRBORNE_DETECT.java
index 2180db8..aa860b1 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AIRBORNE_DETECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_AIRBORNE_DETECT.java
@@ -10,7 +10,7 @@
*/
public class NET_AIRBORNE_DETECT extends NetSDKLib.SdkStructure {
/**
-挂空悬浮物具体类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_AIRBORNE_TYPE}
+挂空悬浮物具体类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_AIRBORNE_TYPE}
*/
public int emAirborneType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_ARMING_FAILURE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_ARMING_FAILURE_INFO.java
index 9587c75..b4ec579 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_ARMING_FAILURE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_ARMING_FAILURE_INFO.java
@@ -13,7 +13,7 @@
public int nChannel; // 通道号
public NET_TIME_EX stuUTC=new NET_TIME_EX();// 事件发生的时间,标准的（不带时区偏差的）UTC时间
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ARM_TYPE}
+ * {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_ARM_TYPE}
*/
public int emMode; // 布撤防模式
public byte[] szReserved=new byte[1024]; // 保留字节
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_DEVICE_MODIFIED_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_DEVICE_MODIFIED_INFO.java
index 533b7e4..27d0eea 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_DEVICE_MODIFIED_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_DEVICE_MODIFIED_INFO.java
@@ -14,11 +14,11 @@
public NET_TIME_EX stuUTC=new NET_TIME_EX(); // 事件发生的时间,标准的（不带时区偏差的）UTC时间
public byte[] szUser=new byte[32]; // 用户名称
/**
- * {@link com.ruoyi.device.dhsdk.lib.enumeration.NET_EVENT_OPERATE_TYPE}
+ * {@link com.ard.device.dhsdk.lib.enumeration.NET_EVENT_OPERATE_TYPE}
*/
public int emOpType; // 操作类型
/**
- * {@link com.ruoyi.device.dhsdk.lib.enumeration.NET_EVENT_DEVICE_TYPE}
+ * {@link com.ard.device.dhsdk.lib.enumeration.NET_EVENT_DEVICE_TYPE}
*/
public int emDeviceType; // 设备类型
public byte[] szReserved=new byte[1024];// 保留字节
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER.java
index a569054..c7c1bac 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER.java
@@ -14,7 +14,7 @@
*/
public byte[] szID = new byte[32];
/**
- * 用户状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GETUSERINFOBYCONDITION_USER_STATUS}
+ * 用户状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_GETUSERINFOBYCONDITION_USER_STATUS}
*/
public int emUserStatus;
/**
@@ -30,11 +30,11 @@
*/
public int nAuthorityListNum;
/**
- * 用户的权限列表，数组值参考{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ALARM_USERAUTHORITY}
+ * 用户的权限列表，数组值参考{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ALARM_USERAUTHORITY}
*/
public int[] emAuthorityList = new int[32];
/**
- * 用户所在组 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ALARM_USER_GROUP}
+ * 用户所在组 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ALARM_USER_GROUP}
*/
public int emGroup;
/**
@@ -42,7 +42,7 @@
*/
public int bReserved;
/**
- * 用户类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GETUSERINFOBYCONDITION_USER_TYPE}
+ * 用户类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_GETUSERINFOBYCONDITION_USER_TYPE}
*/
public int emUserType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_MODIFIED_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_MODIFIED_INFO.java
index f99f335..274784e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_MODIFIED_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_MODIFIED_INFO.java
@@ -13,11 +13,11 @@
public int nChannel; // 通道号
public byte[] szUser=new byte[128]; // 用户名称
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EVENT_OPERATE_TYPE;}
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EVENT_OPERATE_TYPE;}
*/
public int emOpType; // 操作类型
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EVENT_USER_TYPE;}
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EVENT_USER_TYPE;}
*/
public int emUserType; // 用户类型
public byte[] szReserved=new byte[1024]; // 保留字节
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_ONECLICKARMING.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_ONECLICKARMING.java
index 0b9eb08..02932a9 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_ONECLICKARMING.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_ONECLICKARMING.java
@@ -13,19 +13,19 @@
*/
public int bEnable;
/**
- * 布防功能 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ALARM_ONECLICKARMING_FUNCTION}
+ * 布防功能 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ALARM_ONECLICKARMING_FUNCTION}
*/
public int emFunction;
/**
- * 触发类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ALARM_ONECLICKARMING_TRIGGEROPTION}
+ * 触发类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ALARM_ONECLICKARMING_TRIGGEROPTION}
*/
public int emTriggerOption;
/**
- * 一键布防类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_SCENE_MODE}
+ * 一键布防类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_SCENE_MODE}
*/
public int emArmProfile;
/**
- * 布撤防模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ARM_TYPE}
+ * 布撤防模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ARM_TYPE}
*/
public int emArmMode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_PASS_CONFIRM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_PASS_CONFIRM_INFO.java
index 2c1acb6..0359abf 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_PASS_CONFIRM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ALARM_USER_PASS_CONFIRM_INFO.java
@@ -39,7 +39,7 @@
*/
public int nCount;
/**
- * 进出方向(事件类型) {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_USER_PASS_TYPE}
+ * 进出方向(事件类型) {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_USER_PASS_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ARM_OPTIONS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ARM_OPTIONS.java
index fe44661..a06df20 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ARM_OPTIONS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ARM_OPTIONS.java
@@ -9,11 +9,11 @@
*/
public class NET_ARM_OPTIONS extends NetSDKLib.SdkStructure {
/**
- * 情景模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_SCENE_MODE}
+ * 情景模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_SCENE_MODE}
*/
public int emSceneMode;
/**
- * 触发方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_AREAARM_TRIGGERMODE}
+ * 触发方式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_AREAARM_TRIGGERMODE}
*/
public int emAreaarmTriggerMode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BOAT_OBJECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BOAT_OBJECT.java
index c040138..4ef8c39 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BOAT_OBJECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BOAT_OBJECT.java
@@ -29,7 +29,7 @@
*/
public int nSpeed;
/**
- * 物体动作支持类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACTION}
+ * 物体动作支持类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACTION}
*/
public int emActionType;
/**
@@ -41,7 +41,7 @@
*/
public NetSDKLib.NET_RECT stuOriginalBoundingBox = new NetSDKLib.NET_RECT();
/**
- * 行驶方向 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_BOAT_DIRECTION}
+ * 行驶方向 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_BOAT_DIRECTION}
*/
public int emDirection;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BURN_PARAM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BURN_PARAM_INFO.java
index 8f4fbf4..1480b46 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BURN_PARAM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_BURN_PARAM_INFO.java
@@ -6,7 +6,7 @@
* @author 47081
* @version 1.0
* @description 刻录参数配置
- * 对应枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_BURN_PARAM}
+ * 对应枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_BURN_PARAM}
* @date 2020/11/10
*/
public class NET_BURN_PARAM_INFO extends NetSDKLib.SdkStructure {
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_CUSTOM_SNAP_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_CUSTOM_SNAP_INFO.java
index 495ad44..5ba70c9 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_CUSTOM_SNAP_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_CUSTOM_SNAP_INFO.java
@@ -19,7 +19,7 @@
*/
public NET_TIME stuSnapTime=new NET_TIME();
/**
-自定义抓图类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CUSTOM_SNAP_TYPE}
+自定义抓图类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CUSTOM_SNAP_TYPE}
*/
public int emCustomSnapType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_INFO.java
index 2115e7f..12c3b6c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_INFO.java
@@ -11,7 +11,7 @@
*/
public class NET_CB_THINGS_INFO extends NetSDKLib.SdkStructure {
/**
- * 订阅类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ATTACH_TOPICS}
+ * 订阅类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_ATTACH_TOPICS}
*/
public int emTopics;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_PROPER_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_PROPER_INFO.java
index c5ff761..b354b80 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_PROPER_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_THINGS_PROPER_INFO.java
@@ -18,7 +18,7 @@
*/
public byte[] szValue = new byte[256];
/**
- * szValue对应的类型；有int,bool,string类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
+ * szValue对应的类型；有int,bool,string类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
*/
public int emValueType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java
index 719c4cd..e01a6b0 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java
@@ -11,7 +11,7 @@
public class NET_CB_VIDEOSTAT_HEATMAP extends NetSDKLib.SdkStructure {
public int nToken;
/**
- * 热度图类型,对应枚举类型{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_HEATMAP_TYPE}
+ * 热度图类型,对应枚举类型{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_HEATMAP_TYPE}
*/
public int emHeatMapType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_STREAM.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_STREAM.java
index 958dcf2..3c48aed 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_STREAM.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CB_VIDEOSTAT_STREAM.java
@@ -29,7 +29,7 @@
*/
public byte[] szRuleType = new byte[32];
/**
- * 粒度 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_STAT_GRANULARITY}
+ * 粒度 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_STAT_GRANULARITY}
*/
public int emStatGranularity;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java
index 9241b65..13dcace 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java
@@ -8,7 +8,7 @@
* @author 47081
* @version 1.0
* @description 门禁假日计划配置
- * 对应枚举类型{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE}
+ * 对应枚举类型{@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE}
* @date 2020/10/19
*/
public class NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO extends NetSDKLib.SdkStructure {
@@ -22,7 +22,7 @@
*/
public boolean bSchdule;
/**
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} 配置的下标
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} 配置的下标
*/
public int nGroupNo;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java
index 30a3a93..7a06e47 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java
@@ -8,7 +8,7 @@
* @author 47081
* @version 1.0
* @description 门禁假日组配置,对应枚举 {@link
- * com.ruoyi.device.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP}
+ * com.ard.device.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP}
* @date 2020/10/19
*/
public class NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO extends NetSDKLib.SdkStructure {
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CONSUMPTION_STRATEGY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CONSUMPTION_STRATEGY_INFO.java
index ea3f3c8..2f6143f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CONSUMPTION_STRATEGY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CONSUMPTION_STRATEGY_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-消费模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_CONSUMPTION_MODE}
+消费模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_NET_CONSUMPTION_MODE}
*/
public int emMode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CUSTOMER_DEV_SETTING_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CUSTOMER_DEV_SETTING_INFO.java
index b9cd155..aeb1985 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CUSTOMER_DEV_SETTING_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_CUSTOMER_DEV_SETTING_INFO.java
@@ -13,7 +13,7 @@
*/
public int dwSize;
/**
- * 开门方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CUSTOMER_DEV_SETTING_DOOR_METHOD}
+ * 开门方式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CUSTOMER_DEV_SETTING_DOOR_METHOD}
*/
public int emDoorMethod;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_NAS_DIRECTORY.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_NAS_DIRECTORY.java
index aae3108..483da98 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_NAS_DIRECTORY.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_NAS_DIRECTORY.java
@@ -27,7 +27,7 @@
*/
public int nNASCfgRealNum;
/**
-获取到的配置信息指针, 需用户申请内存 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NAS_DIRECTORY_CFG_INFO}
+获取到的配置信息指针, 需用户申请内存 {@link com.ard.utils.sdk.dhsdk.lib.structure.NAS_DIRECTORY_CFG_INFO}
*/
public Pointer pNASDirectoryInfo;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_QR_CODE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_QR_CODE_INFO.java
index 2ffcb65..5d04df8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_QR_CODE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CFG_QR_CODE_INFO.java
@@ -6,7 +6,7 @@
* @author 119178
* @version 1.0
* @description 配置二维码有效时间
- * 对应枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_QR_CODE}
+ * 对应枚举{@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_QR_CODE}
* @date 2020/12/11
*/
public class NET_CFG_QR_CODE_INFO extends NetSDKLib.SdkStructure{
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE.java
index 7452649..af87f80 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE.java
@@ -10,7 +10,7 @@
*/
public class NET_CHANNELS_STATE extends NetSDKLib.SdkStructure {
/**
-通道类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CHANNELS_STATE_TYPE}
+通道类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CHANNELS_STATE_TYPE}
*/
public int emType;
/**
@@ -18,15 +18,15 @@
*/
public int nIndex;
/**
-在线状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DEV_STATUS}
+在线状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DEV_STATUS}
*/
public int emOnlineState;
/**
-报警状态，当emType为EM_CHANNELS_STATE_TYPE_ALARMIN时有效 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ZONE_STATUS}
+报警状态，当emType为EM_CHANNELS_STATE_TYPE_ALARMIN时有效 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ZONE_STATUS}
*/
public int emAlarmState;
/**
-输出状态，当emType为EM_CHANNELS_STATE_TYPE_ALARMOUT,EM_CHANNELS_STATE_TYPE_SIREN时有效 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OUTPUT_STATE}
+输出状态，当emType为EM_CHANNELS_STATE_TYPE_ALARMOUT,EM_CHANNELS_STATE_TYPE_SIREN时有效 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_OUTPUT_STATE}
*/
public int emOutputState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE_CONDITION.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE_CONDITION.java
index f4238bf..60a75a8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE_CONDITION.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CHANNELS_STATE_CONDITION.java
@@ -10,7 +10,7 @@
*/
public class NET_CHANNELS_STATE_CONDITION extends NetSDKLib.SdkStructure {
/**
-通道类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CHANNELS_STATE_TYPE}
+通道类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CHANNELS_STATE_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_COVER_PLATE_DETECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_COVER_PLATE_DETECT.java
index d1132f7..72d940d 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_COVER_PLATE_DETECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_COVER_PLATE_DETECT.java
@@ -10,7 +10,7 @@
*/
public class NET_COVER_PLATE_DETECT extends NetSDKLib.SdkStructure {
/**
-盖板状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_COVER_PLATE_STATE}
+盖板状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_COVER_PLATE_STATE}
*/
public int emCoverPlateState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_ACCESS_CALL_LIFT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_ACCESS_CALL_LIFT.java
index 64aef3c..44f672b 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_ACCESS_CALL_LIFT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_ACCESS_CALL_LIFT.java
@@ -24,11 +24,11 @@
*/
public byte[] szDestFloor=new byte[16];
/**
-呼叫电梯命令 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CALLLIFT_CMD}
+呼叫电梯命令 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CALLLIFT_CMD}
*/
public int emCallLiftCmd;
/**
-呼叫电梯的方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CALLLIFT_ACTION}
+呼叫电梯的方式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CALLLIFT_ACTION}
*/
public int emCallLiftAction;
/**
@@ -44,7 +44,7 @@
*/
public int[] nCallLiftNo=new int[16];
/**
-呼梯类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_LIFT_CALLER_TYPE}
+呼梯类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_LIFT_CALLER_TYPE}
*/
public int emLiftCaller;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_SET_BYPASS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_SET_BYPASS.java
index d3095dd..3a42202 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_SET_BYPASS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_CTRL_SET_BYPASS.java
@@ -21,7 +21,7 @@
public Pointer szDevPwd;
/**
- * 通道状态,参考枚举 { @link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_BYPASS_MODE}
+ * 通道状态,参考枚举 { @link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_BYPASS_MODE}
*/
public int emMode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DETECT_BIG_PIC_INFO_EX.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DETECT_BIG_PIC_INFO_EX.java
index 94b7a09..9926f26 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DETECT_BIG_PIC_INFO_EX.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DETECT_BIG_PIC_INFO_EX.java
@@ -47,11 +47,11 @@
*/
public byte[] szPath = new byte[256];
/**
- * 坐标系类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_COORDINATE_TYPE}
+ * 坐标系类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_COORDINATE_TYPE}
*/
public int emCoordinateType;
/**
- * 目标类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DETECT_OBJECT_TYPE}
+ * 目标类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DETECT_OBJECT_TYPE}
*/
public int emObjectType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_NET_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_NET_INFO.java
index 207f63f..306021f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_NET_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_NET_INFO.java
@@ -28,7 +28,7 @@
*/
public int nCellulIntensity;
/**
-有线网连接状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_ETH_STATE}
+有线网连接状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_ETH_STATE}
*/
public int emEthState;
/**
@@ -40,11 +40,11 @@
*/
public int n3GfluxByTime;
/**
-网络连接状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_ETH_STATE}
+网络连接状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_ETH_STATE}
*/
public int emWifiState;
/**
-蜂窝网络连接状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_ETH_STATE}
+蜂窝网络连接状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_ETH_STATE}
*/
public int emCellularstate;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_POWER_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_POWER_INFO.java
index 969d8c4..c0df8b3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_POWER_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_POWER_INFO.java
@@ -14,7 +14,7 @@
*/
public int nBatteryPercent;
/**
-供电类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_POWER_TYPE}
+供电类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_POWER_TYPE}
*/
public int emPowerType;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_SIM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_SIM_INFO.java
index d5dc168..07639f3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_SIM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEVSTATUS_SIM_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_DEVSTATUS_SIM_INFO extends NetSDKLib.SdkStructure {
/**
-SIM卡状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_SIM_STATE}
+SIM卡状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_SIM_STATE}
*/
public int emStatus;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CIGARETTE_CASE_DETECTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CIGARETTE_CASE_DETECTION_INFO.java
index 12402f5..f3febe7 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CIGARETTE_CASE_DETECTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CIGARETTE_CASE_DETECTION_INFO.java
@@ -34,7 +34,7 @@
*/
public double PTS;
/**
-智能事件所属大类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLASS_TYPE}
+智能事件所属大类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLASS_TYPE}
*/
public int emClassType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CROSSLINE_STAT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CROSSLINE_STAT_INFO.java
index dd1439e..c9313b9 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CROSSLINE_STAT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_CROSSLINE_STAT_INFO.java
@@ -54,7 +54,7 @@
*/
public int nAreaID;
/**
-绊线方向 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_STAT_DIRECTION}
+绊线方向 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_STAT_DIRECTION}
*/
public int emDirection;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_REGIONNUM_STAT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_REGIONNUM_STAT_INFO.java
index be5dd79..1dca7a8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_REGIONNUM_STAT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DEV_EVENT_REGIONNUM_STAT_INFO.java
@@ -54,7 +54,7 @@
*/
public int nAreaID;
/**
-绊线方向 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_STAT_DIRECTION}
+绊线方向 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_STAT_DIRECTION}
*/
public int emDirection;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DIAL_DETECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DIAL_DETECT.java
index 659fc3d..570f354 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DIAL_DETECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DIAL_DETECT.java
@@ -10,7 +10,7 @@
*/
public class NET_DIAL_DETECT extends NetSDKLib.SdkStructure {
/**
-表盘状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DIAL_STATE}
+表盘状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DIAL_STATE}
*/
public int emDialState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DOOR_DETECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DOOR_DETECT.java
index 7be0502..17918b1 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DOOR_DETECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_DOOR_DETECT.java
@@ -10,7 +10,7 @@
*/
public class NET_DOOR_DETECT extends NetSDKLib.SdkStructure {
/**
-箱门状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DOOR_STATE}
+箱门状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DOOR_STATE}
*/
public int emDoorState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EM_CFG_USER_PASS_DATA_COUNT_CLEAR_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EM_CFG_USER_PASS_DATA_COUNT_CLEAR_INFO.java
index ec46288..ba1470e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EM_CFG_USER_PASS_DATA_COUNT_CLEAR_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EM_CFG_USER_PASS_DATA_COUNT_CLEAR_INFO.java
@@ -18,7 +18,7 @@
*/
public int bEnable;
/**
- * 定期人数清除周期 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_USER_PASS_DATA_COUNT_CLEAR_PERIOD}
+ * 定期人数清除周期 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_USER_PASS_DATA_COUNT_CLEAR_PERIOD}
*/
public int emPeriod;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_COMPRESSION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_COMPRESSION_INFO.java
index 1cee75c..7e4eae3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_COMPRESSION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_COMPRESSION_INFO.java
@@ -12,7 +12,7 @@
public int dwSize;
public int bAudioEnable; // 音频使能
- /** 参考{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_FORMAT_TYPE}*/
+ /** 参考{@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_FORMAT_TYPE}*/
public int emFormatType; // 码流类型,设置和获取时都需要设置值
/** 参考{@link NetSDKLib.NET_EM_AUDIO_FORMAT} */
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_INFO.java
index ef50e2e..9dd9926 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_ENCODE_AUDIO_INFO.java
@@ -11,7 +11,7 @@
*/
public class NET_ENCODE_AUDIO_INFO extends NetSDKLib.SdkStructure{
public int dwSize;
- /** 参考{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_FORMAT_TYPE}*/
+ /** 参考{@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_FORMAT_TYPE}*/
public int emFormatType; // 码流类型,设置和获取时都需要设置值
public int nDepth; // 音频采样深度
public int nFrequency; // 音频采样频率
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EXTRA_PLATES.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EXTRA_PLATES.java
index 324d1bf..cf1f4fa 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EXTRA_PLATES.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_EXTRA_PLATES.java
@@ -22,11 +22,11 @@
*/
public byte[] szText=new byte[64];
/**
-车牌类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_PLATE_TYPE}
+车牌类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_NET_PLATE_TYPE}
*/
public int emCategory;
/**
-车牌颜色 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_PLATE_COLOR_TYPE}
+车牌颜色 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_NET_PLATE_COLOR_TYPE}
*/
public int emColor;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_FIREPROOF_CLOTHES.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_FIREPROOF_CLOTHES.java
index 58769f3..a2d1a20 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_FIREPROOF_CLOTHES.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_FIREPROOF_CLOTHES.java
@@ -9,11 +9,11 @@
*/
public class NET_FIREPROOF_CLOTHES extends NetSDKLib.SdkStructure {
/**
- * 是否穿着防火衣 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_FIREPROOF_CLOTHES_STATE}
+ * 是否穿着防火衣 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_FIREPROOF_CLOTHES_STATE}
*/
public int emHasFireProofClothes;
/**
- * 防火衣颜色 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLOTHES_COLOR}
+ * 防火衣颜色 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_CLOTHES_COLOR}
*/
public int emFireProofClothesColor;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_GLASSES_RELATED_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_GLASSES_RELATED_INFO.java
index ddc00c0..d865024 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_GLASSES_RELATED_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_GLASSES_RELATED_INFO.java
@@ -9,7 +9,7 @@
*/
public class NET_GLASSES_RELATED_INFO extends NetSDKLib.SdkStructure {
/**
- * 眼镜检测规则中报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GLASSES_RULE_TYPE}
+ * 眼镜检测规则中报警类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_GLASSES_RULE_TYPE}
*/
public int emGlassesType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_HISTORY_TRAFFIC_CAR_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_HISTORY_TRAFFIC_CAR_INFO.java
index f78b717..fcf9040 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_HISTORY_TRAFFIC_CAR_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_HISTORY_TRAFFIC_CAR_INFO.java
@@ -70,11 +70,11 @@
*/
public int nAnnualInspectionShape;
/**
- * 主驾驶遮阳板状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_SUNSHADE_STATE}
+ * 主驾驶遮阳板状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_SUNSHADE_STATE}
*/
public int emSunShade;
/**
- * 副驾驶遮阳板状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_SUNSHADE_STATE}
+ * 副驾驶遮阳板状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_SUNSHADE_STATE}
*/
public int emSubSeatSunShade;
/**
@@ -82,7 +82,7 @@
*/
public int nCardCount;
/**
- * 主驾驶安全带 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_SAFEBELT_STATE}
+ * 主驾驶安全带 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_SAFEBELT_STATE}
*/
public int emSafeBelt;
/**
@@ -102,7 +102,7 @@
*/
public int nSubSeatPeople;
/**
- * 副驾驶安全带 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_SAFEBELT_STATE}
+ * 副驾驶安全带 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_SAFEBELT_STATE}
*/
public int emSubSeatSafeBelt;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IMAGE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IMAGE_INFO.java
index fcd05f7..e3aaf09 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IMAGE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IMAGE_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_IMAGE_INFO extends NetSDKLib.SdkStructure {
/**
-图片类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PIC_TYPE}
+图片类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PIC_TYPE}
*/
public int emPicType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_INSULATOR_DETECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_INSULATOR_DETECT.java
index 641cf1b..632baa0 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_INSULATOR_DETECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_INSULATOR_DETECT.java
@@ -10,7 +10,7 @@
*/
public class NET_INSULATOR_DETECT extends NetSDKLib.SdkStructure {
/**
-绝缘子状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_INSULATOR_STATE}
+绝缘子状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_INSULATOR_STATE}
*/
public int emInsulatorState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ACCESSCONTROL_CAPTURE_CMD.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ACCESSCONTROL_CAPTURE_CMD.java
index 4e16a0d..088b60d 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ACCESSCONTROL_CAPTURE_CMD.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ACCESSCONTROL_CAPTURE_CMD.java
@@ -14,7 +14,7 @@
public int dwSize;
/**
* 采集类型 (EM_COLLECTION_TYPE已被使用)
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GATHER_TYPE}
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_GATHER_TYPE}
*/
public int emGathertype;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEOSTAT_STREAM.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEOSTAT_STREAM.java
index 462d2a4..7a0afbb 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEOSTAT_STREAM.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEOSTAT_STREAM.java
@@ -18,7 +18,7 @@
*/
public int nVideoChannel;
/**
- * 粒度 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_STAT_GRANULARITY}
+ * 粒度 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_STAT_GRANULARITY}
*/
public int emGranularity;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEO_STATISTICS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEO_STATISTICS.java
index f202ac3..e3e2323 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEO_STATISTICS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_ATTACH_VIDEO_STATISTICS.java
@@ -26,7 +26,7 @@
*/
public Pointer dwUser;
/**
- * 业务类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_VS_TYPE}
+ * 业务类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_VS_TYPE}
*/
public int emType;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREATE_TRANSMIT_TUNNEL.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREATE_TRANSMIT_TUNNEL.java
index 0d5d8ec..1c095af 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREATE_TRANSMIT_TUNNEL.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREATE_TRANSMIT_TUNNEL.java
@@ -13,11 +13,11 @@
*/
public int dwSize;
/**
-/< 代理类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRANSMIT_PROXY_TYPE }
+/< 代理类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_TRANSMIT_PROXY_TYPE }
*/
public int emProxyType;
/**
-/< 代理模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TRANSMIT_PROXY_MODE }
+/< 代理模式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_TRANSMIT_PROXY_MODE }
*/
public int emProxyMode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREAT_SUB_BUSINESS_MDL_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREAT_SUB_BUSINESS_MDL_INFO.java
index 238dd71..3ae1964 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREAT_SUB_BUSINESS_MDL_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_CREAT_SUB_BUSINESS_MDL_INFO.java
@@ -12,7 +12,7 @@
*/
public int dwSize;
/**
-/< 连接方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUBLINK_TYPE}
+/< 连接方式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SUBLINK_TYPE}
*/
public int emLinkType;
/**
@@ -25,7 +25,7 @@
public NET_DEV_NETWORK_INFO stuDevNetInfo=new NET_DEV_NETWORK_INFO();
/**
-连接模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUBLINK_MODE}
+连接模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SUBLINK_MODE}
*/
public int emLinkMode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_DOFIND_FACERECONGNITION_EX.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_DOFIND_FACERECONGNITION_EX.java
index 7fbc053..6ee2ea1 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_DOFIND_FACERECONGNITION_EX.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_DOFIND_FACERECONGNITION_EX.java
@@ -24,7 +24,7 @@
*/
public int nCount;
/**
- * 指定查询结果返回图片的格式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NEEDED_PIC_RETURN_TYPE}
+ * 指定查询结果返回图片的格式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_NEEDED_PIC_RETURN_TYPE}
*/
public int emDataType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_FACE_RECOGNITION_DETECT_MULTI_FACE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_FACE_RECOGNITION_DETECT_MULTI_FACE_INFO.java
index f503573..6b96b55 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_FACE_RECOGNITION_DETECT_MULTI_FACE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_FACE_RECOGNITION_DETECT_MULTI_FACE_INFO.java
@@ -31,7 +31,7 @@
*/
public int nBufferLen;
/**
- * 目标类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_OBJECT_TYPE}
+ * 目标类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_OBJECT_TYPE}
*/
public int emDetectObjType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_TEMPERATUREEX.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_TEMPERATUREEX.java
index c0a3e01..1ae6237 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_TEMPERATUREEX.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_TEMPERATUREEX.java
@@ -13,7 +13,7 @@
*/
public int dwSize;
/**
- * 温度类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TEMPERATUREEX_TYPE}
+ * 温度类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_TEMPERATUREEX_TYPE}
*/
public int emTemperatureType;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java
index 1651bcf..63dda1c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java
@@ -26,7 +26,7 @@
*/
public NET_TIME stuEndTime;
/**
- * Ai热度图类型,枚举值类型{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_HEATMAP_TYPE}
+ * Ai热度图类型,枚举值类型{@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_HEATMAP_TYPE}
*/
public int emHeatMapType;
public NET_IN_GET_VIDEOSTAT_HEATMAP(){
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYGRADE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYGRADE.java
index c21cce2..5cacdd3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYGRADE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYGRADE.java
@@ -12,7 +12,7 @@
/**
- * 危险物等级,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_DANGER_GRADE_TYPE }
+ * 危险物等级,参考枚举{@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_DANGER_GRADE_TYPE }
*/
public int emGrade; // 危险物等级
public int nCount; // 危险物数量
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYTYPE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYTYPE.java
index 1d62f77..2fb176a 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYTYPE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PACKAGE_STATISTICS_BYTYPE.java
@@ -10,7 +10,7 @@
public class NET_IN_PACKAGE_STATISTICS_BYTYPE extends NetSDKLib.SdkStructure{
/**
- * 危险物等级,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_INSIDE_OBJECT_TYPE }
+ * 危险物等级,参考枚举{@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_INSIDE_OBJECT_TYPE }
*/
public int emType; // 危险物类型
public int nCount; // 危险物数量
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PERSON_INFO_INPUT_RESULT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PERSON_INFO_INPUT_RESULT.java
index a38b3b6..a8b1f48 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PERSON_INFO_INPUT_RESULT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_PERSON_INFO_INPUT_RESULT.java
@@ -27,7 +27,7 @@
*/
public byte[] szCitizenID = new byte[64];
/**
- * 设备展示颜色 com.ruoyi.device.dhsdk.lib.enumeration.EM_SHOW_COLOR
+ * 设备展示颜色 com.ard.device.dhsdk.lib.enumeration.EM_SHOW_COLOR
*/
public int emColor;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_2DCODE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_2DCODE.java
index c822bfc..7661052 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_2DCODE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_2DCODE.java
@@ -17,7 +17,7 @@
public int dwSize;
/**
* 二维码类型,
- * 对应枚举类型{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_2DCODE_TYPE}
+ * 对应枚举类型{@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_2DCODE_TYPE}
*/
public int em2DCodeType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_ALARMMODE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_ALARMMODE.java
index c399e34..73a777e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_ALARMMODE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_ALARMMODE.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
- * 布撤防类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ARM_TYPE}
+ * 布撤防类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_ARM_TYPE}
*/
public int emArmType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_BYPASSMODE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_BYPASSMODE.java
index 1d929bb..3da381d 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_BYPASSMODE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_BYPASSMODE.java
@@ -18,7 +18,7 @@
*/
public byte[] szPwd = new byte[256];
/**
- * 旁路模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_BYPASSMODE_TYPE}
+ * 旁路模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_BYPASSMODE_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_EXAM_RECORDING_PLANS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_EXAM_RECORDING_PLANS.java
index a90aa0a..428a4e7 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_EXAM_RECORDING_PLANS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_EXAM_RECORDING_PLANS.java
@@ -19,7 +19,7 @@
*/
public int nPlansNum;
/**
-考试计划, 由用户申请和释放, 最大为1024个 {@link com.ruoyi.utils.sdk.dhsdk.lib.structure.NET_EXAM_RECORDING_PLAN_INFO}
+考试计划, 由用户申请和释放, 最大为1024个 {@link com.ard.utils.sdk.dhsdk.lib.structure.NET_EXAM_RECORDING_PLAN_INFO}
*/
public Pointer pstuPlans;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_OUTPUT_STATE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_OUTPUT_STATE.java
index 8b87b4b..1b88aa0 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_OUTPUT_STATE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_SET_OUTPUT_STATE.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
- * 输出类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OUTPUT_TYPE}
+ * 输出类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_OUTPUT_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_STARTMULTIFIND_FACERECONGNITION_EX.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_STARTMULTIFIND_FACERECONGNITION_EX.java
index 57b088a..6cff888 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_STARTMULTIFIND_FACERECONGNITION_EX.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_STARTMULTIFIND_FACERECONGNITION_EX.java
@@ -21,7 +21,7 @@
*/
public int nChannelCount;
/**
- * 搜索的目标类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_OBJECT_TYPE}
+ * 搜索的目标类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_OBJECT_TYPE}
*/
public int emObjectType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_START_REDIRECT_SERVICE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_START_REDIRECT_SERVICE.java
index 5278d7e..0ce9f9c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_START_REDIRECT_SERVICE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_START_REDIRECT_SERVICE.java
@@ -8,7 +8,7 @@
* @author 47081
* @version 1.0
* @description CLIENT_StartRedirectServiceEx接口输入参数, {@link
- * com.ruoyi.device.dhsdk.lib.NetSDKLib#CLIENT_StartRedirectServiceEx(Pointer, Pointer)}
+ * com.ard.device.dhsdk.lib.NetSDKLib#CLIENT_StartRedirectServiceEx(Pointer, Pointer)}
* @date 2021/3/13
*/
public class NET_IN_START_REDIRECT_SERVICE extends NetSDKLib.SdkStructure {
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_THINGS_ATTACH.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_THINGS_ATTACH.java
index 61d43b2..bfb2406 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_THINGS_ATTACH.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_THINGS_ATTACH.java
@@ -15,7 +15,7 @@
*/
public int dwSize;
/**
- * 订阅类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ATTACH_TOPICS}
+ * 订阅类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ATTACH_TOPICS}
*/
public int emTopics;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRAFFICSTARTFINDSTAT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRAFFICSTARTFINDSTAT.java
index 01c7a5a..3fa753f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRAFFICSTARTFINDSTAT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRAFFICSTARTFINDSTAT.java
@@ -47,11 +47,11 @@
public int nClassType;
/**
* 查询要求返回的统计信息粒度 默认按小时
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GRANULARITY_STARTFIND_TYPE}
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_GRANULARITY_STARTFIND_TYPE}
*/
public int emGranularity;
/**
- * 统计方向查询条件 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_STARTFIND_DIRECTION}
+ * 统计方向查询条件 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_STARTFIND_DIRECTION}
*/
public int emDirection;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRANSFER_SUBLINK_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRANSFER_SUBLINK_INFO.java
index b7d44d4..d2b5d79 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRANSFER_SUBLINK_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_TRANSFER_SUBLINK_INFO.java
@@ -12,7 +12,7 @@
*/
public int dwSize;
/**
-/< 连接方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUBLINK_TYPE }
+/< 连接方式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SUBLINK_TYPE }
*/
public int emLinkType;
/**
@@ -24,7 +24,7 @@
*/
public NET_LOCAL_SERVER_NET_INFO stuLoaclServerInfo=new NET_LOCAL_SERVER_NET_INFO();
/**
-连接模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUBLINK_MODE}
+连接模式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SUBLINK_MODE}
*/
public int emLinkMode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_WATERDATA_STAT_SERVER_GETDATA_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_WATERDATA_STAT_SERVER_GETDATA_INFO.java
index b36cb2b..1372106 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_WATERDATA_STAT_SERVER_GETDATA_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IN_WATERDATA_STAT_SERVER_GETDATA_INFO.java
@@ -18,7 +18,7 @@
*/
public int nTypeNum;
/**
-检测类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
+检测类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
*/
public int[] emType=new int[32];
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IVS_DIALRECOGNITION_RULE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IVS_DIALRECOGNITION_RULE_INFO.java
index f97a140..ae6b51c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IVS_DIALRECOGNITION_RULE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_IVS_DIALRECOGNITION_RULE_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_IVS_DIALRECOGNITION_RULE_INFO extends NetSDKLib.SdkStructure {
/**
-仪表类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DIALDETECT_TYPE}
+仪表类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DIALDETECT_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_APPEND_EXTENDED_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_APPEND_EXTENDED_INFO.java
index a65fe3f..21f63e1 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_APPEND_EXTENDED_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_APPEND_EXTENDED_INFO.java
@@ -13,7 +13,7 @@
*/
public int nToken;
/**
- * 人脸导入状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_FACE_APPEND_STATE}
+ * 人脸导入状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_FACE_APPEND_STATE}
*/
public int emState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_LEVEL_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_LEVEL_INFO.java
index 2870972..d6d596e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_LEVEL_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_MULTI_LEVEL_INFO.java
@@ -10,11 +10,11 @@
*/
public class NET_MULTI_LEVEL_INFO extends NetSDKLib.SdkStructure {
/**
-配置等级 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_XRAY_OBJECT_DETECT_CONFIG_LEVEL}
+配置等级 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_XRAY_OBJECT_DETECT_CONFIG_LEVEL}
*/
public int emLevel;
/**
-默认参考等级，该等级的默认配置与参考等级的默认配置一样 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_XRAY_OBJECT_DETECT_CONFIG_LEVEL}
+默认参考等级，该等级的默认配置与参考等级的默认配置一样 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_XRAY_OBJECT_DETECT_CONFIG_LEVEL}
*/
public int emDefaultReferenceLevel;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_NOTIFY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_NOTIFY_INFO.java
index 6230460..628d5d1 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_NOTIFY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_NOTIFY_INFO.java
@@ -9,7 +9,7 @@
*/
public class NET_NOTIFY_INFO extends NetSDKLib.SdkStructure {
/**
- * 通知类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_NOTIFY_TYPE}
+ * 通知类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_NOTIFY_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OPENDOOR_MATCHINFO_EX.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OPENDOOR_MATCHINFO_EX.java
index 69a41c7..7f40679 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OPENDOOR_MATCHINFO_EX.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OPENDOOR_MATCHINFO_EX.java
@@ -14,7 +14,7 @@
*/
public byte[] szUserNameEx = new byte[128];
/**
- * 语音类型 (医疗使用) {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CUSTOM_MEDICAL_VOICE_TYPE}
+ * 语音类型 (医疗使用) {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CUSTOM_MEDICAL_VOICE_TYPE}
*/
public int emVoiceType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_CREATE_TRANSMIT_TUNNEL.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_CREATE_TRANSMIT_TUNNEL.java
index fefa196..e88d704 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_CREATE_TRANSMIT_TUNNEL.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_CREATE_TRANSMIT_TUNNEL.java
@@ -15,7 +15,7 @@
*/
public int nPort;
/**
- * 私有web代理访问协议 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WEB_TUNNEL_PROTOCOL}
+ * 私有web代理访问协议 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_WEB_TUNNEL_PROTOCOL}
*/
public int emWebProtocol;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_DYNAMIC_LOCK_RANDOM_PUBLICKEY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_DYNAMIC_LOCK_RANDOM_PUBLICKEY_INFO.java
index a18969c..2402098 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_DYNAMIC_LOCK_RANDOM_PUBLICKEY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_DYNAMIC_LOCK_RANDOM_PUBLICKEY_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-动态密码锁错误码 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
+动态密码锁错误码 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
*/
public int emErrorCode;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_FILE_INFO_BY_PATH_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_FILE_INFO_BY_PATH_INFO.java
index 714f46c..e151547 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_FILE_INFO_BY_PATH_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_FILE_INFO_BY_PATH_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
- 文件上传状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_FILE_UPDATE_STATE}
+ 文件上传状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_FILE_UPDATE_STATE}
*/
public int emState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_VAULTDOOR_STATE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_VAULTDOOR_STATE_INFO.java
index 0c9328b..80024ce 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_VAULTDOOR_STATE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_GET_VAULTDOOR_STATE_INFO.java
@@ -14,11 +14,11 @@
*/
public int dwSize;
/**
-锁状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_VAULT_LOCKSTATE}
+锁状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_VAULT_LOCKSTATE}
*/
public int emLockState;
/**
-门状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_VAULT_DOORSTATE}
+门状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_VAULT_DOORSTATE}
*/
public int emDoorState;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_MULTI_APPEND_TO_VEHICLE_REG_DB.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_MULTI_APPEND_TO_VEHICLE_REG_DB.java
index 22b2501..a48b66b 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_MULTI_APPEND_TO_VEHICLE_REG_DB.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_MULTI_APPEND_TO_VEHICLE_REG_DB.java
@@ -14,7 +14,7 @@
public int dwSize; // 结构体大小
public int nErrCodeNum; // 错误码个数
public int nRetErrCodeNum; // 返回的错误码数量
- /** {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_VEHICLE_REG_DB_OPERATOR_ERRCODE} */
+ /** {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_VEHICLE_REG_DB_OPERATOR_ERRCODE} */
public Pointer emErrCode=new Memory(1000*4); // 错误码信息 要求：实现VehicleRegisterDB.multiAppend +vehicle object[1000] 数组定1000
// public int[] emErrCode=new int[1000];
public NET_OUT_MULTI_APPEND_TO_VEHICLE_REG_DB(){
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_NAS_DIRECTORY_GET_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_NAS_DIRECTORY_GET_INFO.java
index 1954a7a..0249e35 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_NAS_DIRECTORY_GET_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_NAS_DIRECTORY_GET_INFO.java
@@ -22,7 +22,7 @@
*/
public int nTotalSpace;
/**
-NAS状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NAS_STATE_TYPE}
+NAS状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_NAS_STATE_TYPE}
*/
public int emState;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java
index c69e63e..4979bbd 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java
@@ -18,7 +18,7 @@
*/
public boolean bContinue2Upload;
/**
- * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_REASON_TYPE}
+ * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_REASON_TYPE}
*/
public int emType;
public NET_OUT_PRE_UPLOAD_REMOTE_FILE(){
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETCAPS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETCAPS.java
index 9ca6e3b..0eb64a4 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETCAPS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETCAPS.java
@@ -50,11 +50,11 @@
*/
public NET_RADAR_PROTOCAL_CAP stuProtocalCap = new NET_RADAR_PROTOCAL_CAP();
/**
- * 雷达探测范围形状 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_GETCAPS_AREASUB_TYPE}
+ * 雷达探测范围形状 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_GETCAPS_AREASUB_TYPE}
*/
public int emAreaSubType;
/**
- * 雷达类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_GETCAPS_RADAR_TYPE}
+ * 雷达类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_GETCAPS_RADAR_TYPE}
*/
public int emRadarType;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETSTATUS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETSTATUS.java
index 354259c..7634811 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETSTATUS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_RADAR_GETSTATUS.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
- * 雷达状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_STATUS}
+ * 雷达状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_RADAR_STATUS}
*/
public int emRadarStatus;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_COMMUNICATIONKEY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_COMMUNICATIONKEY_INFO.java
index d98d1de..26a5973 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_COMMUNICATIONKEY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_COMMUNICATIONKEY_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-动态密码锁错误码 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
+动态密码锁错误码 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
*/
public int emErrorCode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPENKEY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPENKEY_INFO.java
index 8450bc7..568696e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPENKEY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPENKEY_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-动态密码锁错误码 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
+动态密码锁错误码 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
*/
public int emErrorCode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPEN_CODE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPEN_CODE_INFO.java
index 72b58ec..e21bc8c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPEN_CODE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_OPEN_CODE_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-动态密码锁错误码 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
+动态密码锁错误码 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
*/
public int emErrorCode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_TEMP_USERID_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_TEMP_USERID_INFO.java
index a677cd0..146376c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_TEMP_USERID_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_SET_DYNAMIC_LOCK_TEMP_USERID_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-动态密码锁错误码 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
+动态密码锁错误码 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DYNAMIC_LOCK_ERRORCODE}
*/
public int emErrorCode;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_THINGS_GET_NETSTATE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_THINGS_GET_NETSTATE.java
index f81e90e..1b8c306 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_THINGS_GET_NETSTATE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_THINGS_GET_NETSTATE.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
- * 设备连接状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_CONNECT_STATE}
+ * 设备连接状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_THINGS_CONNECT_STATE}
*/
public int emConnectState;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_UNIFIEDINFOCOLLECT_GET_DEVSTATUS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_UNIFIEDINFOCOLLECT_GET_DEVSTATUS.java
index d1affc6..f7c50d8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_UNIFIEDINFOCOLLECT_GET_DEVSTATUS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_UNIFIEDINFOCOLLECT_GET_DEVSTATUS.java
@@ -26,7 +26,7 @@
*/
public byte[] szVersion=new byte[32];
/**
-主机防拆状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_TAMPER_STATE}
+主机防拆状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_TAMPER_STATE}
*/
public int emTamperState;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETCAPS_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETCAPS_INFO.java
index 2f266a2..9213764 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETCAPS_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETCAPS_INFO.java
@@ -14,11 +14,11 @@
*/
public int dwSize;
/**
-当前是否具备水质检测功能 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATERDATA_STAT_SERVER_SUPPORT}
+当前是否具备水质检测功能 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_WATERDATA_STAT_SERVER_SUPPORT}
*/
public int emSupport;
/**
-是否支持本地存储 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUPPORT_LOCALDATA_STORE}
+是否支持本地存储 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SUPPORT_LOCALDATA_STORE}
*/
public int emSupportLocalDataStore;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETDATA_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETDATA_INFO.java
index 95cfa08..7d48267 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETDATA_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_OUT_WATERDATA_STAT_SERVER_GETDATA_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-水质类别，越小越好 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATER_QUALITY}
+水质类别，越小越好 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_WATER_QUALITY}
*/
public int emQuality;
/**
@@ -26,7 +26,7 @@
*/
public int nFlunkTypeNum;
/**
-参数超过阈值类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
+参数超过阈值类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
*/
public int[] emFlunkType=new int[32];
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PERSON_FREQUENCY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PERSON_FREQUENCY_INFO.java
index 5b3e935..821dabc 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PERSON_FREQUENCY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PERSON_FREQUENCY_INFO.java
@@ -11,7 +11,7 @@
public class NET_PERSON_FREQUENCY_INFO extends NetSDKLib.SdkStructure {
/**
- * ,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_FREQUENCY_ALARM_TYPE}
+ * ,参考枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_FREQUENCY_ALARM_TYPE}
*/
public int emAlarmType; // 报警类型
public int nTimes; // 频次
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRESSING_PLATE_DETECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRESSING_PLATE_DETECT.java
index 8cbe0ff..8a8b3ed 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRESSING_PLATE_DETECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRESSING_PLATE_DETECT.java
@@ -10,7 +10,7 @@
*/
public class NET_PRESSING_PLATE_DETECT extends NetSDKLib.SdkStructure {
/**
-压板状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PRESSING_PLATE_STATE}
+压板状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_PRESSING_PLATE_STATE}
*/
public int emPressingPlateState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_CAPS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_CAPS.java
index d25f629..5e0df88 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_CAPS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_CAPS.java
@@ -13,7 +13,7 @@
*/
public int bSupport;
/**
- * 隐私遮档版本号 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PRIVACY_MASKING_VERSION}
+ * 隐私遮档版本号 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PRIVACY_MASKING_VERSION}
*/
public int emVersion;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_INFO.java
index 4f94042..3941026 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PRIVACY_MASKING_INFO.java
@@ -22,7 +22,7 @@
public byte[] szName = new byte[64];
/**
* 形状类型为矩形，Rect项有效(默认),形状类型为多边形，此时Polygon有效
- * {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PRIVACY_MASKING_TYPE}
+ * {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PRIVACY_MASKING_TYPE}
*/
public int emShapeType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROHELMET_ATTRIBUTE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROHELMET_ATTRIBUTE.java
index 67d9b4e..49a0c4b 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROHELMET_ATTRIBUTE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROHELMET_ATTRIBUTE.java
@@ -9,11 +9,11 @@
*/
public class NET_PROHELMET_ATTRIBUTE extends NetSDKLib.SdkStructure {
/**
- * 是否有戴防护面罩 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WEARING_STATE}
+ * 是否有戴防护面罩 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_WEARING_STATE}
*/
public int emHasHat;
/**
- * 帽子颜色 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CLOTHES_COLOR}
+ * 帽子颜色 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CLOTHES_COLOR}
*/
public int emHatColor;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROJECT_TASK.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROJECT_TASK.java
index 2fd142e..626d2c6 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROJECT_TASK.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROJECT_TASK.java
@@ -8,7 +8,7 @@
public byte[] szTaskName = new byte[260]; // 任务名称Ansi编码
public CFG_TIME_SECTION[] Section=(CFG_TIME_SECTION[])new CFG_TIME_SECTION().toArray(7); // 任务时间段
public int bIsCycle; // 任务是否循环,TRUE表示循环,FALSE表示不循环
- /** {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_VIDEODIAGNOSIS_PROJECT_TASK_TYPE} */
+ /** {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_VIDEODIAGNOSIS_PROJECT_TASK_TYPE} */
public int emTaskType; // 任务类型
public int bIsRepeat; // 任务是否重复执行，（跨天/周是否重复执行）
public int nCycleInterval; // 任务循环间隔，单位秒
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROPERTIES_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROPERTIES_INFO.java
index 1728cda..ad4098c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROPERTIES_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PROPERTIES_INFO.java
@@ -18,7 +18,7 @@
*/
public byte[] szValue = new byte[256];
/**
- * szValue对应的类型；有int,bool,string类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
+ * szValue对应的类型；有int,bool,string类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
*/
public int emValueType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PTZ_MOVING_DETECTIONRESULT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PTZ_MOVING_DETECTIONRESULT.java
index 9d928db..cf8f808 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PTZ_MOVING_DETECTIONRESULT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PTZ_MOVING_DETECTIONRESULT.java
@@ -14,27 +14,27 @@
*/
public int dwSize;
/**
-向上运动检测结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
+向上运动检测结果 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
*/
public int emPTZMovingUp;
/**
-向下运动检测结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
+向下运动检测结果 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
*/
public int emPTZMovingDown;
/**
-向左运动检测结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
+向左运动检测结果 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
*/
public int emPTZMovingLeft;
/**
-向右运动检测结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
+向右运动检测结果 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
*/
public int emPTZMovingRight;
/**
-变倍(大)运动检测结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
+变倍(大)运动检测结果 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
*/
public int emPTZMovingZoomWide;
/**
-变倍(小)运动检测结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
+变倍(小)运动检测结果 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PTZ_MOVING_RESULT_TYPE}
*/
public int emPTZMovingZoomTele;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PUSH_PICFILE_BYRULE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PUSH_PICFILE_BYRULE_INFO.java
index 1cdc4ad..db3bf2c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PUSH_PICFILE_BYRULE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_PUSH_PICFILE_BYRULE_INFO.java
@@ -14,7 +14,7 @@
*/
public int dwSize;
/**
-智能任务启动规则 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ANALYSE_TASK_START_RULE}
+智能任务启动规则 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ANALYSE_TASK_START_RULE}
*/
public int emStartRule;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RECORD_ACCESS_CTL_CONSUMPTION_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RECORD_ACCESS_CTL_CONSUMPTION_INFO.java
index 89c4f12..ab98236 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RECORD_ACCESS_CTL_CONSUMPTION_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RECORD_ACCESS_CTL_CONSUMPTION_INFO.java
@@ -34,7 +34,7 @@
*/
public byte[] szCardName=new byte[128];
/**
-卡类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESSCTLCARD_TYPE}
+卡类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESSCTLCARD_TYPE}
*/
public int emCardType;
/**
@@ -42,15 +42,15 @@
*/
public byte[] szUserID=new byte[12];
/**
-事件类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ENUM_DIRECTION_ACCESS_CTL}
+事件类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ENUM_DIRECTION_ACCESS_CTL}
*/
public int emType;
/**
-消费结果 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CONSUMPTION_STATUS}
+消费结果 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_CONSUMPTION_STATUS}
*/
public int emStatus;
/**
-开门方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESS_DOOROPEN_METHOD}
+开门方式 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.NET_ACCESS_DOOROPEN_METHOD}
*/
public int emMethod;
/**
@@ -111,7 +111,7 @@
*/
public byte[] szSnapFaceURL=new byte[128];
/**
-记录类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CONSUMPTION_RECORD_TYPE}
+记录类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_CONSUMPTION_RECORD_TYPE}
*/
public int emRecordType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java
index 3d187d0..3dec345 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java
@@ -9,7 +9,7 @@
* @date 2021/2/8
*/
public class NET_REMAIN_ANALYSE_TOTAL_CAPACITY extends NetSDKLib.SdkStructure {
- /** 业务大类{@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_SCENE_CLASS_TYPE} */
+ /** 业务大类{@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_SCENE_CLASS_TYPE} */
public int emClassType;
/** 任务调度总共能分析的视频流数目 */
public int nNumber;
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMOTE_STREAM_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMOTE_STREAM_INFO.java
index f0b1226..c319e92 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMOTE_STREAM_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_REMOTE_STREAM_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_REMOTE_STREAM_INFO extends NetSDKLib.SdkStructure {
/**
-视频流协议类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.EM_STREAM_PROTOCOL_TYPE}
+视频流协议类型 {@link com.ard.utils.sdk.dhsdk.lib.NetSDKLib.EM_STREAM_PROTOCOL_TYPE}
*/
public int emStreamProtocolType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RESPIRATOR_DETECT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RESPIRATOR_DETECT.java
index d11e865..8336a29 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RESPIRATOR_DETECT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RESPIRATOR_DETECT.java
@@ -10,7 +10,7 @@
*/
public class NET_RESPIRATOR_DETECT extends NetSDKLib.SdkStructure {
/**
-呼吸器状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RESPIRATOR_STATE}
+呼吸器状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_RESPIRATOR_STATE}
*/
public int emRespiratorState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RFIDELETAG_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RFIDELETAG_INFO.java
index 132d571..5115ab6 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RFIDELETAG_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_RFIDELETAG_INFO.java
@@ -18,7 +18,7 @@
*/
public int nCardType;
/**
-卡号省份 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CARD_PROVINCE}
+卡号省份 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CARD_PROVINCE}
*/
public int emCardPrivince;
/**
@@ -30,7 +30,7 @@
*/
public byte[] szProductionDate=new byte[16];
/**
-车辆类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CAR_TYPE}
+车辆类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CAR_TYPE}
*/
public int emCarType;
/**
@@ -46,7 +46,7 @@
*/
public int nAntennaID;
/**
-号牌种类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PLATE_TYPE}
+号牌种类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PLATE_TYPE}
*/
public int emPlateType;
/**
@@ -62,7 +62,7 @@
*/
public int nMandatoryRetirement;
/**
-车身颜色 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_CAR_COLOR_TYPE}
+车身颜色 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_CAR_COLOR_TYPE}
*/
public int emCarColor;
/**
@@ -78,7 +78,7 @@
*/
public NET_TIME_EX stuThroughTime=new NET_TIME_EX();
/**
-使用性质 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_USE_PROPERTY_TYPE}
+使用性质 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_USE_PROPERTY_TYPE}
*/
public int emUseProperty;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SECURITYGATE_ALARM_FACE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SECURITYGATE_ALARM_FACE_INFO.java
index 9509633..4b1c9ae 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SECURITYGATE_ALARM_FACE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SECURITYGATE_ALARM_FACE_INFO.java
@@ -11,17 +11,17 @@
public class NET_SECURITYGATE_ALARM_FACE_INFO extends NetSDKLib.SdkStructure{
/**
- * 性别,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_SEX_TYPE }
+ * 性别,参考枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SECURITYGATE_SEX_TYPE }
*/
public int emSex; // 性别
public int nAge; // 年龄
/**
- * 人脸表情,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_EXPRESSION_TYPE }
+ * 人脸表情,参考枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SECURITYGATE_EXPRESSION_TYPE }
*/
public int emEmotion; // 人脸表情
/**
- * 是否戴眼镜,参考枚举{@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SECURITYGATE_GLASSES_TYPE }
+ * 是否戴眼镜,参考枚举{@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SECURITYGATE_GLASSES_TYPE }
*/
public int emGlasses; // 是否戴眼镜
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_CLOTHES.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_CLOTHES.java
index c1ca744..4b7b9d3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_CLOTHES.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_CLOTHES.java
@@ -10,8 +10,8 @@
*/
public class NET_SMART_KITCHEN_CLOTHES_CHEF_CLOTHES extends NetSDKLib.SdkStructure{
public int bChefClothes; // 厨师服相关属性是否生效，true 生效 ，false 不生效
- public int[] emHasChefClothes=new int[3]; /** 是否有带厨师服 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
- public int[] emChefClothesColor=new int[3]; /** 厨师服颜色 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_COLOUR} */
+ public int[] emHasChefClothes=new int[3]; /** 是否有带厨师服 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
+ public int[] emChefClothesColor=new int[3]; /** 厨师服颜色 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_COLOUR} */
public byte[] byReserved=new byte[1024]; // 预留字段
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_HAT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_HAT.java
index b7f3b93..8ddc536 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_HAT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_HAT.java
@@ -11,6 +11,6 @@
public class NET_SMART_KITCHEN_CLOTHES_CHEF_HAT extends NetSDKLib.SdkStructure{
public int bChefHat; // 厨师帽相关属性是否生效，true 生效 ，false 不生效
- public int[] emHasChefHat=new int[3]; /** 是否有带厨师帽 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
+ public int[] emHasChefHat=new int[3]; /** 是否有带厨师帽 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
public byte[] byReserved=new byte[1024]; // 预留字段
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_MASK.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_MASK.java
index 8f71329..7852750 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_MASK.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SMART_KITCHEN_CLOTHES_CHEF_MASK.java
@@ -10,7 +10,7 @@
*/
public class NET_SMART_KITCHEN_CLOTHES_CHEF_MASK extends NetSDKLib.SdkStructure {
public int bChefMask; // 口罩相关属性是否生效，true 生效 ，false 不生效
- public int[] emHasMask=new int[3]; /** 是否有带口罩 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
+ public int[] emHasMask=new int[3]; /** 是否有带口罩 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SMART_KITCHEN_CLOTHES_STATE} */
public byte[] byReserved=new byte[1024]; // 预留字段
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_START_FIND_WATERDATA_CONDITION.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_START_FIND_WATERDATA_CONDITION.java
index 2c93f2e..44873b2 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_START_FIND_WATERDATA_CONDITION.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_START_FIND_WATERDATA_CONDITION.java
@@ -14,7 +14,7 @@
*/
public NET_TIME_EX stuStartTime=new NET_TIME_EX();
/**
-检测类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
+检测类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_WATER_DETECTION_ALARM_TYPE}
*/
public int[] emType=new int[32];
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SUBLINK_SERVER_CALLBACK.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SUBLINK_SERVER_CALLBACK.java
index ac3bc73..7b9c2b2 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SUBLINK_SERVER_CALLBACK.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_SUBLINK_SERVER_CALLBACK.java
@@ -9,7 +9,7 @@
*/
public class NET_SUBLINK_SERVER_CALLBACK extends NetSDKLib.SdkStructure {
/**
-/< 子连接状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SUBLINK_STATE }
+/< 子连接状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SUBLINK_STATE }
*/
public int emSubLinkState;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TEMPERATUREEX_VALUE.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TEMPERATUREEX_VALUE.java
index 65b7fe3..41e873e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TEMPERATUREEX_VALUE.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TEMPERATUREEX_VALUE.java
@@ -9,7 +9,7 @@
*/
public class NET_TEMPERATUREEX_VALUE extends NetSDKLib.SdkStructure {
/**
- * 温度类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TEMPERATUREEX_TYPE}
+ * 温度类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TEMPERATUREEX_TYPE}
*/
public int emTemperatureType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_HISTORYDATA_PROPER_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_HISTORYDATA_PROPER_INFO.java
index 6108ac2..fc9c28e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_HISTORYDATA_PROPER_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_HISTORYDATA_PROPER_INFO.java
@@ -18,7 +18,7 @@
*/
public byte[] szValue = new byte[256];
/**
- * szValue对应的类型；有int,bool,string类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
+ * szValue对应的类型；有int,bool,string类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
*/
public int emValueType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_ACTION_SETPROPERTY.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_ACTION_SETPROPERTY.java
index 97a4525..1f70c05 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_ACTION_SETPROPERTY.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_ACTION_SETPROPERTY.java
@@ -26,7 +26,7 @@
*/
public byte[] szPropertyValue=new byte[32];
/**
-属性值类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
+属性值类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
*/
public int emPropertyValueType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_CONDITION_PROPERTY.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_CONDITION_PROPERTY.java
index 23e711f..6f0da8c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_CONDITION_PROPERTY.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_CONDITION_PROPERTY.java
@@ -30,7 +30,7 @@
*/
public byte[] szCompareValue=new byte[32];
/**
-对比值类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
+对比值类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
*/
public int emCompareValueType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_PROPERTY.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_PROPERTY.java
index 0a4e2b1..af2d5f8 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_PROPERTY.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_PROPERTY.java
@@ -30,7 +30,7 @@
*/
public byte[] szCompareValue = new byte[32];
/**
- * 对比值类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
+ * 对比值类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_PROPERTIES_VALUE_TYPE}
*/
public int emCompareValueType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_TIMER.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_TIMER.java
index 00174e5..2d6308f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_TIMER.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_RULECONTENT_TRIGGER_TIMER.java
@@ -14,7 +14,7 @@
*/
public NET_THINGS_TRIGGER_TIMER_CORN stuCron=new NET_THINGS_TRIGGER_TIMER_CORN();
/**
-Corn表达式类 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_TRIGGER_TIMER_CORN_TYPE}
+Corn表达式类 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_THINGS_TRIGGER_TIMER_CORN_TYPE}
*/
public int emCronType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_CURRENTSTATUSGET_STATUS.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_CURRENTSTATUSGET_STATUS.java
index b1dedd1..59a4d5b 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_CURRENTSTATUSGET_STATUS.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_CURRENTSTATUSGET_STATUS.java
@@ -14,7 +14,7 @@
*/
public byte[] szDeviceID = new byte[64];
/**
- * 报警状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_CURRENTSTATUSGET_STATUS}
+ * 报警状态 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_CURRENTSTATUSGET_STATUS}
*/
public int emStatus;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_QUERULE_RULECONTENT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_QUERULE_RULECONTENT.java
index d7c1952..942cc52 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_QUERULE_RULECONTENT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_QUERULE_RULECONTENT.java
@@ -11,7 +11,7 @@
*/
public class NET_THINGS_SERVICE_QUERULE_RULECONTENT extends NetSDKLib.SdkStructure {
/**
- * 场景规则类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_RULECONTENT_TYPE}
+ * 场景规则类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_THINGS_RULECONTENT_TYPE}
*/
public int emRuleContentType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT.java
index bfc0327..bd95eb6 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT.java
@@ -11,7 +11,7 @@
*/
public class NET_THINGS_SERVICE_RULECONTENT extends NetSDKLib.SdkStructure {
/**
- * 场景规则类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_RULECONTENT_TYPE}
+ * 场景规则类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_THINGS_RULECONTENT_TYPE}
*/
public int emRuleContentType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_ACTION.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_ACTION.java
index f474f8f..12e473a 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_ACTION.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_ACTION.java
@@ -10,7 +10,7 @@
*/
public class NET_THINGS_SERVICE_RULECONTENT_ACTION extends NetSDKLib.SdkStructure {
/**
- * 场景触发执行动作类型,见EM_THINGS_ACTION_TYPE {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_ACTION_TYPE}
+ * 场景触发执行动作类型,见EM_THINGS_ACTION_TYPE {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_ACTION_TYPE}
*/
public int emActionUri;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_CONDITION.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_CONDITION.java
index 87ba688..c05ce9d 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_CONDITION.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_CONDITION.java
@@ -10,7 +10,7 @@
*/
public class NET_THINGS_SERVICE_RULECONTENT_CONDITION extends NetSDKLib.SdkStructure {
/**
- * 场景触发过滤条件类型,见EM_THINGS_CONDITION_TYPE {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_CONDITION_TYPE}
+ * 场景触发过滤条件类型,见EM_THINGS_CONDITION_TYPE {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_CONDITION_TYPE}
*/
public int emConditionUri;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_TRIGGER.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_TRIGGER.java
index 2d5614f..9efcf46 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_TRIGGER.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_THINGS_SERVICE_RULECONTENT_TRIGGER.java
@@ -10,7 +10,7 @@
*/
public class NET_THINGS_SERVICE_RULECONTENT_TRIGGER extends NetSDKLib.SdkStructure {
/**
- * 场景的触发类型,见EM_THINGS_TRIGGER_TYPE {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_TRIGGER_TYPE}
+ * 场景的触发类型,见EM_THINGS_TRIGGER_TYPE {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_THINGS_TRIGGER_TYPE}
*/
public int emUri;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TRAFFIC_LATTICE_SCREEN_LOGO_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TRAFFIC_LATTICE_SCREEN_LOGO_INFO.java
index 5b46af0..db7b069 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TRAFFIC_LATTICE_SCREEN_LOGO_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_TRAFFIC_LATTICE_SCREEN_LOGO_INFO.java
@@ -10,6 +10,6 @@
*/
public class NET_TRAFFIC_LATTICE_SCREEN_LOGO_INFO extends NetSDKLib.SdkStructure {
- public int emLogoType; /** LOGO类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_LATTICE_SCREEN_LOGO_TYPE} */
+ public int emLogoType; /** LOGO类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.NET_EM_LATTICE_SCREEN_LOGO_TYPE} */
public byte[] szContent=new byte[128]; // emLogoType为文字时，为文字内容;emLogoType为图片时，为图片名称
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_UPDATE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_UPDATE_INFO.java
index 16d0728..bbd3d96 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_UPDATE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_UPDATE_INFO.java
@@ -9,7 +9,7 @@
*/
public class NET_UPDATE_INFO extends NetSDKLib.SdkStructure {
/**
- * 更新类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_UPDATE_TYPE}
+ * 更新类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_UPDATE_TYPE}
*/
public int emType;
/**
@@ -17,11 +17,11 @@
*/
public byte[] szName = new byte[32];
/**
- * 更新前的车位类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SPACE_TYPE}
+ * 更新前的车位类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SPACE_TYPE}
*/
public int emBeforeUpdateType;
/**
- * 更新后的车位类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SPACE_TYPE}
+ * 更新后的车位类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SPACE_TYPE}
*/
public int emAfterUpdateType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VAOBJECT_ANIMAL_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VAOBJECT_ANIMAL_INFO.java
index ad213d3..9bbaf58 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VAOBJECT_ANIMAL_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VAOBJECT_ANIMAL_INFO.java
@@ -14,7 +14,7 @@
*/
public int nObjectID;
/**
-智慧养殖检测目标子类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_BREED_DETECT_CATEGORY_TYPE}
+智慧养殖检测目标子类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_BREED_DETECT_CATEGORY_TYPE}
*/
public int emCategoryType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_INTELLIPARKING.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_INTELLIPARKING.java
index 6abcb31..3d73c4f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_INTELLIPARKING.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_INTELLIPARKING.java
@@ -21,7 +21,7 @@
*/
public int nPtzPresetId;
/**
- * 数据类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_INTELLIPARKING_DATA_TYPE}
+ * 数据类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_INTELLIPARKING_DATA_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_STEREO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_STEREO.java
index 7197d40..eccd775 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_STEREO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_STEREO.java
@@ -21,7 +21,7 @@
*/
public int nPtzPresetId;
/**
- * 数据类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_VS_DATA_TYPE}
+ * 数据类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.NET_EM_VS_DATA_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_TANK_CAPACITY_DETECTION.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_TANK_CAPACITY_DETECTION.java
index 4d8c5fd..862f1d4 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_TANK_CAPACITY_DETECTION.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VIDEOSTAT_SUMMARY_TANK_CAPACITY_DETECTION.java
@@ -13,7 +13,7 @@
*/
public int nChannelID;
/**
- * 贮柜当前状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_TANK_STATUS}
+ * 贮柜当前状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_TANK_STATUS}
*/
public int emTankStatus;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VKINFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VKINFO.java
index 9f83092..03e8ab0 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VKINFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_VKINFO.java
@@ -17,7 +17,7 @@
*/
public byte[] szVK = new byte[128];
/**
- * 加密算法类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ALGORITHM_TYPE}
+ * 加密算法类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ALGORITHM_TYPE}
*/
public int emAlgorithmType;
/**
@@ -29,11 +29,11 @@
*/
public int nRetVKLen;
/**
- * 是否加密 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_IS_ENCRYPT}
+ * 是否加密 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_IS_ENCRYPT}
*/
public int emIsEncrypt;
/**
- * 是否是当前VK 0 ：未知，1：当前， 2：之前 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_IS_CURRENT_VK}
+ * 是否是当前VK 0 ：未知，1：当前， 2：之前 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_IS_CURRENT_VK}
*/
public int emIsCurrent;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATERDATA_STAT_SERVER_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATERDATA_STAT_SERVER_INFO.java
index 83ab1f6..4fe04a4 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATERDATA_STAT_SERVER_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATERDATA_STAT_SERVER_INFO.java
@@ -14,7 +14,7 @@
*/
public NET_TIME_EX stuStartTime=new NET_TIME_EX();
/**
-水质类别 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WATER_QUALITY}
+水质类别 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_WATER_QUALITY}
*/
public int emQuality;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATER_DETECTION_UPLOAD_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATER_DETECTION_UPLOAD_INFO.java
index 0cb68b8..d0db8e3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATER_DETECTION_UPLOAD_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WATER_DETECTION_UPLOAD_INFO.java
@@ -70,7 +70,7 @@
*/
public float fTSI;
/**
-黑臭等级 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_SMELLY_LEVEL}
+黑臭等级 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_SMELLY_LEVEL}
*/
public int emSmellyLevel;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WIEGAND_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WIEGAND_INFO.java
index 9fded75..a58f8e2 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WIEGAND_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WIEGAND_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_WIEGAND_INFO extends NetSDKLib.SdkStructure {
/**
-工作模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_WIEGAND_MODE}
+工作模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_NET_WIEGAND_MODE}
*/
public int emMode;
/**
@@ -22,11 +22,11 @@
*/
public int nPulseStep;
/**
-传输模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_WIEGAND_TRANSFER_MODE}
+传输模式 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_NET_WIEGAND_TRANSFER_MODE}
*/
public int emTransferMode;
/**
-输出类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NET_WIEGAND_OUT_TYPE}
+输出类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_NET_WIEGAND_OUT_TYPE}
*/
public int emOutType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WORKSUIT_COMPARE_GROUP_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WORKSUIT_COMPARE_GROUP_INFO.java
index caa1889..4e3b261 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WORKSUIT_COMPARE_GROUP_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WORKSUIT_COMPARE_GROUP_INFO.java
@@ -21,7 +21,7 @@
*/
public byte[] szGroupDetail = new byte[256];
/**
- * 工装优选方案 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WORKSUIT_GROUP_POLICY}
+ * 工装优选方案 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_WORKSUIT_GROUP_POLICY}
*/
public int emWorkSuitPolicy;
/**
@@ -29,7 +29,7 @@
*/
public int nSimilarity;
/**
- * 合规组类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_WORKSUIT_GROUP_TYPE}
+ * 合规组类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_WORKSUIT_GROUP_TYPE}
*/
public int emGroupType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_BUTTON_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_BUTTON_INFO.java
index 0036eb0..16cb22f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_BUTTON_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_BUTTON_INFO.java
@@ -14,7 +14,7 @@
*/
public int bEnable;
/**
-报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_BUTTON_ALARM_TYPE}
+报警类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_BUTTON_ALARM_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_IMAGE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_IMAGE_INFO.java
index f23f7b0..56441d3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_IMAGE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_IMAGE_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_WPAN_ACCESSORY_IMAGE_INFO extends NetSDKLib.SdkStructure {
/**
-分辨率 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.CAPTURE_SIZE}
+分辨率 {@link com.ard.device.component.sdk.dh.lib.enumeration.CAPTURE_SIZE}
*/
public int emResolution;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java
index 7630499..51393a4 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ACCESSORY_INFO.java
@@ -130,51 +130,51 @@
*/
public int nTriggerAlarmInterval;
/**
-探测器状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_DETECTOR_STATUS_TYPE}
+探测器状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_DETECTOR_STATUS_TYPE}
*/
public int emState;
/**
-设备布防时音量 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_VOLUME}
+设备布防时音量 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_VOLUME}
*/
public int emBeepVolume;
/**
-灵敏度 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_SENSITIVITY}
+灵敏度 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_SENSITIVITY}
*/
public int emSensentivity;
/**
-功率调节 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_POWER_REGULATION_TYPE}
+功率调节 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_POWER_REGULATION_TYPE}
*/
public int emPowerRegulation;
/**
-在线状态 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ONLINE_STATUS}
+在线状态 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ONLINE_STATUS}
*/
public int emOnline;
/**
-报警类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_ALARM_TYPE}
+报警类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_ALARM_TYPE}
*/
public int emAlarmType;
/**
-输入类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_INPUT_TYPE}
+输入类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_INPUT_TYPE}
*/
public int emInputType;
/**
-LED亮度 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_LED_BRIGHTNESS_LEVEL}
+LED亮度 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_LED_BRIGHTNESS_LEVEL}
*/
public int emLedBrightnessLevel;
/**
-操作模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_OPERATION_MODE}
+操作模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_OPERATION_MODE}
*/
public int emOperationMode;
/**
-防误按模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ANTI_MISPRESS_TYPE}
+防误按模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ANTI_MISPRESS_TYPE}
*/
public int emAntiMispress;
/**
-外部电源状态，若未开启检测外接电源状态则为未知 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EXPOWER_STATE}
+外部电源状态，若未开启检测外接电源状态则为未知 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_EXPOWER_STATE}
*/
public int emExPowerState;
/**
-设备报警音量 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ACCESSORY_VOLUME}
+设备报警音量 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ACCESSORY_VOLUME}
*/
public int emVolume;
/**
@@ -206,7 +206,7 @@
*/
public NET_WPAN_RELAY_INFO stuRelayTran=new NET_WPAN_RELAY_INFO();
/**
-传感器感应方式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_BUTTON_ALARM_TYPE}
+传感器感应方式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_BUTTON_ALARM_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ARMING_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ARMING_INFO.java
index 4fd0e93..16b6df5 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ARMING_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_ARMING_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_WPAN_ARMING_INFO extends NetSDKLib.SdkStructure {
/**
-布防模式 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_ARMING_TYPE}
+布防模式 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_ARMING_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_EXTERNAL_WIFI_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_EXTERNAL_WIFI_INFO.java
index 9c8e4fa..c706a96 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_EXTERNAL_WIFI_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_EXTERNAL_WIFI_INFO.java
@@ -14,7 +14,7 @@
*/
public int bEnable;
/**
-外部wifi优先级 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_EXTERNAL_WIFI_PRIORITY}
+外部wifi优先级 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_EXTERNAL_WIFI_PRIORITY}
*/
public int emPriority;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_RELAY_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_RELAY_INFO.java
index a7b9b96..9967b4c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_RELAY_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_WPAN_RELAY_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_WPAN_RELAY_INFO extends NetSDKLib.SdkStructure {
/**
-是否启用中继转发 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RELAY_TYPE}
+是否启用中继转发 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_RELAY_TYPE}
*/
public int emEnable;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_MULTILEVEL_DETECT_CFG_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_MULTILEVEL_DETECT_CFG_INFO.java
index 934b4c8..5885ea3 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_MULTILEVEL_DETECT_CFG_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_MULTILEVEL_DETECT_CFG_INFO.java
@@ -11,7 +11,7 @@
*/
public class NET_XRAY_MULTILEVEL_DETECT_CFG_INFO extends NetSDKLib.SdkStructure {
/**
-当前配置等级 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_XRAY_OBJECT_DETECT_CONFIG_LEVEL}
+当前配置等级 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_XRAY_OBJECT_DETECT_CONFIG_LEVEL}
*/
public int emCurrentLevel;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_GROUP.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_GROUP.java
index 17a5f61..816171f 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_GROUP.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_GROUP.java
@@ -10,7 +10,7 @@
*/
public class NET_XRAY_OBJECT_GROUP extends NetSDKLib.SdkStructure {
/**
-分组类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_INSIDE_OBJECT_TYPE}
+分组类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_INSIDE_OBJECT_TYPE}
*/
public int emGroupType;
/**
@@ -18,11 +18,11 @@
*/
public int bGroupEnable;
/**
-分组安全等级 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GROUP_GRADE_TYPE}
+分组安全等级 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_GROUP_GRADE_TYPE}
*/
public int emGroupGrade;
/**
-分组物品颜色 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_GROUP_COLOR_TYPE}
+分组物品颜色 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_GROUP_COLOR_TYPE}
*/
public int emGroupColor;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_INFO.java
index 16706c7..a99d04c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/NET_XRAY_OBJECT_INFO.java
@@ -10,7 +10,7 @@
*/
public class NET_XRAY_OBJECT_INFO extends NetSDKLib.SdkStructure {
/**
-物体类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_INSIDE_OBJECT_TYPE}
+物体类型 {@link com.ard.device.component.sdk.dh.lib.enumeration.EM_INSIDE_OBJECT_TYPE}
*/
public int emType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/RADAR_REPORTS_VEHICLE_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/RADAR_REPORTS_VEHICLE_INFO.java
index b458dcd..9d0f04c 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/RADAR_REPORTS_VEHICLE_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/RADAR_REPORTS_VEHICLE_INFO.java
@@ -34,7 +34,7 @@
*/
public int nLaneID;
/**
-车辆行驶方向(相对车道方向) {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_VEHICLE_DRIVING_DIRECTION}
+车辆行驶方向(相对车道方向) {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_VEHICLE_DRIVING_DIRECTION}
*/
public int emDrivingDirection;
/**
@@ -50,7 +50,7 @@
*/
public int nVehicleSpeed;
/**
-车辆类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_DETECTION_VEHICLE_TYPE}
+车辆类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_RADAR_DETECTION_VEHICLE_TYPE}
*/
public int emVehicleType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/UNPACKING_CHECK_INFO.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/UNPACKING_CHECK_INFO.java
index aaacbdb..0cd67b6 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/UNPACKING_CHECK_INFO.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/UNPACKING_CHECK_INFO.java
@@ -60,7 +60,7 @@
*/
public byte[] szAlarmLocation = new byte[256];
/**
- * com.ruoyi.device.dhsdk.lib.NetSDKLib.EM_INSIDE_OBJECT_TYPE
+ * com.ard.device.dhsdk.lib.NetSDKLib.EM_INSIDE_OBJECT_TYPE
*/
public int[] emContrabandClass = new int[64]; // 违禁物品分类
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/optimized/LAMP_GROUP_INFO_V1.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/optimized/LAMP_GROUP_INFO_V1.java
index 0ffb8a6..ef7f30e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/optimized/LAMP_GROUP_INFO_V1.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/lib/structure/optimized/LAMP_GROUP_INFO_V1.java
@@ -13,7 +13,7 @@
*/
public int nLampNo;
/**
- * 灯组类型 {@link com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_LAMP_TYPE}
+ * 灯组类型 {@link com.ard.utils.sdk.dhsdk.lib.enumeration.EM_LAMP_TYPE}
*/
public int emLampType;
/**
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java b/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java
index 71d324f..54fa4d5 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java
@@ -1,13 +1,10 @@
package com.ard.device.component.sdk.dh.service.impl;
-import com.ard.common.core.domain.AjaxResult;
import com.ard.common.utils.StringUtils;
import com.ard.device.camera.domain.ArdCamera;
import com.ard.device.camera.domain.CameraCmd;
-import com.ard.device.camera.service.IArdCameraService;
import com.ard.device.channel.domain.ArdChannel;
import com.ard.device.channel.domain.VideoCompressionCfg;
-import com.ard.device.channel.service.IArdChannelService;
import com.ard.device.component.sdk.common.GlobalVariable;
import com.ard.device.component.sdk.common.osSelect;
import com.ard.device.component.sdk.dh.module.ConfigModule;
@@ -41,12 +38,7 @@
public class DaHuaSDK implements CameraSDK {
@Resource
- private IArdCameraService ardCameraService;
- @Resource
- private IArdChannelService ardChannelService;
- @Resource
private ApplicationEventPublisher eventPublisher;
-
public static NetSDKLib netsdk = null;
public static NetSDKLib configsdk = null;
@@ -107,7 +99,7 @@
* 登录
*/
@Override
- public AjaxResult login(ArdCamera camera) {
+ public void login(ArdCamera camera) {
try {
NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
@@ -118,7 +110,6 @@
LoginEvent loginEvent = new LoginEvent(camera);
eventPublisher.publishEvent(loginEvent);
log.warn("设备[{}:{}]登录失败:{}", camera.getIp(), camera.getPort(), getErrorCodePrint());
- return AjaxResult.warn(getErrorCodePrint());
}
log.debug("设备[{}:{}]登录成功:{}", camera.getIp(), camera.getPort(), loginId);
camera.setState("1");
@@ -133,12 +124,8 @@
}
LoginEvent loginEvent = new LoginEvent(camera);
eventPublisher.publishEvent(loginEvent);
- //创建引导队列
- //createGuideQueue(camera);
- return AjaxResult.success("登录成功");
} catch (Exception ex) {
log.error("登录异常:{}", ex.getMessage());
- return AjaxResult.error("登录异常:" + ex.getMessage());
}
}
@@ -146,16 +133,14 @@
* 注销
* 刘苏义
* 2023/10/17 8:28:13
- *
- * @return
*/
@Override
- public boolean logout(String cameraId) {
+ public void logout(String cameraId) {
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return;
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
- return LoginModule.logout(loginId);
+ LoginModule.logout(loginId);
}
/**
@@ -186,7 +171,7 @@
/**
* 获取通道
*/
-
+ @Override
public List<ArdChannel> getChannels(ArdCamera camera) {
if (camera.getLoginId() < 0) {
return new ArrayList<>();
@@ -215,7 +200,6 @@
}
return ardChannelList;
}
-
@Override
public VideoCompressionCfg getVideoCompressionCfg(CameraCmd cmd) {
@@ -282,7 +266,6 @@
return null;
}
}
-
/**
* 动态库加载 - 大华 NetSDK + ConfigSDK
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/factory/CameraSDKFactory.java b/ard-device/src/main/java/com/ard/device/component/sdk/factory/CameraSDKFactory.java
index d50271f..5a19156 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/factory/CameraSDKFactory.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/factory/CameraSDKFactory.java
@@ -29,12 +29,14 @@
* @throws IllegalArgumentException 如果传入的工厂参数不支持
*/
public CameraSDK createCameraSDK(String factory) {
- if (factory.equals("1")) {
- return hikvisionSDK;
- } else if (factory.equals("2")) {
- return dahuaSDK;
- } else {
- throw new IllegalArgumentException("Unsupported device: " + factory);
+ FactoryType factoryType = FactoryType.fromCode(factory);
+ switch (factoryType) {
+ case HIKVISION:
+ return hikvisionSDK;
+ case DAHUA:
+ return dahuaSDK;
+ default:
+ throw new IllegalArgumentException("Unsupported device: " + factory);
}
}
}
\ No newline at end of file
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/factory/FactoryType.java b/ard-device/src/main/java/com/ard/device/component/sdk/factory/FactoryType.java
new file mode 100644
index 0000000..42a2324
--- /dev/null
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/factory/FactoryType.java
@@ -0,0 +1,25 @@
+package com.ard.device.component.sdk.factory;
+
+public enum FactoryType {
+ HIKVISION("1"),
+ DAHUA("2");
+
+ private final String factoryCode;
+
+ FactoryType(String factoryCode) {
+ this.factoryCode = factoryCode;
+ }
+
+ public String getFactoryCode() {
+ return factoryCode;
+ }
+
+ public static FactoryType fromCode(String code) {
+ for (FactoryType type : FactoryType.values()) {
+ if (type.getFactoryCode().equals(code)) {
+ return type;
+ }
+ }
+ throw new IllegalArgumentException("Unsupported factory code: " + code);
+ }
+}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/hik/service/impl/HikVisionSDK.java b/ard-device/src/main/java/com/ard/device/component/sdk/hik/service/impl/HikVisionSDK.java
index 01d6a25..4f000f6 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/hik/service/impl/HikVisionSDK.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/hik/service/impl/HikVisionSDK.java
@@ -1,13 +1,10 @@
package com.ard.device.component.sdk.hik.service.impl;
-import com.ard.common.core.domain.AjaxResult;
import com.ard.common.utils.StringUtils;
import com.ard.device.camera.domain.ArdCamera;
-import com.ard.device.camera.service.IArdCameraService;
import com.ard.device.channel.domain.ArdChannel;
import com.ard.device.camera.domain.CameraCmd;
import com.ard.device.channel.domain.VideoCompressionCfg;
-import com.ard.device.channel.service.IArdChannelService;
import com.ard.device.component.sdk.common.GlobalVariable;
import com.ard.device.component.sdk.common.ResolutionEnum;
import com.ard.device.component.sdk.common.SdkErrorCodeEnum;
@@ -76,7 +73,7 @@
* 登录
*/
@Override
- public AjaxResult login(ArdCamera camera) {
+ public void login(ArdCamera camera) {
try {
String m_sDeviceIP = camera.getIp();
String m_sUsername = camera.getUsername();
@@ -109,7 +106,6 @@
eventPublisher.publishEvent(loginEvent);
log.warn("设备[{}:{}]登录失败: {}({})", camera.getIp(), camera.getPort(),
SdkErrorCodeEnum.getDescByCode(errorCode), errorCode);
- return AjaxResult.warn("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
log.info("Login Success 【 {}:{} 】", camera.getIp(), camera.getPort());
@@ -119,7 +115,7 @@
camera.setState("1");
int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
int startChan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
- if (camera.getType().equals("2")) {
+ if ("2".equals(camera.getType())) {
chanNum = m_strDeviceInfo.struDeviceV30.byIPChanNum;
startChan = m_strDeviceInfo.struDeviceV30.byStartDChan;
}
@@ -132,10 +128,8 @@
}
LoginEvent loginEvent = new LoginEvent(camera);
eventPublisher.publishEvent(loginEvent);
- return AjaxResult.success("设备登录成功");
} catch (Exception ex) {
log.error("注册设备异常", ex);
- return AjaxResult.error("注册设备异常" + ex.getMessage());
}
}
@@ -143,16 +137,15 @@
* 注销
*/
@Override
- public boolean logout(String cameraId) {
+ public void logout(String cameraId) {
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return;
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
boolean b = hCNetSDK.NET_DVR_Logout(userId);
if (b) {
GlobalVariable.loginMap.remove(cameraId);
}
- return b;
}
@Override
@@ -314,7 +307,7 @@
}
//分辨率
String resolution =
- ResolutionEnum.fromCode(compressionCfg.struNormHighRecordPara.byResolution).getResolution();
+ Objects.requireNonNull(ResolutionEnum.fromCode(compressionCfg.struNormHighRecordPara.byResolution)).getResolution();
//帧率
String nFrameRate;
switch (compressionCfg.struNormHighRecordPara.dwVideoFrameRate) {
@@ -401,6 +394,7 @@
/**
* 获取通道
*/
+ @Override
public List<ArdChannel> getChannels(ArdCamera camera) {
//获取通道
List<ArdChannel> channelList = new ArrayList<>();
@@ -443,7 +437,7 @@
channel.setVideoCode(videoCompressionCfg.getVideoEncType());
}
//NVR过滤离线通道
- if (camera.getType().equals("3") || camera.getType().equals("2")) {
+ if ("3".equals(camera.getType()) || "2".equals(camera.getType())) {
if (ipParaCfg.struStreamMode[iChanNo].uGetStream.struChanInfo.byEnable != 1) {
continue;
}
@@ -493,7 +487,6 @@
System.out.println("✅ SDK 加载成功！");
} catch (Exception ex) {
System.err.println("❌ SDK 加载失败: " + strDllPath + "\n异常信息: " + ex.getMessage());
- ex.printStackTrace();
return false;
}
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDK.java b/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDK.java
index 6dee4ed..5195736 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDK.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDK.java
@@ -17,10 +17,10 @@
public interface CameraSDK {
//登录
- AjaxResult login(ArdCamera cameras);
+ void login(ArdCamera cameras);
//注销
- boolean logout(String cameraId);
+ void logout(String cameraId);
//在线状态
boolean isOnLine(CameraCmd cmd);
@@ -29,5 +29,5 @@
VideoCompressionCfg getVideoCompressionCfg(CameraCmd cmd);
//获取相机通道信息
- public List<ArdChannel> getChannels(ArdCamera camera);
+ List<ArdChannel> getChannels(ArdCamera camera);
}
diff --git a/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java b/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java
index f292137..4ca608e 100644
--- a/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java
+++ b/ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java
@@ -13,6 +13,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
@@ -27,7 +28,7 @@
**/
@Service
@Slf4j
-public class CameraSDKService {
+public class CameraSDKService implements CameraSDK {
@Resource
private RedisCache redisService;
@@ -37,41 +38,39 @@
//异步登录
@Async
- public AjaxResult login(ArdCamera ardCamera) {
+ @Override
+ public void login(ArdCamera ardCamera) {
try {
if (ardCamera == null) {
- return AjaxResult.warn("设备不存在");
+ log.warn("设备不存在");
+ return;
}
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.login(ardCamera);//异步登录
+ cameraSDK.login(ardCamera);//异步登录
} catch (Exception ex) {
log.error("登录异常：{}", ex.getMessage());
- return AjaxResult.error("登录异常：" + ex.getMessage());
}
}
//注销
- public boolean logout(String cameraId) {
- boolean result = false;
+ @Override
+ public void logout(String cameraId) {
try {
ArdCamera ardCamera = redisService.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- result = cameraSDK.logout(cameraId);
- if (result) {
- GlobalVariable.loginMap.remove(cameraId);//移除相机登录id缓存
- }
+ cameraSDK.logout(cameraId);
+ GlobalVariable.loginMap.remove(cameraId);//移除相机登录id缓存
}
} catch (Exception ex) {
log.error("注销异常：{}", ex.getMessage());
- return false;
}
- return result;
}
//在线检测
+ @Override
public boolean isOnLine(CameraCmd cmd) {
try {
boolean onLine = false;
@@ -89,6 +88,7 @@
}
}
+ @Override
//获取码流压缩参数
public VideoCompressionCfg getVideoCompressionCfg(CameraCmd cmd) {
try {
@@ -107,6 +107,7 @@
}
//获取通道列表
+ @Override
public List<ArdChannel> getChannels(ArdCamera camera) {
try {
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(camera.getFactory());
diff --git a/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java b/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java
index e450375..67f514d 100644
--- a/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java
+++ b/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java
@@ -20,7 +20,7 @@
/**
* 数据过滤处理
*
- * @author ruoyi
+ * @author ard
*/
@Aspect
@Component
diff --git a/ard-framework/src/main/java/com/ard/framework/aspectj/DataSourceAspect.java b/ard-framework/src/main/java/com/ard/framework/aspectj/DataSourceAspect.java
index 497cd03..7c574b3 100644
--- a/ard-framework/src/main/java/com/ard/framework/aspectj/DataSourceAspect.java
+++ b/ard-framework/src/main/java/com/ard/framework/aspectj/DataSourceAspect.java
@@ -18,7 +18,7 @@
/**
* 多数据源处理
*
- * @author ruoyi
+ * @author ard
*/
@Aspect
@Order(1)
diff --git a/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java b/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
index 43e1fc4..30610c3 100644
--- a/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
+++ b/ard-framework/src/main/java/com/ard/framework/aspectj/LogAspect.java
@@ -34,7 +34,7 @@
/**
* 操作日志记录处理
*
- * @author ruoyi
+ * @author ard
*/
@Aspect
@Component
diff --git a/ard-framework/src/main/java/com/ard/framework/aspectj/RateLimiterAspect.java b/ard-framework/src/main/java/com/ard/framework/aspectj/RateLimiterAspect.java
index c5bd515..9937b02 100644
--- a/ard-framework/src/main/java/com/ard/framework/aspectj/RateLimiterAspect.java
+++ b/ard-framework/src/main/java/com/ard/framework/aspectj/RateLimiterAspect.java
@@ -22,7 +22,7 @@
/**
* 限流处理
*
- * @author ruoyi
+ * @author ard
*/
@Aspect
@Component
diff --git a/ard-framework/src/main/java/com/ard/framework/config/ApplicationConfig.java b/ard-framework/src/main/java/com/ard/framework/config/ApplicationConfig.java
index 0756322..1699371 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/ApplicationConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/ApplicationConfig.java
@@ -10,7 +10,7 @@
/**
* 程序注解配置
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
// 表示通过aop框架暴露该代理对象,AopContext能够访问
diff --git a/ard-framework/src/main/java/com/ard/framework/config/CaptchaConfig.java b/ard-framework/src/main/java/com/ard/framework/config/CaptchaConfig.java
index b36c2a4..e53c84a 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/CaptchaConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/CaptchaConfig.java
@@ -10,7 +10,7 @@
/**
* 验证码配置
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class CaptchaConfig
diff --git a/ard-framework/src/main/java/com/ard/framework/config/DruidConfig.java b/ard-framework/src/main/java/com/ard/framework/config/DruidConfig.java
index 82d79b9..64c4544 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/DruidConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/DruidConfig.java
@@ -27,7 +27,7 @@
/**
* druid 配置多数据源
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class DruidConfig
diff --git a/ard-framework/src/main/java/com/ard/framework/config/FastJson2JsonRedisSerializer.java b/ard-framework/src/main/java/com/ard/framework/config/FastJson2JsonRedisSerializer.java
index d1c2e5f..928a2b7 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/FastJson2JsonRedisSerializer.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/FastJson2JsonRedisSerializer.java
@@ -12,7 +12,7 @@
/**
* Redis使用FastJson序列化
*
- * @author ruoyi
+ * @author ard
*/
public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
{
diff --git a/ard-framework/src/main/java/com/ard/framework/config/FilterConfig.java b/ard-framework/src/main/java/com/ard/framework/config/FilterConfig.java
index 6fd56ca..84cfa17 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/FilterConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/FilterConfig.java
@@ -15,7 +15,7 @@
/**
* Filter配置
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class FilterConfig
diff --git a/ard-framework/src/main/java/com/ard/framework/config/I18nConfig.java b/ard-framework/src/main/java/com/ard/framework/config/I18nConfig.java
index 71a23ed..0b9e9c3 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/I18nConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/I18nConfig.java
@@ -12,7 +12,7 @@
/**
* 资源文件配置加载
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class I18nConfig implements WebMvcConfigurer
diff --git a/ard-framework/src/main/java/com/ard/framework/config/KaptchaTextCreator.java b/ard-framework/src/main/java/com/ard/framework/config/KaptchaTextCreator.java
index caa0383..3b588f5 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/KaptchaTextCreator.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/KaptchaTextCreator.java
@@ -6,7 +6,7 @@
/**
* 验证码文本生成器
*
- * @author ruoyi
+ * @author ard
*/
public class KaptchaTextCreator extends DefaultTextCreator
{
diff --git a/ard-framework/src/main/java/com/ard/framework/config/MybatisPlusConfig.java b/ard-framework/src/main/java/com/ard/framework/config/MybatisPlusConfig.java
index c386c11..f58247a 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/MybatisPlusConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/MybatisPlusConfig.java
@@ -12,7 +12,7 @@
/**
* Mybatis Plus 配置
*
- * @author ruoyi
+ * @author ard
*/
@EnableTransactionManagement(proxyTargetClass = true)
@Configuration
diff --git a/ard-framework/src/main/java/com/ard/framework/config/RedisConfig.java b/ard-framework/src/main/java/com/ard/framework/config/RedisConfig.java
index 0896170..252c322 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/RedisConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/RedisConfig.java
@@ -13,7 +13,7 @@
/**
* redis配置
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
@EnableCaching
diff --git a/ard-framework/src/main/java/com/ard/framework/config/ResourcesConfig.java b/ard-framework/src/main/java/com/ard/framework/config/ResourcesConfig.java
index 11108f4..20c343d 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/ResourcesConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/ResourcesConfig.java
@@ -18,7 +18,7 @@
/**
* 通用配置
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class ResourcesConfig implements WebMvcConfigurer
diff --git a/ard-framework/src/main/java/com/ard/framework/config/SecurityConfig.java b/ard-framework/src/main/java/com/ard/framework/config/SecurityConfig.java
index 98747ea..8903082 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/SecurityConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/SecurityConfig.java
@@ -24,7 +24,7 @@
/**
* spring security配置
*
- * @author ruoyi
+ * @author ard
*/
@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
@Configuration
diff --git a/ard-framework/src/main/java/com/ard/framework/config/ServerConfig.java b/ard-framework/src/main/java/com/ard/framework/config/ServerConfig.java
index 36280af..c335954 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/ServerConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/ServerConfig.java
@@ -7,7 +7,7 @@
/**
* 服务相关配置
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class ServerConfig
diff --git a/ard-framework/src/main/java/com/ard/framework/config/ThreadPoolConfig.java b/ard-framework/src/main/java/com/ard/framework/config/ThreadPoolConfig.java
index d005095..44329d0 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/ThreadPoolConfig.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/ThreadPoolConfig.java
@@ -13,7 +13,7 @@
/**
* 线程池配置
*
- * @author ruoyi
+ * @author ard
**/
@Configuration
public class ThreadPoolConfig
diff --git a/ard-framework/src/main/java/com/ard/framework/config/properties/DruidProperties.java b/ard-framework/src/main/java/com/ard/framework/config/properties/DruidProperties.java
index a6a6e14..7d2f8fb 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/properties/DruidProperties.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/properties/DruidProperties.java
@@ -7,7 +7,7 @@
/**
* druid 配置属性
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class DruidProperties
diff --git a/ard-framework/src/main/java/com/ard/framework/config/properties/PermitAllUrlProperties.java b/ard-framework/src/main/java/com/ard/framework/config/properties/PermitAllUrlProperties.java
index 6fec248..01a36a1 100644
--- a/ard-framework/src/main/java/com/ard/framework/config/properties/PermitAllUrlProperties.java
+++ b/ard-framework/src/main/java/com/ard/framework/config/properties/PermitAllUrlProperties.java
@@ -21,7 +21,7 @@
/**
* 设置Anonymous注解允许匿名访问的url
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class PermitAllUrlProperties implements InitializingBean, ApplicationContextAware
diff --git a/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSource.java b/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSource.java
index f9fa909..935f0ed 100644
--- a/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSource.java
+++ b/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSource.java
@@ -7,7 +7,7 @@
/**
* 动态数据源
*
- * @author ruoyi
+ * @author ard
*/
public class DynamicDataSource extends AbstractRoutingDataSource
{
diff --git a/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSourceContextHolder.java b/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSourceContextHolder.java
index 043e01b..71377ab 100644
--- a/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSourceContextHolder.java
+++ b/ard-framework/src/main/java/com/ard/framework/datasource/DynamicDataSourceContextHolder.java
@@ -6,7 +6,7 @@
/**
* 数据源切换处理
*
- * @author ruoyi
+ * @author ard
*/
public class DynamicDataSourceContextHolder
{
diff --git a/ard-framework/src/main/java/com/ard/framework/interceptor/RepeatSubmitInterceptor.java b/ard-framework/src/main/java/com/ard/framework/interceptor/RepeatSubmitInterceptor.java
index 16fa850..96a1034 100644
--- a/ard-framework/src/main/java/com/ard/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/ard-framework/src/main/java/com/ard/framework/interceptor/RepeatSubmitInterceptor.java
@@ -14,7 +14,7 @@
/**
* 防止重复提交拦截器
*
- * @author ruoyi
+ * @author ard
*/
@Component
public abstract class RepeatSubmitInterceptor implements HandlerInterceptor
diff --git a/ard-framework/src/main/java/com/ard/framework/interceptor/impl/SameUrlDataInterceptor.java b/ard-framework/src/main/java/com/ard/framework/interceptor/impl/SameUrlDataInterceptor.java
index 10c4117..20c8b1d 100644
--- a/ard-framework/src/main/java/com/ard/framework/interceptor/impl/SameUrlDataInterceptor.java
+++ b/ard-framework/src/main/java/com/ard/framework/interceptor/impl/SameUrlDataInterceptor.java
@@ -20,7 +20,7 @@
* 判断请求url和数据是否和上一次相同，
* 如果和上次相同，则是重复提交表单。 有效时间为10秒内。
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
diff --git a/ard-framework/src/main/java/com/ard/framework/manager/AsyncManager.java b/ard-framework/src/main/java/com/ard/framework/manager/AsyncManager.java
index 2837daa..6593963 100644
--- a/ard-framework/src/main/java/com/ard/framework/manager/AsyncManager.java
+++ b/ard-framework/src/main/java/com/ard/framework/manager/AsyncManager.java
@@ -9,7 +9,7 @@
/**
* 异步任务管理器
*
- * @author ruoyi
+ * @author ard
*/
public class AsyncManager
{
diff --git a/ard-framework/src/main/java/com/ard/framework/manager/ShutdownManager.java b/ard-framework/src/main/java/com/ard/framework/manager/ShutdownManager.java
index e921033..fab6fbd 100644
--- a/ard-framework/src/main/java/com/ard/framework/manager/ShutdownManager.java
+++ b/ard-framework/src/main/java/com/ard/framework/manager/ShutdownManager.java
@@ -8,7 +8,7 @@
/**
* 确保应用退出时能关闭后台线程
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class ShutdownManager
diff --git a/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java b/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
index 9c20c34..7b9cfe5 100644
--- a/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
+++ b/ard-framework/src/main/java/com/ard/framework/manager/factory/AsyncFactory.java
@@ -19,7 +19,7 @@
/**
* 异步工厂（产生任务用）
*
- * @author ruoyi
+ * @author ard
*/
public class AsyncFactory
{
diff --git a/ard-framework/src/main/java/com/ard/framework/security/context/AuthenticationContextHolder.java b/ard-framework/src/main/java/com/ard/framework/security/context/AuthenticationContextHolder.java
index 458aa2f..d59ef12 100644
--- a/ard-framework/src/main/java/com/ard/framework/security/context/AuthenticationContextHolder.java
+++ b/ard-framework/src/main/java/com/ard/framework/security/context/AuthenticationContextHolder.java
@@ -5,7 +5,7 @@
/**
* 身份验证信息
*
- * @author ruoyi
+ * @author ard
*/
public class AuthenticationContextHolder
{
diff --git a/ard-framework/src/main/java/com/ard/framework/security/context/PermissionContextHolder.java b/ard-framework/src/main/java/com/ard/framework/security/context/PermissionContextHolder.java
index 2ddb81e..1e9ddee 100644
--- a/ard-framework/src/main/java/com/ard/framework/security/context/PermissionContextHolder.java
+++ b/ard-framework/src/main/java/com/ard/framework/security/context/PermissionContextHolder.java
@@ -7,7 +7,7 @@
/**
* 权限信息
*
- * @author ruoyi
+ * @author ard
*/
public class PermissionContextHolder
{
diff --git a/ard-framework/src/main/java/com/ard/framework/security/filter/JwtAuthenticationTokenFilter.java b/ard-framework/src/main/java/com/ard/framework/security/filter/JwtAuthenticationTokenFilter.java
index 722c5af..695d197 100644
--- a/ard-framework/src/main/java/com/ard/framework/security/filter/JwtAuthenticationTokenFilter.java
+++ b/ard-framework/src/main/java/com/ard/framework/security/filter/JwtAuthenticationTokenFilter.java
@@ -19,7 +19,7 @@
/**
* token过滤器 验证token有效性
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
diff --git a/ard-framework/src/main/java/com/ard/framework/security/handle/AuthenticationEntryPointImpl.java b/ard-framework/src/main/java/com/ard/framework/security/handle/AuthenticationEntryPointImpl.java
index 82f9113..7326fbe 100644
--- a/ard-framework/src/main/java/com/ard/framework/security/handle/AuthenticationEntryPointImpl.java
+++ b/ard-framework/src/main/java/com/ard/framework/security/handle/AuthenticationEntryPointImpl.java
@@ -16,7 +16,7 @@
/**
* 认证失败处理类 返回未授权
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable
diff --git a/ard-framework/src/main/java/com/ard/framework/security/handle/CustomAuthenticationSuccessHandler.java b/ard-framework/src/main/java/com/ard/framework/security/handle/CustomAuthenticationSuccessHandler.java
index 4ae53bf..5744902 100644
--- a/ard-framework/src/main/java/com/ard/framework/security/handle/CustomAuthenticationSuccessHandler.java
+++ b/ard-framework/src/main/java/com/ard/framework/security/handle/CustomAuthenticationSuccessHandler.java
@@ -1,5 +1,6 @@
package com.ard.framework.security.handle;
+import com.ard.common.constant.Constants;
import com.ard.common.core.redis.RedisCache;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -12,7 +13,7 @@
public void onAuthenticationSuccess(Long userId) {
// 检查 Redis 中是否已有该用户登录
- String key = "login_userid:" + userId;
+ String key = Constants.LOGIN_USERID_KEY + userId;
if (redisCache.hasKey(key)) {
throw new RuntimeException("用户已登录，请勿重复登录");
}
diff --git a/ard-framework/src/main/java/com/ard/framework/security/handle/LogoutSuccessHandlerImpl.java b/ard-framework/src/main/java/com/ard/framework/security/handle/LogoutSuccessHandlerImpl.java
index e67220f..6b304be 100644
--- a/ard-framework/src/main/java/com/ard/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ b/ard-framework/src/main/java/com/ard/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -22,7 +22,7 @@
/**
* 自定义退出处理类 返回成功
*
- * @author ruoyi
+ * @author ard
*/
@Configuration
public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
diff --git a/ard-framework/src/main/java/com/ard/framework/web/domain/Server.java b/ard-framework/src/main/java/com/ard/framework/web/domain/Server.java
index 1362b95..58a3da0 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/domain/Server.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/domain/Server.java
@@ -24,7 +24,7 @@
/**
* 服务器相关信息
*
- * @author ruoyi
+ * @author ard
*/
public class Server
{
diff --git a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Cpu.java b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Cpu.java
index 8de7d58..96fe2cd 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Cpu.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Cpu.java
@@ -5,7 +5,7 @@
/**
* CPU相关信息
*
- * @author ruoyi
+ * @author ard
*/
public class Cpu
{
diff --git a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Jvm.java b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Jvm.java
index 9296f40..66daf4d 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Jvm.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Jvm.java
@@ -7,7 +7,7 @@
/**
* JVM相关信息
*
- * @author ruoyi
+ * @author ard
*/
public class Jvm
{
diff --git a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java
index 2a330f7..0b61b60 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Mem.java
@@ -5,7 +5,7 @@
/**
* 內存相关信息
*
- * @author ruoyi
+ * @author ard
*/
public class Mem
{
diff --git a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Sys.java b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Sys.java
index 82171de..1e1e065 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/domain/server/Sys.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/domain/server/Sys.java
@@ -3,7 +3,7 @@
/**
* 系统相关信息
*
- * @author ruoyi
+ * @author ard
*/
public class Sys
{
diff --git a/ard-framework/src/main/java/com/ard/framework/web/domain/server/SysFile.java b/ard-framework/src/main/java/com/ard/framework/web/domain/server/SysFile.java
index 27b0182..1b2a440 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/domain/server/SysFile.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/domain/server/SysFile.java
@@ -3,7 +3,7 @@
/**
* 系统文件相关信息
*
- * @author ruoyi
+ * @author ard
*/
public class SysFile
{
diff --git a/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java b/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java
index eb3dab9..f32c264 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/exception/GlobalExceptionHandler.java
@@ -24,7 +24,7 @@
/**
* 全局异常处理器
*
- * @author ruoyi
+ * @author ard
*/
@RestControllerAdvice
public class GlobalExceptionHandler
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/PermissionService.java b/ard-framework/src/main/java/com/ard/framework/web/service/PermissionService.java
index 02fc079..8febf4a 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/PermissionService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/PermissionService.java
@@ -11,9 +11,9 @@
import com.ard.framework.security.context.PermissionContextHolder;
/**
- * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母
+ * ard首创 自定义权限实现，ss取自SpringSecurity首字母
*
- * @author ruoyi
+ * @author ard
*/
@Service("ss")
public class PermissionService
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java b/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
index d7fec9a..1c5aced 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java
@@ -36,7 +36,7 @@
/**
* 登录校验方法
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class SysLoginService
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/SysPasswordService.java b/ard-framework/src/main/java/com/ard/framework/web/service/SysPasswordService.java
index a1f53cb..735c6f1 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysPasswordService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysPasswordService.java
@@ -16,7 +16,7 @@
/**
* 登录密码方法
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class SysPasswordService
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java b/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
index 2aa845b..65a7d86 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysPermissionService.java
@@ -16,7 +16,7 @@
/**
* 用户权限处理
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class SysPermissionService
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java b/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
index 9aae269..f67bbcb 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/SysRegisterService.java
@@ -21,7 +21,7 @@
/**
* 注册校验方法
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class SysRegisterService
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/TokenService.java b/ard-framework/src/main/java/com/ard/framework/web/service/TokenService.java
index cf08c40..d44ee58 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/TokenService.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/TokenService.java
@@ -26,7 +26,7 @@
/**
* token验证处理
*
- * @author ruoyi
+ * @author ard
*/
@Component
public class TokenService
diff --git a/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java b/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
index 172ca65..eaa12e1 100644
--- a/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
+++ b/ard-framework/src/main/java/com/ard/framework/web/service/UserDetailsServiceImpl.java
@@ -18,7 +18,7 @@
/**
* 用户验证处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class UserDetailsServiceImpl implements UserDetailsService
diff --git a/ard-generator/src/main/java/com/ard/generator/config/GenConfig.java b/ard-generator/src/main/java/com/ard/generator/config/GenConfig.java
index edba529..9bcbcb5 100644
--- a/ard-generator/src/main/java/com/ard/generator/config/GenConfig.java
+++ b/ard-generator/src/main/java/com/ard/generator/config/GenConfig.java
@@ -8,7 +8,7 @@
/**
* 读取代码生成相关配置
*
- * @author ruoyi
+ * @author ard
*/
@Component
@ConfigurationProperties(prefix = "gen")
diff --git a/ard-generator/src/main/java/com/ard/generator/controller/GenController.java b/ard-generator/src/main/java/com/ard/generator/controller/GenController.java
index 605fbce..17c788e 100644
--- a/ard-generator/src/main/java/com/ard/generator/controller/GenController.java
+++ b/ard-generator/src/main/java/com/ard/generator/controller/GenController.java
@@ -38,7 +38,7 @@
/**
* 代码生成 操作处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/tool/gen")
@@ -250,7 +250,7 @@
response.reset();
response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
- response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+ response.setHeader("Content-Disposition", "attachment; filename=\"ard.zip\"");
response.addHeader("Content-Length", "" + data.length);
response.setContentType("application/octet-stream; charset=UTF-8");
IOUtils.write(data, response.getOutputStream());
diff --git a/ard-generator/src/main/java/com/ard/generator/domain/GenTable.java b/ard-generator/src/main/java/com/ard/generator/domain/GenTable.java
index 5fde29a..7ec9061 100644
--- a/ard-generator/src/main/java/com/ard/generator/domain/GenTable.java
+++ b/ard-generator/src/main/java/com/ard/generator/domain/GenTable.java
@@ -11,7 +11,7 @@
/**
* 业务表 gen_table
*
- * @author ruoyi
+ * @author ard
*/
public class GenTable extends BaseEntity
{
diff --git a/ard-generator/src/main/java/com/ard/generator/domain/GenTableColumn.java b/ard-generator/src/main/java/com/ard/generator/domain/GenTableColumn.java
index 8a45fc0..ebd4ac1 100644
--- a/ard-generator/src/main/java/com/ard/generator/domain/GenTableColumn.java
+++ b/ard-generator/src/main/java/com/ard/generator/domain/GenTableColumn.java
@@ -7,7 +7,7 @@
/**
* 代码生成业务字段表 gen_table_column
*
- * @author ruoyi
+ * @author ard
*/
public class GenTableColumn extends BaseEntity
{
diff --git a/ard-generator/src/main/java/com/ard/generator/mapper/GenTableColumnMapper.java b/ard-generator/src/main/java/com/ard/generator/mapper/GenTableColumnMapper.java
index afa6aa0..2c3d980 100644
--- a/ard-generator/src/main/java/com/ard/generator/mapper/GenTableColumnMapper.java
+++ b/ard-generator/src/main/java/com/ard/generator/mapper/GenTableColumnMapper.java
@@ -6,7 +6,7 @@
/**
* 业务字段 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface GenTableColumnMapper
{
diff --git a/ard-generator/src/main/java/com/ard/generator/mapper/GenTableMapper.java b/ard-generator/src/main/java/com/ard/generator/mapper/GenTableMapper.java
index ccb7cce..31b0d75 100644
--- a/ard-generator/src/main/java/com/ard/generator/mapper/GenTableMapper.java
+++ b/ard-generator/src/main/java/com/ard/generator/mapper/GenTableMapper.java
@@ -6,7 +6,7 @@
/**
* 业务 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface GenTableMapper
{
diff --git a/ard-generator/src/main/java/com/ard/generator/service/GenTableColumnServiceImpl.java b/ard-generator/src/main/java/com/ard/generator/service/GenTableColumnServiceImpl.java
index 726a491..fbb96ac 100644
--- a/ard-generator/src/main/java/com/ard/generator/service/GenTableColumnServiceImpl.java
+++ b/ard-generator/src/main/java/com/ard/generator/service/GenTableColumnServiceImpl.java
@@ -10,7 +10,7 @@
/**
* 业务字段 服务层实现
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class GenTableColumnServiceImpl implements IGenTableColumnService
diff --git a/ard-generator/src/main/java/com/ard/generator/service/GenTableServiceImpl.java b/ard-generator/src/main/java/com/ard/generator/service/GenTableServiceImpl.java
index 9fbbac5..d29a5e2 100644
--- a/ard-generator/src/main/java/com/ard/generator/service/GenTableServiceImpl.java
+++ b/ard-generator/src/main/java/com/ard/generator/service/GenTableServiceImpl.java
@@ -39,7 +39,7 @@
/**
* 业务 服务层实现
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class GenTableServiceImpl implements IGenTableService
diff --git a/ard-generator/src/main/java/com/ard/generator/service/IGenTableColumnService.java b/ard-generator/src/main/java/com/ard/generator/service/IGenTableColumnService.java
index a9e68f9..01330af 100644
--- a/ard-generator/src/main/java/com/ard/generator/service/IGenTableColumnService.java
+++ b/ard-generator/src/main/java/com/ard/generator/service/IGenTableColumnService.java
@@ -6,7 +6,7 @@
/**
* 业务字段 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface IGenTableColumnService
{
diff --git a/ard-generator/src/main/java/com/ard/generator/service/IGenTableService.java b/ard-generator/src/main/java/com/ard/generator/service/IGenTableService.java
index 3edc67c..ae04640 100644
--- a/ard-generator/src/main/java/com/ard/generator/service/IGenTableService.java
+++ b/ard-generator/src/main/java/com/ard/generator/service/IGenTableService.java
@@ -7,7 +7,7 @@
/**
* 业务 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface IGenTableService
{
diff --git a/ard-generator/src/main/java/com/ard/generator/util/GenUtils.java b/ard-generator/src/main/java/com/ard/generator/util/GenUtils.java
index c268af3..f7a1e75 100644
--- a/ard-generator/src/main/java/com/ard/generator/util/GenUtils.java
+++ b/ard-generator/src/main/java/com/ard/generator/util/GenUtils.java
@@ -11,7 +11,7 @@
/**
* 代码生成器 工具类
*
- * @author ruoyi
+ * @author ard
*/
public class GenUtils
{
diff --git a/ard-generator/src/main/java/com/ard/generator/util/VelocityInitializer.java b/ard-generator/src/main/java/com/ard/generator/util/VelocityInitializer.java
index 6c3e869..c8610f7 100644
--- a/ard-generator/src/main/java/com/ard/generator/util/VelocityInitializer.java
+++ b/ard-generator/src/main/java/com/ard/generator/util/VelocityInitializer.java
@@ -7,7 +7,7 @@
/**
* VelocityEngine工厂
*
- * @author ruoyi
+ * @author ard
*/
public class VelocityInitializer
{
diff --git a/ard-generator/src/main/java/com/ard/generator/util/VelocityUtils.java b/ard-generator/src/main/java/com/ard/generator/util/VelocityUtils.java
index cbcf02c..379cacc 100644
--- a/ard-generator/src/main/java/com/ard/generator/util/VelocityUtils.java
+++ b/ard-generator/src/main/java/com/ard/generator/util/VelocityUtils.java
@@ -16,7 +16,7 @@
/**
* 模板处理工具类
*
- * @author ruoyi
+ * @author ard
*/
public class VelocityUtils
{
diff --git a/ard-generator/src/main/resources/generator.yml b/ard-generator/src/main/resources/generator.yml
index 5f12119..6ceae44 100644
--- a/ard-generator/src/main/resources/generator.yml
+++ b/ard-generator/src/main/resources/generator.yml
@@ -1,7 +1,7 @@
# 代码生成
gen:
# 作者
- author: ruoyi
+ author: ard
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
packageName: com.ard.system
# 自动去除表前缀，默认是false
diff --git a/ard-quartz/src/main/java/com/ard/quartz/config/ScheduleConfig.java b/ard-quartz/src/main/java/com/ard/quartz/config/ScheduleConfig.java
index 0a3beb3..6578c05 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/config/ScheduleConfig.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/config/ScheduleConfig.java
@@ -9,7 +9,7 @@
///**
// * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效）
// *
-// * @author ruoyi
+// * @author ard
// */
//@Configuration
//public class ScheduleConfig
@@ -22,7 +22,7 @@
//
// // quartz参数
// Properties prop = new Properties();
-// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
+// prop.put("org.quartz.scheduler.instanceName", "ArdScheduler");
// prop.put("org.quartz.scheduler.instanceId", "AUTO");
// // 线程池配置
// prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
@@ -42,7 +42,7 @@
// prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
// factory.setQuartzProperties(prop);
//
-// factory.setSchedulerName("RuoyiScheduler");
+// factory.setSchedulerName("ArdScheduler");
// // 延时启动
// factory.setStartupDelay(1);
// factory.setApplicationContextSchedulerContextKey("applicationContextKey");
diff --git a/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobController.java b/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobController.java
index a56a19d..5311224 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobController.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobController.java
@@ -30,7 +30,7 @@
/**
* 调度任务信息操作处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/monitor/job")
diff --git a/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobLogController.java b/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobLogController.java
index bb3d469..4a82179 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobLogController.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/controller/SysJobLogController.java
@@ -22,7 +22,7 @@
/**
* 调度日志操作处理
*
- * @author ruoyi
+ * @author ard
*/
@RestController
@RequestMapping("/monitor/jobLog")
diff --git a/ard-quartz/src/main/java/com/ard/quartz/domain/SysJob.java b/ard-quartz/src/main/java/com/ard/quartz/domain/SysJob.java
index c4f0486..227e829 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/domain/SysJob.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/domain/SysJob.java
@@ -16,7 +16,7 @@
/**
* 定时任务调度表 sys_job
*
- * @author ruoyi
+ * @author ard
*/
public class SysJob extends BaseEntity
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/domain/SysJobLog.java b/ard-quartz/src/main/java/com/ard/quartz/domain/SysJobLog.java
index bbc12aa..a834142 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/domain/SysJobLog.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/domain/SysJobLog.java
@@ -9,7 +9,7 @@
/**
* 定时任务调度日志表 sys_job_log
*
- * @author ruoyi
+ * @author ard
*/
public class SysJobLog extends BaseEntity
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobLogMapper.java b/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobLogMapper.java
index 0a09312..c3dfd4d 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobLogMapper.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobLogMapper.java
@@ -6,7 +6,7 @@
/**
* 调度任务日志信息 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysJobLogMapper
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobMapper.java b/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobMapper.java
index 4d75a5b..12f9158 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobMapper.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/mapper/SysJobMapper.java
@@ -6,7 +6,7 @@
/**
* 调度任务信息 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysJobMapper
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobLogService.java b/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobLogService.java
index 03517da..43756a9 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobLogService.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobLogService.java
@@ -6,7 +6,7 @@
/**
* 定时任务调度日志信息信息 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysJobLogService
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobService.java b/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobService.java
index 36193ec..1515ef8 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobService.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/service/ISysJobService.java
@@ -8,7 +8,7 @@
/**
* 定时任务调度信息信息 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysJobService
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobLogServiceImpl.java b/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobLogServiceImpl.java
index b6b4983..af1b315 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobLogServiceImpl.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobLogServiceImpl.java
@@ -10,7 +10,7 @@
/**
* 定时任务调度日志信息 服务层
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysJobLogServiceImpl implements ISysJobLogService
diff --git a/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobServiceImpl.java b/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobServiceImpl.java
index 8efcc8b..7c2b195 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobServiceImpl.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/service/impl/SysJobServiceImpl.java
@@ -20,7 +20,7 @@
/**
* 定时任务调度信息 服务层
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysJobServiceImpl implements ISysJobService
diff --git a/ard-quartz/src/main/java/com/ard/quartz/task/RyTask.java b/ard-quartz/src/main/java/com/ard/quartz/task/RyTask.java
index b2e14aa..7634ba3 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/task/RyTask.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/task/RyTask.java
@@ -6,7 +6,7 @@
/**
* 定时任务调度测试
*
- * @author ruoyi
+ * @author ard
*/
@Component("ryTask")
public class RyTask
diff --git a/ard-quartz/src/main/java/com/ard/quartz/util/AbstractQuartzJob.java b/ard-quartz/src/main/java/com/ard/quartz/util/AbstractQuartzJob.java
index e35c92f..f29c6f5 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/util/AbstractQuartzJob.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/util/AbstractQuartzJob.java
@@ -19,7 +19,7 @@
/**
* 抽象quartz调用
*
- * @author ruoyi
+ * @author ard
*/
public abstract class AbstractQuartzJob implements Job
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/util/CronUtils.java b/ard-quartz/src/main/java/com/ard/quartz/util/CronUtils.java
index cae773c..88875f1 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/util/CronUtils.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/util/CronUtils.java
@@ -7,7 +7,7 @@
/**
* cron表达式工具类
*
- * @author ruoyi
+ * @author ard
*
*/
public class CronUtils
diff --git a/ard-quartz/src/main/java/com/ard/quartz/util/JobInvokeUtil.java b/ard-quartz/src/main/java/com/ard/quartz/util/JobInvokeUtil.java
index 8e99880..f6b88f3 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/util/JobInvokeUtil.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/util/JobInvokeUtil.java
@@ -11,7 +11,7 @@
/**
* 任务执行工具
*
- * @author ruoyi
+ * @author ard
*/
public class JobInvokeUtil
{
diff --git a/ard-quartz/src/main/java/com/ard/quartz/util/QuartzDisallowConcurrentExecution.java b/ard-quartz/src/main/java/com/ard/quartz/util/QuartzDisallowConcurrentExecution.java
index 6c93c65..b2ebb21 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/util/QuartzDisallowConcurrentExecution.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/util/QuartzDisallowConcurrentExecution.java
@@ -7,7 +7,7 @@
/**
* 定时任务处理（禁止并发执行）
*
- * @author ruoyi
+ * @author ard
*
*/
@DisallowConcurrentExecution
diff --git a/ard-quartz/src/main/java/com/ard/quartz/util/QuartzJobExecution.java b/ard-quartz/src/main/java/com/ard/quartz/util/QuartzJobExecution.java
index e889f95..4ff13b1 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/util/QuartzJobExecution.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/util/QuartzJobExecution.java
@@ -6,7 +6,7 @@
/**
* 定时任务处理（允许并发执行）
*
- * @author ruoyi
+ * @author ard
*
*/
public class QuartzJobExecution extends AbstractQuartzJob
diff --git a/ard-quartz/src/main/java/com/ard/quartz/util/ScheduleUtils.java b/ard-quartz/src/main/java/com/ard/quartz/util/ScheduleUtils.java
index 2deefba..57ce6fd 100644
--- a/ard-quartz/src/main/java/com/ard/quartz/util/ScheduleUtils.java
+++ b/ard-quartz/src/main/java/com/ard/quartz/util/ScheduleUtils.java
@@ -21,7 +21,7 @@
/**
* 定时任务工具类
*
- * @author ruoyi
+ * @author ard
*
*/
public class ScheduleUtils
diff --git a/ard-route/pom.xml b/ard-route/pom.xml
index 7d7e802..18a8f24 100644
--- a/ard-route/pom.xml
+++ b/ard-route/pom.xml
@@ -42,6 +42,15 @@
<artifactId>swagger-annotations</artifactId>
<version>1.6.2</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>5.3.33</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ard</groupId>
+ <artifactId>ard-oss</artifactId>
+ </dependency>
</dependencies>
diff --git a/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java b/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
index e886147..a9fe9e4 100644
--- a/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
+++ b/ard-route/src/main/java/com/ard/route/domain/UavRouteReq.java
@@ -14,6 +14,10 @@
/**
* 航线类型
+ * waypoint：航点飞行
+ * mapping2d：建图航拍
+ * mapping3d：倾斜摄影
+ * mappingStrip：航带飞行
*/
private String templateType;
@@ -39,16 +43,29 @@
/**
* 负载图片存储类型
+ * wide：存储广角镜头照片
+ * zoom：存储变焦镜头照片
+ * ir：存储红外镜头照片
+ * narrow_band: 存储窄带镜头拍摄照片
+ * visable：可见光照片
+ * * 注：存储多个镜头照片，格式
*/
private String imageFormat;
/**
* 航线结束动作
+ * goHome：飞行器完成航线任务后，退出航线模式并返航。noAction：飞行器完成航线任务后，退出航线模式。
+ * autoLand：飞行器完成航线任务后，退出航线模式并原地降落。
+ * gotoFirstWaypoint：飞行器完成航线任务后，立即飞向航线起始点，到达后退出航线模式。
+ * * 注：以上动作执行过程，若飞行器退出了航线模式且进入失控状态，则会优先执行失控动作。
*/
private String finishAction;
/**
* 失控动作
+ * goBack：返航。飞行器从失控位置飞向起飞点
+ * landing：降落。飞行器从失控位置原地降落
+ * hover：悬停。飞行器从失控位置悬停
*/
private String exitOnRcLostAction;
@@ -59,6 +76,7 @@
/**
* 全局航线飞行速度
+ * 1 - 15
*/
private Double autoFlightSpeed;
@@ -74,6 +92,8 @@
/**
* 云台俯仰角控制模式
+ * manual：手动控制。飞行器从一个航点飞向下一个航点的过程中，支持用户手动控制云台的俯仰角度。若无用户控制，则保持飞离航点时的云台俯仰角度。
+ * usePointSetting：依照每个航点设置。飞行器从一个航点飞向下一个航点的过程中，云台俯仰角均匀过渡至下一个航点的俯仰角。
*/
private String gimbalPitchMode;
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
index 23dbb57..d50be81 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlInfo.java
@@ -1,11 +1,13 @@
package com.ard.route.domain.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import lombok.Data;
@Data
@XStreamAlias("kml")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlInfo {
@XStreamAsAttribute
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
index de84a46..797a533 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlParams.java
@@ -89,7 +89,18 @@
*/
private MappingTypeReq mappingTypeReq;
-
private List<RoutePointInfo> routePointList;
+
+ /**
+ * 飞向首航点模式
+ * safely：安全模式
+ * pointToPoint：倾斜飞行模式
+ */
+ private String flyToWaylineMode;
+
+ /**
+ * 全局航线速度
+ */
+ private Double globalTransitionalSpeed;
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFile.java
similarity index 95%
rename from ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java
rename to ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFile.java
index 7c86914..5b8b989 100644
--- a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFile.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.route;
import java.util.Date;
import java.util.List;
diff --git a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java
similarity index 80%
rename from ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
rename to ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java
index f3757d7..79c65f9 100644
--- a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java
@@ -1,4 +1,4 @@
-package com.ard.route.domain;
+package com.ard.route.domain.route;
import java.util.List;
@@ -24,6 +24,10 @@
@Excel(name = "文件夹名称")
private String fileName;
+ /** 序列号 */
+ @Excel(name = "序列号")
+ private Integer serialNumber;
+
private List<ArdRouteFile> ardRouteFileLs;
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInformation.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInformation.java
new file mode 100644
index 0000000..2473649
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInformation.java
@@ -0,0 +1,37 @@
+package com.ard.route.domain.route;
+
+import com.ard.common.annotation.Excel;
+import com.ard.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 航线(kmz)对象 ard_route_information
+ *
+ * @author xia
+ * @date 2025-10-23
+ */
+@Data
+public class ArdRouteInformation extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ private String id;
+
+ /** 文件名称 */
+ @Excel(name = "文件名称")
+ private String fileName;
+
+ /** 新文件名称 */
+ @Excel(name = "新文件名称")
+ private String fileNameNew;
+
+ /** 文件路径 */
+ @Excel(name = "文件路径")
+ private String upPath;
+
+ /** 文件大小 */
+ @Excel(name = "文件大小")
+ private Double upFileSize;
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVO.java b/ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVO.java
new file mode 100644
index 0000000..c5fa375
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVO.java
@@ -0,0 +1,25 @@
+package com.ard.route.domain.vo;
+
+import com.ard.route.domain.kml.KmlInfo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Author:Cleaner
+ * Date: 2024/12/22 10:46
+ **/
+@Data
+public class KmzInfoVO implements Serializable {
+
+ /**
+ * 航线kml信息
+ */
+ private KmlInfo kmlInfo;
+
+ /**
+ * 航线wpml信息
+ */
+ private KmlInfo wpmlInfo;
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java
index bc965b2..45321db 100644
--- a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java
+++ b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java
@@ -1,7 +1,7 @@
package com.ard.route.mapper;
import java.util.List;
-import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteFile;
/**
* 文件Mapper接口
@@ -62,8 +62,9 @@
/**
* 根据所属文件夹ID，删除文件
*
- * @param folderId 所属文件夹ID
+ * @param folderIds 所属文件夹ID
* @return 结果
*/
- public int deleteArdRouteFileByFolderId(String folderId);
+ public int deleteRouteFileByFolderIds(String[] folderIds);
+
}
diff --git a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFolderMapper.java b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFolderMapper.java
index c4df0f7..95caa00 100644
--- a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFolderMapper.java
+++ b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFolderMapper.java
@@ -1,7 +1,7 @@
package com.ard.route.mapper;
import java.util.List;
-import com.ard.route.domain.ArdRouteFolder;
+import com.ard.route.domain.route.ArdRouteFolder;
/**
* 文件夹Mapper接口
diff --git a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteInformationMapper.java b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteInformationMapper.java
new file mode 100644
index 0000000..ebe8d97
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteInformationMapper.java
@@ -0,0 +1,63 @@
+package com.ard.route.mapper;
+
+import com.ard.route.domain.route.ArdRouteInformation;
+
+import java.util.List;
+
+/**
+ * 航线(kmz)Mapper接口
+ *
+ * @author xia
+ * @date 2025-10-23
+ */
+public interface ArdRouteInformationMapper {
+
+ /**
+ * 查询航线(kmz)
+ *
+ * @param id 航线(kmz)主键
+ * @return 航线(kmz)
+ */
+ public ArdRouteInformation selectArdRouteInformationById(String id);
+
+ /**
+ * 查询航线(kmz)列表
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 航线(kmz)集合
+ */
+ public List<ArdRouteInformation> selectArdRouteInformationList(ArdRouteInformation ardRouteInformation);
+
+ /**
+ * 新增航线(kmz)
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 结果
+ */
+ public int insertArdRouteInformation(ArdRouteInformation ardRouteInformation);
+
+ /**
+ * 修改航线(kmz)
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 结果
+ */
+ public int updateArdRouteInformation(ArdRouteInformation ardRouteInformation);
+
+ /**
+ * 删除航线(kmz)
+ *
+ * @param id 航线(kmz)主键
+ * @return 结果
+ */
+ public int deleteArdRouteInformationById(String id);
+
+ /**
+ * 批量删除航线(kmz)
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteArdRouteInformationByIds(String[] ids);
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteFileService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteFileService.java
index ce3185b..405f720 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteFileService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteFileService.java
@@ -1,7 +1,7 @@
package com.ard.route.service;
import java.util.List;
-import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteFile;
/**
* 文件Service接口
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java
index 652673b..126d96b 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java
@@ -3,7 +3,7 @@
import java.util.List;
import java.util.Map;
-import com.ard.route.domain.ArdRouteFolder;
+import com.ard.route.domain.route.ArdRouteFolder;
/**
* 文件夹Service接口
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
new file mode 100644
index 0000000..41cd1f5
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteInformationService.java
@@ -0,0 +1,63 @@
+package com.ard.route.service;
+
+import com.ard.route.domain.route.ArdRouteInformation;
+
+import java.util.List;
+
+/**
+ * 航线(kmz)Service接口
+ *
+ * @author xia
+ * @date 2025-10-23
+ */
+public interface IArdRouteInformationService {
+
+ /**
+ * 查询航线(kmz)
+ *
+ * @param id 航线(kmz)主键
+ * @return 航线(kmz)
+ */
+ public ArdRouteInformation selectArdRouteInformationById(String id);
+
+ /**
+ * 查询航线(kmz)列表
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 航线(kmz)集合
+ */
+ public List<ArdRouteInformation> selectArdRouteInformationList(ArdRouteInformation ardRouteInformation);
+
+ /**
+ * 新增航线(kmz)
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 结果
+ */
+ public int insertArdRouteInformation(ArdRouteInformation ardRouteInformation);
+
+ /**
+ * 修改航线(kmz)
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 结果
+ */
+ public int updateArdRouteInformation(ArdRouteInformation ardRouteInformation);
+
+ /**
+ * 批量删除航线(kmz)
+ *
+ * @param ids 需要删除的航线(kmz)主键集合
+ * @return 结果
+ */
+ public int deleteArdRouteInformationByIds(String[] ids);
+
+ /**
+ * 删除航线(kmz)信息
+ *
+ * @param id 航线(kmz)主键
+ * @return 结果
+ */
+ public int deleteArdRouteInformationById(String id);
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/service/UavRouteService.java b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
index 6aef571..b219c1a 100644
--- a/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
+++ b/ard-route/src/main/java/com/ard/route/service/UavRouteService.java
@@ -1,17 +1,26 @@
package com.ard.route.service;
import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.vo.KmzInfoVO;
+
+import java.io.IOException;
+
public interface UavRouteService {
/**
* 编辑kmz文件
*/
- void updateKmz(UavRouteReq uavRouteReq);
+ public String updateKmz(UavRouteReq uavRouteReq);
/**
* 生成kmz文件(带航点)
*/
- void buildKmz(UavRouteReq uavRouteReq);
+ public String buildKmz(UavRouteReq uavRouteReq, String fileName);
+
+ /**
+ * 解析kmz文件
+ */
+ KmzInfoVO parseKmz(String file) throws IOException;
}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
index 175ba15..568796a 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
@@ -1,16 +1,14 @@
package com.ard.route.service.impl;
import java.util.List;
-import java.util.UUID;
import com.ard.common.annotation.DataScope;
import com.ard.common.utils.DateUtils;
-import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteFileMapper;
-import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteFile;
import com.ard.route.service.IArdRouteFileService;
/**
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
index 2b0a1b3..fcd9df0 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
@@ -6,14 +6,13 @@
import com.ard.common.annotation.DataScope;
import com.ard.common.utils.DateUtils;
-import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteFile;
import com.ard.route.mapper.ArdRouteFileMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteFolderMapper;
-import com.ard.route.domain.ArdRouteFolder;
+import com.ard.route.domain.route.ArdRouteFolder;
import com.ard.route.service.IArdRouteFolderService;
import org.springframework.transaction.annotation.Transactional;
@@ -105,12 +104,8 @@
@Transactional(rollbackFor = Exception.class)
public Map<String, Integer> deleteArdRouteFolderByIds(String[] ids) {
Map<String, Integer> result = new HashMap<>();
- int fileAdd = 0;
// 删除文件夹的同时也删除文件夹下的所有文件
- for (String folderId : ids) {
- ardRouteFileMapper.deleteArdRouteFileByFolderId(folderId);
- fileAdd ++;
- }
+ int fileAdd = ardRouteFileMapper.deleteRouteFileByFolderIds(ids);
result.put("file", fileAdd);
int folderCount = ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
result.put("folder", folderCount);
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
new file mode 100644
index 0000000..a05968e
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInformationServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ard.route.service.impl;
+
+import java.util.List;
+import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.uuid.IdUtils;
+import com.ard.route.domain.route.ArdRouteInformation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ard.route.mapper.ArdRouteInformationMapper;
+import com.ard.route.service.IArdRouteInformationService;
+
+/**
+ * 航线(kmz)Service业务层处理
+ *
+ * @author xia
+ * @date 2025-10-23
+ */
+@Service
+public class ArdRouteInformationServiceImpl implements IArdRouteInformationService {
+
+ @Autowired
+ private ArdRouteInformationMapper ardRouteInformationMapper;
+
+ /**
+ * 查询航线(kmz)
+ *
+ * @param id 航线(kmz)主键
+ * @return 航线(kmz)
+ */
+ @Override
+ public ArdRouteInformation selectArdRouteInformationById(String id) {
+ return ardRouteInformationMapper.selectArdRouteInformationById(id);
+ }
+
+ /**
+ * 查询航线(kmz)列表
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 航线(kmz)
+ */
+ @Override
+ public List<ArdRouteInformation> selectArdRouteInformationList(ArdRouteInformation ardRouteInformation) {
+ return ardRouteInformationMapper.selectArdRouteInformationList(ardRouteInformation);
+ }
+
+ /**
+ * 新增航线(kmz)
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 结果
+ */
+ @Override
+ public int insertArdRouteInformation(ArdRouteInformation ardRouteInformation) {
+ ardRouteInformation.setId(IdUtils.simpleUUID());
+ ardRouteInformation.setCreateTime(DateUtils.getNowDate());
+ return ardRouteInformationMapper.insertArdRouteInformation(ardRouteInformation);
+ }
+
+ /**
+ * 修改航线(kmz)
+ *
+ * @param ardRouteInformation 航线(kmz)
+ * @return 结果
+ */
+ @Override
+ public int updateArdRouteInformation(ArdRouteInformation ardRouteInformation) {
+ ardRouteInformation.setUpdateTime(DateUtils.getNowDate());
+ return ardRouteInformationMapper.updateArdRouteInformation(ardRouteInformation);
+ }
+
+ /**
+ * 批量删除航线(kmz)
+ *
+ * @param ids 需要删除的航线(kmz)主键
+ * @return 结果
+ */
+ @Override
+ public int deleteArdRouteInformationByIds(String[] ids) {
+ return ardRouteInformationMapper.deleteArdRouteInformationByIds(ids);
+ }
+
+ /**
+ * 删除航线(kmz)信息
+ *
+ * @param id 航线(kmz)主键
+ * @return 结果
+ */
+ @Override
+ public int deleteArdRouteInformationById(String id) {
+ return ardRouteInformationMapper.deleteArdRouteInformationById(id);
+ }
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
index 33b596b..2db7981 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
@@ -3,26 +3,42 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.io.FileUtil;
+import com.ard.common.utils.SecurityUtils;
+import com.ard.oss.service.impl.OssServiceContext;
import com.ard.route.constant.FileTypeConstants;
import com.ard.route.domain.RoutePointReq;
import com.ard.route.domain.UavRouteReq;
import com.ard.route.domain.WaypointHeadingReq;
import com.ard.route.domain.WaypointTurnReq;
import com.ard.route.domain.kml.*;
+import com.ard.route.domain.route.ArdRouteInformation;
+import com.ard.route.domain.vo.KmzInfoVO;
import com.ard.route.enums.kml.ExitOnRCLostEnums;
+import com.ard.route.service.IArdRouteInformationService;
+import com.ard.route.util.FileUtils;
import com.ard.route.util.RouteFileUtils;
import com.ard.route.service.UavRouteService;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
+import javax.annotation.Resource;
+import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.zip.ZipOutputStream;
+
+import static com.ard.route.util.RouteFileUtils.*;
+import static com.ard.route.util.ToolUtils.getFileNameWithoutExtension;
/**
* Author:songjian
@@ -31,8 +47,25 @@
@Service
public class UavRouteServiceImpl implements UavRouteService {
+ private Boolean isLocal = false;
+
+ private String localFilePath = "KmzFile/kmz/";
+
+ private String kmzPath = "kmz";
+
+ @Resource
+ private OssServiceContext ossService;
+
+ @Resource
+ private IArdRouteInformationService ardRouteInformationService;
+
+ /**
+ * XML 头部
+ */
+ private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+
@Override
- public void updateKmz(UavRouteReq uavRouteReq) {
+ public String updateKmz(UavRouteReq uavRouteReq) {
// TODO 替换本地文件路径！！！
File file = FileUtil.file("/Users/songjian/Project/IdeaProjects/dj-uav/file/kmz/航线kmz文件.kmz");
try (ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(FileUtil.getInputStream(file))) {
@@ -51,9 +84,10 @@
this.handleRouteUpdate(wpmlInfo, uavRouteReq, FileTypeConstants.WPML, kmlParams);
}
}
- RouteFileUtils.buildKmz("更新航线kmz文件", kmlInfo, wpmlInfo);
+ return RouteFileUtils.buildKmz("更新航线kmz文件", kmlInfo, wpmlInfo, kmzPath);
} catch (Exception e) {
e.printStackTrace();
+ return "更新航线kmz文件失败";
}
}
@@ -99,10 +133,112 @@
}
@Override
- public void buildKmz(UavRouteReq uavRouteReq) {
+ public String buildKmz(UavRouteReq uavRouteReq, String fileName) {
KmlParams kmlParams = new KmlParams();
BeanUtils.copyProperties(uavRouteReq, kmlParams);
kmlParams.setRoutePointList(BeanUtil.copyToList(uavRouteReq.getRoutePointList(), RoutePointInfo.class));
- RouteFileUtils.buildKmz("航线kmz文件AAAAAA", kmlParams);
+ return buildKmz(fileName, kmlParams);
+ }
+
+ /**
+ * 生成航线 KMZ 文件
+ *
+ * @param fileName 文件名
+ * @param kmlParams 参数对象
+ * @return 本地文件路径
+ */
+ public String buildKmz(String fileName, KmlParams kmlParams) {
+ KmlInfo kmlInfo = buildKml(kmlParams);
+ KmlInfo wpmlInfo = buildWpml(kmlParams);
+ return buildKmz(fileName, kmlInfo, wpmlInfo);
+ }
+
+ /**
+ * 生成航线 KMZ 文件
+ *
+ * @param fileName 文件名
+ * @param kmlInfo kml 文件信息
+ * @param wpmlInfo wpml 文件信息
+ * @return 本地文件路径
+ */
+ public String buildKmz(String fileName, KmlInfo kmlInfo, KmlInfo wpmlInfo) {
+ XStream xStream = new XStream(new DomDriver());
+ xStream.processAnnotations(KmlInfo.class);
+ xStream.addImplicitCollection(KmlActionGroup.class, "action");
+
+ String kml = XML_HEADER + xStream.toXML(kmlInfo);
+ String wpml = XML_HEADER + xStream.toXML(wpmlInfo);
+
+ // 判断本地生成kmz文件
+ if (isLocal) {
+ try (FileOutputStream fileOutputStream = new FileOutputStream(localFilePath + fileName + ".kmz");
+ ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream)) {
+ zipOutputStream.setLevel(0); // 0 表示不压缩，存储方式
+
+ // 创建KMZ文件内容
+ buildZipFile("wpmz/template.kml", zipOutputStream, kml);
+ buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return localFilePath + fileName + ".kmz";
+ }else {
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ZipOutputStream zipOutputStream = new ZipOutputStream(baos)) {
+ zipOutputStream.setLevel(0);
+
+ // 创建KMZ文件内容
+ buildZipFile("wpmz/template.kml", zipOutputStream, kml);
+ buildZipFile("wpmz/waylines.wpml", zipOutputStream, wpml);
+
+ zipOutputStream.finish();
+ zipOutputStream.flush();
+
+ // 获取文件大小
+ Double fileSize = (double) baos.size(); // 字节数
+
+ // 创建MultipartFile对象
+ MultipartFile multipartFile = new MockMultipartFile(
+ fileName + ".kmz",
+ fileName + ".kmz",
+ "application/vnd.google-earth.kmz",
+ new ByteArrayInputStream(baos.toByteArray())
+ );
+ String kmzFilePath = ossService.upload(kmzPath,multipartFile);
+ // KMZ信息管理
+ ArdRouteInformation ardRouteInformation = new ArdRouteInformation();
+ ardRouteInformation.setFileName(fileName);
+ ardRouteInformation.setFileNameNew(getFileNameWithoutExtension(kmzFilePath));
+ ardRouteInformation.setUpPath(kmzFilePath);
+ ardRouteInformation.setUpFileSize(fileSize);
+ ardRouteInformation.setCreateBy(SecurityUtils.getUsername());
+ ardRouteInformationService.insertArdRouteInformation(ardRouteInformation);
+ return kmzFilePath;
+ } catch (Exception e) {
+ throw new RuntimeException("KMZ文件生成或上传失败", e);
+ }
+ }
+ }
+
+ @Override
+ public KmzInfoVO parseKmz(String fileUrl) throws IOException {
+ KmzInfoVO kmzInfoVO = new KmzInfoVO();
+ File file = FileUtils.downloadUrlToTempFile(fileUrl);
+ try (ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(FileUtil.getInputStream(file))) {
+ ArchiveEntry entry;
+ while (!Objects.isNull(entry = archiveInputStream.getNextEntry())) {
+ String name = entry.getName();
+ if (name.toLowerCase().endsWith(".kml")) {
+ kmzInfoVO.setKmlInfo(RouteFileUtils.parseKml(archiveInputStream));
+ } else if (name.toLowerCase().endsWith(".wpml")) {
+ kmzInfoVO.setWpmlInfo(RouteFileUtils.parseKml(archiveInputStream));
+ }
+ }
+ return kmzInfoVO;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
}
diff --git a/ard-route/src/main/java/com/ard/route/util/FileUtils.java b/ard-route/src/main/java/com/ard/route/util/FileUtils.java
new file mode 100644
index 0000000..ffb90ce
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/util/FileUtils.java
@@ -0,0 +1,42 @@
+package com.ard.route.util;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+
+/**
+ * Author:Cleaner
+ * Date: 2025/5/29 17:16
+ **/
+public class FileUtils {
+ public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
+ // 获取原始文件名
+ String originalFilename = multipartFile.getOriginalFilename();
+ // 创建临时文件（建议加上后缀）
+ File file = File.createTempFile("temp-", originalFilename != null ? originalFilename.substring(originalFilename.lastIndexOf(".")) : null);
+ // 将 MultipartFile 转为 File
+ multipartFile.transferTo(file);
+ // JVM 退出时删除临时文件（可选）
+ file.deleteOnExit();
+ return file;
+ }
+
+ public static File downloadUrlToTempFile(String urlStr) throws IOException {
+ URL url = new URL(urlStr);
+ File tempFile = Files.createTempFile("download-", "zip").toFile();
+ try (InputStream in = url.openStream(); FileOutputStream out = new FileOutputStream(tempFile)) {
+ byte[] buffer = new byte[8192];
+ int bytesRead;
+ while ((bytesRead = in.read(buffer)) != -1) {
+ out.write(buffer, 0, bytesRead);
+ }
+ }
+ tempFile.deleteOnExit(); // JVM 退出时删除
+ return tempFile;
+ }
+}
diff --git a/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
index cff95f2..b888454 100644
--- a/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
@@ -57,25 +57,12 @@
/**
* 生成航线 KMZ 文件
*
- * @param fileName 文件名
- * @param kmlParams 参数对象
- * @return 本地文件路径
- */
- public static String buildKmz(String fileName, KmlParams kmlParams) {
- KmlInfo kmlInfo = buildKml(kmlParams);
- KmlInfo wpmlInfo = buildWpml(kmlParams);
- return buildKmz(fileName, kmlInfo, wpmlInfo);
- }
-
- /**
- * 生成航线 KMZ 文件
- *
* @param fileName 文件名
* @param kmlInfo kml 文件信息
* @param wpmlInfo wpml 文件信息
* @return 本地文件路径
*/
- public static String buildKmz(String fileName, KmlInfo kmlInfo, KmlInfo wpmlInfo) {
+ public static String buildKmz(String fileName, KmlInfo kmlInfo, KmlInfo wpmlInfo, String kmzFilePath) {
XStream xStream = new XStream(new DomDriver());
xStream.processAnnotations(KmlInfo.class);
xStream.addImplicitCollection(KmlActionGroup.class, "action");
@@ -83,7 +70,7 @@
String kml = XML_HEADER + xStream.toXML(kmlInfo);
String wpml = XML_HEADER + xStream.toXML(wpmlInfo);
- try (FileOutputStream fileOutputStream = new FileOutputStream(LOCAL_KMZ_FILE_PATH + fileName + ".kmz");
+ try (FileOutputStream fileOutputStream = new FileOutputStream(kmzFilePath + fileName + ".kmz");
ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream)) {
zipOutputStream.setLevel(0); // 0 表示不压缩，存储方式
@@ -96,10 +83,10 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- return LOCAL_KMZ_FILE_PATH + fileName + ".kmz";
+ return kmzFilePath + fileName + ".kmz";
}
- private static void buildZipFile(String name, ZipOutputStream zipOutputStream, String content) throws IOException {
+ public static void buildZipFile(String name, ZipOutputStream zipOutputStream, String content) throws IOException {
ZipEntry kmlEntry = new ZipEntry(name);
zipOutputStream.putNextEntry(kmlEntry);
// 将内容写入 ZIP 条目
@@ -112,7 +99,6 @@
}
zipOutputStream.closeEntry(); // 关闭条目
}
-
public static KmlInfo buildKml(KmlParams kmlParams) {
KmlInfo kmlInfo = new KmlInfo();
@@ -129,7 +115,7 @@
public static KmlDocument buildKmlDocument(String fileType, KmlParams kmlParams) {
KmlDocument kmlDocument = new KmlDocument();
if (StringUtils.equals(fileType, FileTypeConstants.KML)) {
- kmlDocument.setAuthor("Cleaner");
+ kmlDocument.setAuthor("Ard-Creator");
kmlDocument.setCreateTime(String.valueOf(DateUtil.current()));
kmlDocument.setUpdateTime(String.valueOf(DateUtil.current()));
}
@@ -140,7 +126,11 @@
public static KmlMissionConfig buildKmlMissionConfig(KmlParams kmlParams) {
KmlMissionConfig kmlMissionConfig = new KmlMissionConfig();
- kmlMissionConfig.setFlyToWayLineMode(FlyToWaylineModeEnums.SAFELY.getValue());
+ if (kmlParams.getFlyToWaylineMode() != null){
+ kmlMissionConfig.setFlyToWayLineMode(kmlParams.getFlyToWaylineMode());
+ }else {
+ kmlMissionConfig.setFlyToWayLineMode(FlyToWaylineModeEnums.SAFELY.getValue());
+ }
kmlMissionConfig.setFinishAction(kmlParams.getFinishAction());
if (StringUtils.isNotBlank(kmlParams.getExitOnRcLostAction())) {
kmlMissionConfig.setExitOnRCLost(ExitOnRCLostEnums.EXECUTE_LOST_ACTION.getValue());
@@ -149,7 +139,11 @@
kmlMissionConfig.setExitOnRCLost(ExitOnRCLostEnums.GO_CONTINUE.getValue());
}
kmlMissionConfig.setTakeOffSecurityHeight("20");
- kmlMissionConfig.setGlobalTransitionalSpeed("15");
+ if (kmlParams.getGlobalTransitionalSpeed() != null){
+ kmlMissionConfig.setGlobalTransitionalSpeed(String.valueOf(kmlParams.getGlobalTransitionalSpeed()));
+ }else {
+ kmlMissionConfig.setGlobalTransitionalSpeed("15");
+ }
kmlMissionConfig.setGlobalRTHHeight("100");
kmlMissionConfig.setTakeOffRefPoint(kmlParams.getTakeOffRefPoint());
kmlMissionConfig.setDroneInfo(buildKmlDroneInfo(kmlParams.getDroneType(), kmlParams.getSubDroneType()));
@@ -173,9 +167,7 @@
kmlPayloadInfo.setPayloadEnumValue(String.valueOf(payloadType));
kmlPayloadInfo.setPayloadPositionIndex(String.valueOf(payloadPosition));
return kmlPayloadInfo;
-
}
-
public static KmlFolder buildKmlFolder(String fileType, KmlParams kmlParams) {
KmlFolder kmlFolder = new KmlFolder();
@@ -245,7 +237,6 @@
return kmlFolder;
}
-
public static KmlWayLineCoordinateSysParam buildKmlWayLineCoordinateSysParam(String templateType) {
KmlWayLineCoordinateSysParam kmlWayLineCoordinateSysParam = new KmlWayLineCoordinateSysParam();
kmlWayLineCoordinateSysParam.setCoordinateMode("WGS84");
@@ -275,7 +266,6 @@
// 0: 不上色 1: 真彩上色
kmlPayloadParam.setModelColoringEnable("1");
kmlPayloadParam.setImageFormat(kmlParams.getImageFormat());
-
return kmlPayloadParam;
}
@@ -290,7 +280,6 @@
}
kmlGlobalWaypointHeadingParam.setWaypointHeadingPathMode(WaypointHeadingPathModeEnums.FOLLOW_BAD_ARC.getValue());
return kmlGlobalWaypointHeadingParam;
-
}
public static KmlPlacemark buildKmlPlacemark(RoutePointInfo routePointInfo, KmlParams kmlParams, String fileType) {
@@ -298,7 +287,6 @@
kmlPlacemark.setIsRisky("0");
kmlPlacemark.setKmlPoint(buildKmlPoint(String.valueOf(routePointInfo.getLongitude()), String.valueOf(routePointInfo.getLatitude())));
kmlPlacemark.setIndex(String.valueOf(routePointInfo.getRoutePointIndex()));
-
handleHeight(routePointInfo, kmlParams, fileType, kmlPlacemark);
handleSpeed(routePointInfo, kmlParams, fileType, kmlPlacemark);
handleWaypointHeadingParam(routePointInfo, kmlParams, fileType, kmlPlacemark);
@@ -356,7 +344,6 @@
private static KmlPolygon buildKmlPolygon(List<CoordinatePointReq> coordinatePointReqList) {
KmlPolygon kmlPolygon = new KmlPolygon();
KmlLinearRing kmlLinearRing = new KmlLinearRing();
-
String coordinates = coordinatePointReqList.stream().map(point -> point.getLongitude() + "," + point.getLatitude() + "," + point.getHeight())
.collect(Collectors.joining(", "));
kmlLinearRing.setCoordinates(StringUtils.join(coordinates, " "));
@@ -405,9 +392,7 @@
kmlPlacemark.setWaypointHeadingParam(buildKmlWaypointHeadingParam(globalWaypointHeading.getWaypointHeadingMode(), globalWaypointHeading.getWaypointHeadingAngle(), globalWaypointHeading.getWaypointPoiPoint()));
}
}
-
}
-
private static void handleSpeed(RoutePointInfo routePointInfo, KmlParams kmlParams, String fileType, KmlPlacemark kmlPlacemark) {
if (ObjectUtil.isNotEmpty(routePointInfo.getSpeed())) {
@@ -484,7 +469,6 @@
kmlActionGroup.setActionGroupEndIndex(String.valueOf(ObjectUtil.isNotNull(routePointInfo.getEndIntervalRouteIndex()) ?
routePointInfo.getEndIntervalRouteIndex() : routePointInfo.getRoutePointIndex()));
kmlActionGroup.setActionGroupMode(ActionGroupModeEnums.SEQUENCE.getValue());
-
String actionTriggerType = ActionTriggerTypeEnums.REACH_POINT.getValue();
Double actionTriggerParam = 0.0;
if (ObjectUtil.isNotNull(routePointInfo.getTimeInterval())) {
@@ -494,7 +478,6 @@
actionTriggerType = ActionTriggerTypeEnums.MULTIPLE_DISTANCE.getValue();
actionTriggerParam = routePointInfo.getDistanceInterval();
}
-
kmlActionGroup.setActionTrigger(buildKmlActionTrigger(actionTriggerType, actionTriggerParam));
List<KmlAction> kmlActionList = new ArrayList<>();
for (PointActionReq pointActionReq : routePointInfo.getActions()) {
@@ -515,7 +498,6 @@
} else if (ObjectUtil.isNotNull(pointActionReq.getStopRecord()) && pointActionReq.getStopRecord()) {
kmlActionList.add(buildKmlAction(String.valueOf(pointActionReq.getActionIndex()), ActionActuatorFuncEnums.STOP_RECORD.getValue(), pointActionReq, kmlParams));
}
-
}
kmlActionGroup.setAction(kmlActionList);
return kmlActionGroup;
diff --git a/ard-route/src/main/java/com/ard/route/util/ToolUtils.java b/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
new file mode 100644
index 0000000..3721f3f
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
@@ -0,0 +1,43 @@
+package com.ard.route.util;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 工具类
+ */
+public class ToolUtils {
+
+ /**
+ * 生成KMZ文件名称规则
+ */
+ public static String buildKmzFileName() {
+ // 获取当前日期时间
+ LocalDateTime now = LocalDateTime.now();
+ return "测试KMZ文件" + "_" + now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss"));
+ }
+
+ /**
+ * 根据路径截取文件名
+ */
+ public static String getFileNameWithoutExtension(String filePath) {
+ if (filePath == null || filePath.trim().isEmpty()) {
+ return "";
+ }
+
+ // 规范化路径，处理正斜杠和反斜杠
+ String normalizedPath = filePath.replace('\\', '/');
+
+ // 获取文件名（含扩展名）
+ String fileNameWithExt = normalizedPath.substring(normalizedPath.lastIndexOf('/') + 1);
+
+ // 去除扩展名
+ int lastDotIndex = fileNameWithExt.lastIndexOf('.');
+ if (lastDotIndex > 0) {
+ return fileNameWithExt.substring(0, lastDotIndex);
+ }
+
+ return fileNameWithExt;
+ }
+
+}
diff --git a/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml
index 1a64382..4da07b8 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.route.mapper.ArdRouteFileMapper">
-
+
<resultMap type="ArdRouteFile" id="ArdRouteFileResult">
<result property="id" column="id" />
<result property="name" column="name" />
@@ -33,15 +33,19 @@
<select id="selectArdRouteFileList" parameterType="ArdRouteFile" resultMap="ArdRouteFileResult">
<include refid="selectArdRouteFileVo"/>
- <where>
+ <where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="folderId != null and folderId != ''"> and folder_id = #{folderId}</if>
<if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if>
<if test="fileSize != null "> and file_size = #{fileSize}</if>
<if test="filePath != null and filePath != ''"> and file_path = #{filePath}</if>
+ <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
+ <if test="createTime != null "> and create_time = #{createTime}</if>
+ <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
+ <if test="updateTime != null "> and update_time = #{updateTime}</if>
</where>
</select>
-
+
<select id="selectArdRouteFileById" parameterType="String" resultMap="ArdRouteFileResult">
<include refid="selectArdRouteFileVo"/>
where id = #{id}
@@ -60,7 +64,7 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
@@ -72,7 +76,7 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
- </trim>
+ </trim>
</insert>
<update id="updateArdRouteFile" parameterType="ArdRouteFile">
@@ -95,14 +99,18 @@
delete from ard_route_file where id = #{id}
</delete>
- <delete id="deleteArdRouteFileByFolderId" parameterType="String">
- delete from ard_route_file where folder_id = #{folderId}
- </delete>
-
<delete id="deleteArdRouteFileByIds" parameterType="String">
- delete from ard_route_file where id in
+ delete from ard_route_file where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
+
+ <delete id="deleteRouteFileByFolderIds" parameterType="String">
+ delete from ard_route_file where folder_id in
+ <foreach item="folderId" collection="array" open="(" separator="," close=")">
+ #{folderId}
+ </foreach>
+ </delete>
+
</mapper>
\ No newline at end of file
diff --git a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
index 29385ce..f3b8ac0 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
@@ -1,25 +1,34 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.route.mapper.ArdRouteFolderMapper">
-
+
<resultMap type="ArdRouteFolder" id="ArdRouteFolderResult">
<result property="id" column="id" />
<result property="fileName" column="file_name" />
+ <result property="serialNumber" column="serial_number" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <!-- 关联 ArdRouteFile 对象 -->
+ <association property="ardRouteFile"
+ javaType="com.ard.route.domain.route.ArdRouteFile"
+ column="folder_id"
+ autoMapping="true"
+ select="selectArdRouteFile">
+ </association>
</resultMap>
- <select id="selectArdRouteFile" resultType="com.ard.route.domain.ArdRouteFile">
+ <select id="selectArdRouteFile" resultType="com.ard.route.domain.route.ArdRouteFile">
select * from ard_route_file where id = #{folderId}
</select>
<sql id="selectArdRouteFolderVo">
select id,
file_name,
+ serial_number,
create_by,
create_time,
update_by,
@@ -29,11 +38,15 @@
<select id="selectArdRouteFolderList" parameterType="ArdRouteFolder" resultMap="ArdRouteFolderResult">
<include refid="selectArdRouteFolderVo"/>
- <where>
+ <where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+ <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
+ <if test="createdTime != null "> and created_time = #{createdTime}</if>
+ <if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
+ <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
</where>
</select>
-
+
<select id="selectArdRouteFolderById" parameterType="String" resultMap="ArdRouteFolderResult">
<include refid="selectArdRouteFolderVo"/>
where id = #{id}
@@ -44,25 +57,28 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="fileName != null">file_name,</if>
+ <if test="serialNumber != null">serial_number,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="fileName != null">#{fileName},</if>
+ <if test="serialNumber != null">#{serialNumber},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
- </trim>
+ </trim>
</insert>
<update id="updateArdRouteFolder" parameterType="ArdRouteFolder">
update ard_route_folder
<trim prefix="SET" suffixOverrides=",">
<if test="fileName != null">file_name = #{fileName},</if>
+ <if test="serialNumber != null">serial_number = #{serialNumber},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@@ -76,7 +92,7 @@
</delete>
<delete id="deleteArdRouteFolderByIds" parameterType="String">
- delete from ard_route_folder where id in
+ delete from ard_route_folder where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
new file mode 100644
index 0000000..c525b94
--- /dev/null
+++ b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ard.route.mapper.ArdRouteInformationMapper">
+
+ <resultMap type="ArdRouteInformation" id="ArdRouteInformationResult">
+ <result property="id" column="id" />
+ <result property="fileName" column="file_name" />
+ <result property="fileNameNew" column="file_name_new" />
+ <result property="upPath" column="up_path" />
+ <result property="upFileSize" column="up_file_size" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectArdRouteInformationVo">
+ select id,
+ file_name,
+ file_name_new,
+ up_path,
+ up_file_size,
+ create_by,
+ create_time,
+ update_by,
+ update_time
+ from ard_route_information
+ </sql>
+
+ <select id="selectArdRouteInformationList" parameterType="ArdRouteInformation" resultMap="ArdRouteInformationResult">
+ <include refid="selectArdRouteInformationVo"/>
+ <where>
+ <if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+ <if test="upPath != null and upPath != ''"> and up_path = #{upPath}</if>
+ <if test="upFileSize != null "> and up_file_size = #{upFileSize}</if>
+ </where>
+ </select>
+
+ <select id="selectArdRouteInformationById" parameterType="String" resultMap="ArdRouteInformationResult">
+ <include refid="selectArdRouteInformationVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertArdRouteInformation" parameterType="ArdRouteInformation">
+ insert into ard_route_information
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="fileName != null">file_name,</if>
+ <if test="fileNameNew != null">file_name_new,</if>
+ <if test="upPath != null">up_path,</if>
+ <if test="upFileSize != null">up_file_size,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="fileName != null">#{fileName},</if>
+ <if test="fileNameNew != null">#{fileNameNew},</if>
+ <if test="upPath != null">#{upPath},</if>
+ <if test="upFileSize != null">#{upFileSize},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdRouteInformation" parameterType="ArdRouteInformation">
+ update ard_route_information
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="fileName != null">file_name = #{fileName},</if>
+ <if test="fileNameNew != null">file_name_new = #{fileNameNew},</if>
+ <if test="upPath != null">up_path = #{upPath},</if>
+ <if test="upFileSize != null">up_file_size = #{upFileSize},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteArdRouteInformationById" parameterType="String">
+ delete from ard_route_information where id = #{id}
+ </delete>
+
+ <delete id="deleteArdRouteInformationByIds" parameterType="String">
+ delete from ard_route_information where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
index 477377e..0b746f5 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
@@ -12,7 +12,7 @@
/**
* 禁飞区管理对象 ard_no_fly_zone
*
- * @author ruoyi
+ * @author ard
* @date 2025-10-14
*/
@Data
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java b/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
index 0a0acc3..5b59628 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java
@@ -6,7 +6,7 @@
/**
* 禁飞区管理Mapper接口
*
- * @author ruoyi
+ * @author ard
* @date 2025-10-14
*/
public interface ArdNoFlyZoneMapper
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java b/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
index 4287024..72ecbd5 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java
@@ -6,7 +6,7 @@
/**
* 禁飞区管理Service接口
*
- * @author ruoyi
+ * @author ard
* @date 2025-10-14
*/
public interface IArdNoFlyZoneService
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java b/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
index a2549c6..8f4c338 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java
@@ -15,7 +15,7 @@
/**
* 禁飞区管理Service业务层处理
*
- * @author ruoyi
+ * @author ard
* @date 2025-10-14
*/
@Service
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysCache.java b/ard-system/src/main/java/com/ard/system/domain/SysCache.java
index 7a556b8..8d20802 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysCache.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysCache.java
@@ -5,7 +5,7 @@
/**
* 缓存信息
*
- * @author ruoyi
+ * @author ard
*/
public class SysCache
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysConfig.java b/ard-system/src/main/java/com/ard/system/domain/SysConfig.java
index 3a432a4..5c683d7 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysConfig.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysConfig.java
@@ -11,7 +11,7 @@
/**
* 参数配置表 sys_config
*
- * @author ruoyi
+ * @author ard
*/
public class SysConfig extends BaseEntity
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java b/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
index f02267c..f69026d 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysLogininfor.java
@@ -9,7 +9,7 @@
/**
* 系统访问记录表 sys_logininfor
*
- * @author ruoyi
+ * @author ard
*/
public class SysLogininfor extends BaseEntity
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysNotice.java b/ard-system/src/main/java/com/ard/system/domain/SysNotice.java
index 27b23ab..d14e07f 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysNotice.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysNotice.java
@@ -10,7 +10,7 @@
/**
* 通知公告表 sys_notice
*
- * @author ruoyi
+ * @author ard
*/
public class SysNotice extends BaseEntity
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java b/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
index 0d4794f..619991f 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysOperLog.java
@@ -9,7 +9,7 @@
/**
* 操作日志记录表 oper_log
*
- * @author ruoyi
+ * @author ard
*/
public class SysOperLog extends BaseEntity
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysPost.java b/ard-system/src/main/java/com/ard/system/domain/SysPost.java
index 08dc845..10f97da 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysPost.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysPost.java
@@ -12,7 +12,7 @@
/**
* 岗位表 sys_post
*
- * @author ruoyi
+ * @author ard
*/
public class SysPost extends BaseEntity
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java b/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
index e73c591..8d21d4a 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysRoleDept.java
@@ -6,7 +6,7 @@
/**
* 角色和部门关联 sys_role_dept
*
- * @author ruoyi
+ * @author ard
*/
public class SysRoleDept
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java b/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
index 1e9ef62..0ba306e 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysRoleMenu.java
@@ -6,7 +6,7 @@
/**
* 角色和菜单关联 sys_role_menu
*
- * @author ruoyi
+ * @author ard
*/
public class SysRoleMenu
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java b/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
index 5ffe7c7..84a940d 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysUserOnline.java
@@ -3,7 +3,7 @@
/**
* 当前在线会话
*
- * @author ruoyi
+ * @author ard
*/
public class SysUserOnline
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java b/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
index 74cf441..30952b8 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysUserPost.java
@@ -6,7 +6,7 @@
/**
* 用户和岗位关联 sys_user_post
*
- * @author ruoyi
+ * @author ard
*/
public class SysUserPost
{
diff --git a/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java b/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
index 13176f0..4ebf73b 100644
--- a/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
+++ b/ard-system/src/main/java/com/ard/system/domain/SysUserRole.java
@@ -6,7 +6,7 @@
/**
* 用户和角色关联 sys_user_role
*
- * @author ruoyi
+ * @author ard
*/
public class SysUserRole
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
index ba13619..d91c51b 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysConfigMapper.java
@@ -6,7 +6,7 @@
/**
* 参数配置 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysConfigMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
index 6eaf635..d9d9071 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysDeptMapper.java
@@ -7,7 +7,7 @@
/**
* 部门管理 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysDeptMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
index ab33e70..32d02f3 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysDictDataMapper.java
@@ -7,7 +7,7 @@
/**
* 字典表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysDictDataMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
index ed318b4..c42b859 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysDictTypeMapper.java
@@ -6,7 +6,7 @@
/**
* 字典表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysDictTypeMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
index 91b5105..6c676ee 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysLogininforMapper.java
@@ -6,7 +6,7 @@
/**
* 系统访问日志情况信息 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysLogininforMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
index 9964aa6..f4b16ba 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysMenuMapper.java
@@ -7,7 +7,7 @@
/**
* 菜单表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysMenuMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
index c04a66d..6194b99 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysNoticeMapper.java
@@ -6,7 +6,7 @@
/**
* 通知公告表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysNoticeMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
index 96a935b..80fec17 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysOperLogMapper.java
@@ -6,7 +6,7 @@
/**
* 操作日志 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysOperLogMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
index 0b4c55c..a19be07 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysPostMapper.java
@@ -6,7 +6,7 @@
/**
* 岗位信息 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysPostMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
index c5d2afc..53510d5 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysRoleDeptMapper.java
@@ -6,7 +6,7 @@
/**
* 角色与部门关联表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysRoleDeptMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
index ebf8377..0274d4d 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMapper.java
@@ -6,7 +6,7 @@
/**
* 角色表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysRoleMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
index 4e9b440..c213716 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysRoleMenuMapper.java
@@ -6,7 +6,7 @@
/**
* 角色与菜单关联表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysRoleMenuMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
index b5826a9..f2fa17c 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysUserMapper.java
@@ -7,7 +7,7 @@
/**
* 用户表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysUserMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
index aa36127..871b05e 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysUserPostMapper.java
@@ -6,7 +6,7 @@
/**
* 用户与岗位关联表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysUserPostMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java b/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
index eccaa51..70fc6b8 100644
--- a/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
+++ b/ard-system/src/main/java/com/ard/system/mapper/SysUserRoleMapper.java
@@ -7,7 +7,7 @@
/**
* 用户与角色关联表 数据层
*
- * @author ruoyi
+ * @author ard
*/
public interface SysUserRoleMapper
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java b/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
index 67a8d80..a797297 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysConfigService.java
@@ -6,7 +6,7 @@
/**
* 参数配置 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysConfigService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java b/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
index abbac63..ee876eb 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysDeptService.java
@@ -7,7 +7,7 @@
/**
* 部门管理 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysDeptService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java b/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
index 00e8c3b..0188dfe 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysDictDataService.java
@@ -6,7 +6,7 @@
/**
* 字典 业务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysDictDataService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java b/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
index 3304348..4f736a4 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysDictTypeService.java
@@ -7,7 +7,7 @@
/**
* 字典 业务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysDictTypeService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java b/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
index 29cd89d..c97f86f 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysLogininforService.java
@@ -6,7 +6,7 @@
/**
* 系统访问日志情况信息 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysLogininforService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java b/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
index 4cd7eb2..ff78281 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysMenuService.java
@@ -9,7 +9,7 @@
/**
* 菜单 业务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysMenuService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java b/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
index 3eaa5e6..5a4bfe4 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysNoticeService.java
@@ -6,7 +6,7 @@
/**
* 公告 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysNoticeService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java b/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
index 6137656..6bd1344 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysOperLogService.java
@@ -6,7 +6,7 @@
/**
* 操作日志 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysOperLogService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysPostService.java b/ard-system/src/main/java/com/ard/system/service/ISysPostService.java
index 3177095..77877f0 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysPostService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysPostService.java
@@ -6,7 +6,7 @@
/**
* 岗位信息 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysPostService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java b/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
index 770a16e..ac54b66 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysRoleService.java
@@ -8,7 +8,7 @@
/**
* 角色业务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysRoleService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java b/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
index caa0ec9..11f01a3 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysUserOnlineService.java
@@ -6,7 +6,7 @@
/**
* 在线用户 服务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysUserOnlineService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/ISysUserService.java b/ard-system/src/main/java/com/ard/system/service/ISysUserService.java
index c4cb956..aa3257a 100644
--- a/ard-system/src/main/java/com/ard/system/service/ISysUserService.java
+++ b/ard-system/src/main/java/com/ard/system/service/ISysUserService.java
@@ -6,7 +6,7 @@
/**
* 用户 业务层
*
- * @author ruoyi
+ * @author ard
*/
public interface ISysUserService
{
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
index de0d4c3..32b593e 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysConfigServiceImpl.java
@@ -21,7 +21,7 @@
/**
* 参数配置 服务层实现
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysConfigServiceImpl implements ISysConfigService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
index 1c564dd..304e00a 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysDeptServiceImpl.java
@@ -25,7 +25,7 @@
/**
* 部门管理 服务实现
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysDeptServiceImpl implements ISysDeptService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
index bd57554..f0961ba 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysDictDataServiceImpl.java
@@ -12,7 +12,7 @@
/**
* 字典 业务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysDictDataServiceImpl implements ISysDictDataService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
index 24dd65e..b5cf9ef 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysDictTypeServiceImpl.java
@@ -22,7 +22,7 @@
/**
* 字典 业务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysDictTypeServiceImpl implements ISysDictTypeService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
index bec74d6..36ada5c 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysLogininforServiceImpl.java
@@ -11,7 +11,7 @@
/**
* 系统访问日志情况信息 服务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysLogininforServiceImpl implements ISysLogininforService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
index 7598b1e..4ca98e1 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysMenuServiceImpl.java
@@ -29,7 +29,7 @@
/**
* 菜单 业务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysMenuServiceImpl implements ISysMenuService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
index f01210c..d68e392 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysNoticeServiceImpl.java
@@ -11,7 +11,7 @@
/**
* 公告 服务层实现
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysNoticeServiceImpl implements ISysNoticeService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
index af47cf1..a6bc714 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysOperLogServiceImpl.java
@@ -11,7 +11,7 @@
/**
* 操作日志 服务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysOperLogServiceImpl implements ISysOperLogService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
index d5e5e48..311475f 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysPostServiceImpl.java
@@ -15,7 +15,7 @@
/**
* 岗位信息 服务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysPostServiceImpl implements ISysPostService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
index 60f4b70..778e3cd 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysRoleServiceImpl.java
@@ -29,7 +29,7 @@
/**
* 角色 业务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysRoleServiceImpl implements ISysRoleService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
index 1b29d1c..701438f 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysUserOnlineServiceImpl.java
@@ -9,7 +9,7 @@
/**
* 在线用户 服务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysUserOnlineServiceImpl implements ISysUserOnlineService
diff --git a/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java b/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
index 3580b6f..5b512e6 100644
--- a/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
+++ b/ard-system/src/main/java/com/ard/system/service/impl/SysUserServiceImpl.java
@@ -35,7 +35,7 @@
/**
* 用户 业务层处理
*
- * @author ruoyi
+ * @author ard
*/
@Service
public class SysUserServiceImpl implements ISysUserService
diff --git a/ard-system/src/main/java/com/ard/system/vo/MetaVo.java b/ard-system/src/main/java/com/ard/system/vo/MetaVo.java
index c588e34..763f9ee 100644
--- a/ard-system/src/main/java/com/ard/system/vo/MetaVo.java
+++ b/ard-system/src/main/java/com/ard/system/vo/MetaVo.java
@@ -5,7 +5,7 @@
/**
* 路由显示信息
*
- * @author ruoyi
+ * @author ard
*/
public class MetaVo
{
diff --git a/ard-system/src/main/java/com/ard/system/vo/RouterVo.java b/ard-system/src/main/java/com/ard/system/vo/RouterVo.java
index 9dc13b5..6ccd75a 100644
--- a/ard-system/src/main/java/com/ard/system/vo/RouterVo.java
+++ b/ard-system/src/main/java/com/ard/system/vo/RouterVo.java
@@ -6,7 +6,7 @@
/**
* 路由配置信息
*
- * @author ruoyi
+ * @author ard
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class RouterVo
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
index 547b22f..a58e7a6 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
@@ -6,6 +6,7 @@
import com.ard.work.component.netty.handler.MessageProtocolEncoder;
import com.ard.work.component.netty.cache.TyTcpServerCache;
import com.ard.work.domain.entity.ArdServerInfo;
+import com.ard.work.service.IArdDroneInfoService;
import com.ard.work.service.IArdServerInfoService;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
@@ -34,6 +35,9 @@
private IArdServerInfoService ardServerService; // ← 从数据库读取边缘服务器配置
@Resource
+ private IArdDroneInfoService ardDroneService;
+
+ @Resource
private ClientHandler clientHandler;
/**
@@ -49,7 +53,7 @@
@Override
protected void initChannel(SocketChannel socketChannel) {
ChannelPipeline pipeline = socketChannel.pipeline();
- pipeline.addLast("heart", new IdleStateHandler(0, 3, 0, TimeUnit.SECONDS));
+ pipeline.addLast("heart", new IdleStateHandler(0, 5, 0, TimeUnit.SECONDS));
pipeline.addLast("encoder", new MessageProtocolEncoder());
pipeline.addLast("decoder", new MessageProtocolDecoder());
pipeline.addLast("handler", clientHandler);
@@ -76,8 +80,8 @@
Channel channel = f.channel();
channel.attr(AttributeKey.valueOf("serverId")).set(serverId);
TyTcpServerCache.putTcpServerCache(serverId, true);
- // 断开服务器，修改状态为： 0 - 在线
- ardServerService.updateServerStatus(serverId, "1");
+ // 修改状态为： 1 - 在线
+ updateServerAndDroneStatus(serverId, "1");
// 成功后再加入 channels
TyTcpServerCache.putChannel(serverId, channel);
@@ -86,7 +90,7 @@
log.warn("❌ 服务器 [{}] 连接失败", serverId);
TyTcpServerCache.putTcpServerCache(serverId, false);
// 断开服务器，修改状态为： 0 - 离线
- ardServerService.updateServerStatus(serverId, "0");
+ updateServerAndDroneStatus(serverId, "0");
}
});
}
@@ -100,12 +104,19 @@
channel.close();
log.info("断开服务器 [{}] 连接", serverId);
// 断开服务器，修改状态为： 0 - 离线
- ardServerService.updateServerStatus(serverId, "0");
+ updateServerAndDroneStatus(serverId, "0");
TyTcpServerCache.removeChannel(serverId);
}
TyTcpServerCache.removeTcpServerCache(serverId);
}
+ /**
+ * 同步修改服务和无人机状态
+ */
+ private void updateServerAndDroneStatus(String serverId, String status) {
+ ardServerService.updateServerStatus(serverId, status);
+ ardDroneService.updateDroneStatus(serverId, status);
+ }
/**
* 启动时从数据库加载所有边缘服务器并建立 TCP 连接
@@ -143,9 +154,9 @@
}
/**
- * 定时向所有已连接的边缘服务器服务器发送心跳
+ * 定时向所有已连接的边缘服务器服务器发送心跳（写空闲已经发心跳了，这里暂时取消）
*/
- @Scheduled(fixedRate = 5000) // 每5秒执行一次
+ // @Scheduled(fixedRate = 5000) // 每5秒执行一次
public void sendHeartBeat() {
long timestamp = System.currentTimeMillis();
TyTcpServerCache.getChannels().stream()
@@ -155,7 +166,7 @@
String serverId = (String) channel.attr(AttributeKey.valueOf("serverId")).get();
HeartbeatCmd heartbeat = new HeartbeatCmd(timestamp);
channel.writeAndFlush(heartbeat);
- log.info("→ 向边缘服务器 [{}]发送心跳，时间戳={}", serverId, timestamp);
+ log.info("❤\uFE0F 向边缘服务器 [{}]发送心跳，时间戳={}", serverId, timestamp);
});
}
}
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java b/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
index 55da307..ba614ae 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
@@ -62,7 +62,7 @@
switch (event.state()) {
case READER_IDLE:
- log.warn("读空闲超时 - 可能服务器未响应");
+ log.debug("读空闲超时 - 可能服务器未响应");
break;
case WRITER_IDLE:
// 写空闲时主动发心跳
@@ -71,7 +71,7 @@
log.debug("写空闲 -> 发送心跳包 时间戳={}", timestamp);
break;
case ALL_IDLE:
- log.info("读写都空闲 - 可考虑关闭连接或重连");
+ log.debug("读写都空闲 - 可考虑关闭连接或重连");
break;
}
} else {
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/BaseSubscriptionManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/BaseSubscriptionManager.java
index 9482d18..8d0db3e 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/BaseSubscriptionManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/BaseSubscriptionManager.java
@@ -16,7 +16,7 @@
// 存储订阅的用户
protected final Map<String, Set<Long>> subscriptions = new ConcurrentHashMap<>();
// 定时任务调度器
- protected final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+ protected final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10);
// 存储推送任务
protected final Map<String, ScheduledFuture<?>> pushTasks = new ConcurrentHashMap<>();
@@ -24,8 +24,9 @@
* 订阅指定设备的数据
*/
public void subscribe(String boxSn, Long userId, Integer period) {
- subscriptions.computeIfAbsent(boxSn, k -> new HashSet<>()).add(userId);
+ subscriptions.computeIfAbsent(boxSn, k -> ConcurrentHashMap.newKeySet()).add(userId);
if (subscriptions.get(boxSn).size() == 1) {
+ log.debug("首次订阅，启动推送任务");
startPushTask(boxSn, period);
}
}
@@ -34,15 +35,19 @@
* 取消订阅
*/
public void unsubscribe(String boxSn, Long userId) {
- Set<Long> userIds = subscriptions.get(boxSn);
- if (userIds != null) {
+ subscriptions.compute(boxSn, (key, userIds) -> {
+ if (userIds == null) {
+ return null;
+ }
userIds.remove(userId);
if (userIds.isEmpty()) {
stopPushTask(boxSn);
+ log.debug("无人订阅设备 {}，移除订阅记录", boxSn);
+ return null; // 直接返回 null 等价于 remove(key)
}
- }
+ return userIds;
+ });
}
-
/**
* 启动推送任务
*/
@@ -52,7 +57,11 @@
return;
}
ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(() -> {
- sendDataToSubscribers(boxSn);
+ try {
+ sendDataToSubscribers(boxSn);
+ } catch (Exception e) {
+ log.error("Error in push task for boxSn={}", boxSn, e);
+ }
}, 0, period, TimeUnit.SECONDS);
pushTasks.put(boxSn, future);
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
index 1e1e469..8f389ee 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
@@ -7,26 +7,26 @@
import com.ard.work.domain.dto.state.UavState;
import com.ard.work.domain.dto.telemetry.TelemetryData;
import com.ard.work.service.control.UavControlService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
-
+@Slf4j
@Component
-public class UavAllManager extends BaseSubscriptionManager<Map<String,Object>> {
+public class UavAllManager extends BaseSubscriptionManager<Map<String, Object>> {
@Resource
private UavControlService uavControlService;
+
@Override
- protected Map<String,Object> getData(String boxSn) {
- Map<String,Object> map=new HashMap<>();
+ protected Map<String, Object> getData(String boxSn) {
+ log.debug("获取无人机所有数据");
+ Map<String, Object> map = new HashMap<>();
+ map.put("boxSn", boxSn);
UavState uavState = UavStateCache.get(boxSn);
- if (uavState != null) {
- uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
- }
- map.put("boxSn", uavState.getBoxSn());
map.put("state", uavState);
TelemetryData uavTelemetryData = UavTelemetryDataCache.get(boxSn);
map.put("telemetry", uavTelemetryData);
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavStateManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavStateManager.java
index e7d4e48..57d6c4b 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavStateManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavStateManager.java
@@ -10,11 +10,7 @@
@Override
protected UavState getData(String boxSn) {
- UavState uavState = UavStateCache.get(boxSn);
- if (uavState != null) {
- uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
- }
- return uavState;
+ return UavStateCache.get(boxSn);
}
@Override
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/utils/WebSocketUtil.java b/ard-work/src/main/java/com/ard/work/component/websocket/utils/WebSocketUtil.java
index 0bf9553..dbf54b1 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/utils/WebSocketUtil.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/utils/WebSocketUtil.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ard.work.component.websocket.WebSocketSessionManager;
+import com.ard.work.domain.message.BaseMessage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
@@ -125,4 +126,17 @@
WebSocketSessionManager.broadcast(JSON.toJSONString(message));
}
+ // 发送消息到所有 WebSocket 客户端
+ public static <T> void sendToAll(BaseMessage<T> baseMessage) {
+ WebSocketUtil.sendMessageAll(baseMessage); // 你已有的 WebSocket 发送逻辑
+ }
+
+ // 根据消息类型和内容创建消息并发送
+ public static <T> void sendMessage(String type, T payload) {
+ BaseMessage<T> baseMessage = BaseMessage.<T>builder()
+ .type(type)
+ .payload(payload)
+ .build();
+ sendToAll(baseMessage);
+ }
}
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ard/work/domain/dto/control/SpeedControlDTO.java b/ard-work/src/main/java/com/ard/work/domain/dto/control/SpeedControlDTO.java
index 5144dd2..c3ede6f 100644
--- a/ard-work/src/main/java/com/ard/work/domain/dto/control/SpeedControlDTO.java
+++ b/ard-work/src/main/java/com/ard/work/domain/dto/control/SpeedControlDTO.java
@@ -31,4 +31,9 @@
*/
private float rollSpeed;
+ /**
+ * 指令类型：true=开始转动，false=停止转动
+ */
+ private boolean start;
+
}
diff --git a/ard-work/src/main/java/com/ard/work/domain/dto/state/UavState.java b/ard-work/src/main/java/com/ard/work/domain/dto/state/UavState.java
index 679f147..5caf6b6 100644
--- a/ard-work/src/main/java/com/ard/work/domain/dto/state/UavState.java
+++ b/ard-work/src/main/java/com/ard/work/domain/dto/state/UavState.java
@@ -20,16 +20,4 @@
private String boxSn; // 云盒编号
private AvoidanceData avoidanceData; // 避障数据
private List<HmsAlarmData> hmsAlarmData; // HMS报警信息 (飞机告警信息)
- private Float FieldAngle; // 自动计算视场角
-
- /**
- * 计算并设置视场角
- */
- public void calculateFieldAngle() {
- if (cameraState != null) {
- this.FieldAngle = CameraUtil.getFieldAngleFromZoom(cameraState.getSource(), cameraState.getZoomfactor());
- } else {
- this.FieldAngle = null; // 如果 cameraState 为 null，则 FieldAngle 也为 null
- }
- }
}
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
index 81763ac..eb9432d 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
@@ -12,7 +12,7 @@
/**
* 无人机盒子对象 ard_drone_info
*
- * @author ruoyi
+ * @author ard
* @date 2025-03-04
*/
@Data
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/UavWayline.java b/ard-work/src/main/java/com/ard/work/domain/entity/UavWayline.java
index fdfa5ee..1688d89 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/UavWayline.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/UavWayline.java
@@ -10,7 +10,7 @@
/**
* 航线对象 uav_wayline
*
- * @author ruoyi
+ * @author ard
* @date 2025-06-27
*/
@Data
diff --git a/ard-work/src/main/java/com/ard/work/domain/message/BaseMessage.java b/ard-work/src/main/java/com/ard/work/domain/message/BaseMessage.java
index 4867100..1f42176 100644
--- a/ard-work/src/main/java/com/ard/work/domain/message/BaseMessage.java
+++ b/ard-work/src/main/java/com/ard/work/domain/message/BaseMessage.java
@@ -1,6 +1,7 @@
package com.ard.work.domain.message;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -12,6 +13,7 @@
* @date 2024年11月04日14:40
**/
@Data
+@Builder
@AllArgsConstructor
@NoArgsConstructor
public class BaseMessage<T> {
diff --git a/ard-work/src/main/java/com/ard/work/domain/message/ServerReplyMessage.java b/ard-work/src/main/java/com/ard/work/domain/message/ServerReplyMessage.java
new file mode 100644
index 0000000..f8be9f6
--- /dev/null
+++ b/ard-work/src/main/java/com/ard/work/domain/message/ServerReplyMessage.java
@@ -0,0 +1,25 @@
+package com.ard.work.domain.message;
+
+import com.ard.work.domain.dto.state.UavState;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Description: 服务回复消息
+ * Author: liusuyi
+ * Date: 2025年03月10日11:49
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ServerReplyMessage {
+ /**
+ * 回复信息
+ */
+ private String message;
+
+
+}
diff --git a/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java b/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
index b940f25..59d6009 100644
--- a/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
+++ b/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
@@ -1,6 +1,7 @@
package com.ard.work.mapper;
import com.ard.work.domain.entity.ArdDroneInfo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -75,4 +76,13 @@
*/
int insertArdDroneLs(List<ArdDroneInfo> ardDroneInfo);
+ /**
+ * 修改无人机状态
+ *
+ * @param serverId 服务器管理主键
+ * @param onLine 状态
+ * @return 结果
+ */
+ int updateDroneStatus(@Param("serverId") String serverId, @Param("onLine") String onLine);
+
}
diff --git a/ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java b/ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java
index 3956cb8..7b1ffb1 100644
--- a/ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java
+++ b/ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java
@@ -64,6 +64,7 @@
* 修改服务器状态
*
* @param id 服务器管理主键
+ * @param status 状态
* @return 结果
*/
public int updateServerStatus(@Param("id") String id, @Param("status") String status);
diff --git a/ard-work/src/main/java/com/ard/work/mapper/UavWaylineMapper.java b/ard-work/src/main/java/com/ard/work/mapper/UavWaylineMapper.java
index 0fb4d13..110b845 100644
--- a/ard-work/src/main/java/com/ard/work/mapper/UavWaylineMapper.java
+++ b/ard-work/src/main/java/com/ard/work/mapper/UavWaylineMapper.java
@@ -7,7 +7,7 @@
/**
* 航线Mapper接口
*
- * @author ruoyi
+ * @author ard
* @date 2025-06-27
*/
public interface UavWaylineMapper
diff --git a/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java b/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java
index 81766f3..907d94e 100644
--- a/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java
+++ b/ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java
@@ -9,7 +9,7 @@
/**
* 无人机盒子Service接口
*
- * @author ruoyi
+ * @author ard
* @date 2025-03-04
*/
public interface IArdDroneInfoService {
@@ -79,4 +79,9 @@
*/
public int insertArdDroneLs(String[] boxSn,Long deptId);
+ /**
+ * 修改无人机状态
+ */
+ public int updateDroneStatus(String serverId,String status);
+
}
diff --git a/ard-work/src/main/java/com/ard/work/service/IGimbalSpeedService.java b/ard-work/src/main/java/com/ard/work/service/IGimbalSpeedService.java
new file mode 100644
index 0000000..b5db5a1
--- /dev/null
+++ b/ard-work/src/main/java/com/ard/work/service/IGimbalSpeedService.java
@@ -0,0 +1,16 @@
+package com.ard.work.service;
+
+import com.ard.work.domain.dto.control.SpeedControlDTO;
+
+/**
+ * 云台速度控制接口
+ *
+ * @author lsy
+ * @date 2025/10/28
+ */
+
+public interface IGimbalSpeedService {
+ void startControl(SpeedControlDTO speed);
+
+ void stopControl(String boxSn);
+}
diff --git a/ard-work/src/main/java/com/ard/work/service/IUavWaylineService.java b/ard-work/src/main/java/com/ard/work/service/IUavWaylineService.java
index 9689727..06f9eb6 100644
--- a/ard-work/src/main/java/com/ard/work/service/IUavWaylineService.java
+++ b/ard-work/src/main/java/com/ard/work/service/IUavWaylineService.java
@@ -8,7 +8,7 @@
/**
* 航线Service接口
*
- * @author ruoyi
+ * @author ard
* @date 2025-06-27
*/
public interface IUavWaylineService
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
index 9128c2a..b53c3fa 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
@@ -1,6 +1,8 @@
package com.ard.work.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.ard.common.constant.CacheConstants;
+import com.ard.common.core.redis.RedisCache;
import com.ard.common.exception.ServiceException;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.uuid.IdUtils;
@@ -17,12 +19,13 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
* 无人机盒子Service业务层处理
*
- * @author ruoyi
+ * @author ard
* @date 2025-03-04
*/
@Slf4j
@@ -38,7 +41,8 @@
@Resource
private AuthorizeService authorizeService;
- UtilMethod utilMethod = new UtilMethod();
+ @Resource
+ private RedisCache redisCache;
/**
* 查询无人机盒子
@@ -123,7 +127,7 @@
/**
* 批量新增无人机盒子
*
- * @param boxSn 盒子编码数组
+ * @param boxSn 盒子编码数组
* @param deptId 部门ID
* @return 成功插入的记录数
*/
@@ -150,6 +154,14 @@
log.error("批量新增无人机盒子失败, boxSn: {}, deptId: {}", Arrays.toString(boxSn), deptId, e);
throw new ServiceException("批量新增无人机盒子失败: " + e.getMessage());
}
+ }
+
+ /**
+ * 修改无人机状态
+ */
+ @Override
+ public int updateDroneStatus(String serverId, String status) {
+ return ArdDroneInfoMapper.updateDroneStatus(serverId, status);
}
/**
@@ -245,23 +257,29 @@
/**
* 同步盒子属性
*
- * @return 结果
*/
- @Scheduled(fixedRate = 1000 * 10)
+ @Scheduled(fixedRate = 1000 * 5)
public void syncBoxInfo() {
- List<ArdDroneInfo> ArdDroneeListEntity = selectArdDroneList(new ArdDroneInfo());
- // 将本地列表转换为Map，方便快速查找
- Map<String, ArdDroneInfo> localArdDroneMap = ArdDroneeListEntity.stream()
+ List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo());
+ Map<String, ArdDroneInfo> localMap = localList.stream()
.collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
- //遍历接口最新获取的无人机盒子信息
- tyService.getBoxList().forEach(remoteArdDrone -> {
- ArdDroneInfo localArdDroneInfo = localArdDroneMap.get(remoteArdDrone.getBoxSn());
- if (localArdDroneInfo != null) {
- if (!localArdDroneInfo.isSameAs(remoteArdDrone)) {
- // 修改无人机（只更新变化的属性）
- updateChangedAttributes(localArdDroneInfo, remoteArdDrone);
- updateArdDrone(localArdDroneInfo);
- }
+
+ tyService.getBoxList().forEach(remote -> {
+ String boxSn = remote.getBoxSn();
+
+ // ✅ 维护在线状态缓存
+ // 只有在线的无人机才存 Redis
+ String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
+ if (remote.getOnLine() == 1) {
+ redisCache.setCacheObject(redisKey, remote, 10, TimeUnit.SECONDS);
+ } else {
+ redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
+ }
+ // 数据库同步
+ ArdDroneInfo local = localMap.get(boxSn);
+ if (local != null && !local.isSameAs(remote)) {
+ updateChangedAttributes(local, remote);
+ updateArdDrone(local);
}
});
}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/GimbalSpeedService.java b/ard-work/src/main/java/com/ard/work/service/impl/GimbalSpeedService.java
new file mode 100644
index 0000000..dc5956f
--- /dev/null
+++ b/ard-work/src/main/java/com/ard/work/service/impl/GimbalSpeedService.java
@@ -0,0 +1,113 @@
+package com.ard.work.service.impl;
+
+import com.ard.common.constant.CacheConstants;
+import com.ard.common.core.domain.model.LoginUser;
+import com.ard.common.core.redis.RedisCache;
+import com.ard.common.utils.SecurityUtils;
+import com.ard.work.domain.cache.UavStateCache;
+import com.ard.work.domain.dto.control.SpeedControlDTO;
+import com.ard.work.domain.dto.state.UavState;
+import com.ard.work.service.IGimbalSpeedService;
+import com.ard.work.service.ITyService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.Map;
+import java.util.concurrent.*;
+
+/**
+ * 云台速度控制实现
+ *
+ * @author lsy
+ * @date 2025/10/28
+ */
+@Service
+@Slf4j
+public class GimbalSpeedService implements IGimbalSpeedService {
+
+ private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+ private final Map<String, ScheduledFuture<?>> tasks = new ConcurrentHashMap<>();
+
+ @Resource
+ private ITyService tyService;
+ @Resource
+ private RedisCache redisCache;
+
+ @Override
+ public synchronized void startControl(SpeedControlDTO speed) {
+ String boxSn = speed.getBoxSn();
+
+ // ✅ 先判断是否在线
+ if (!isUavOnline(boxSn)) {
+ throw new RuntimeException("无人机离线，无法启动云台控制: " + boxSn);
+ }
+
+ if (tasks.containsKey(boxSn)) {
+ return;
+ }
+ LoginUser loginUser = SecurityUtils.getLoginUser();// 主线程获取
+ // ✅ 启动前先试探一次，确保正常
+ try {
+ SecurityContextHolder.getContext().setAuthentication(
+ new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities())
+ );
+ Boolean ok = tyService.speedControl(speed);
+ if (ok == null || !ok) {
+ throw new RuntimeException("初始速度控制指令失败");
+ }
+ } catch (Exception e) {
+ log.error("初次控制指令异常: {}", e.getMessage());
+ throw new RuntimeException("无法启动云台控制：" + e.getMessage());
+ }
+
+ ScheduledFuture<?> future = executor.scheduleAtFixedRate(() -> {
+ double currentYaw = getCurrentYaw(boxSn);
+ log.warn("currentYaw: {}", currentYaw);
+ if ((speed.getYawSpeed() < 0 && currentYaw <= -180) ||
+ (speed.getYawSpeed() > 0 && currentYaw >= 180)) {
+ stopControl(boxSn);
+ return;
+ }
+ try {
+ // 在定时任务线程设置用户上下文
+ // 手动设置 SecurityContext
+ SecurityContextHolder.getContext().setAuthentication(
+ new UsernamePasswordAuthenticationToken(
+ loginUser, null, loginUser.getAuthorities())
+ );
+ Boolean b = tyService.speedControl(speed);
+ log.warn("speedControl result:{}", b);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+
+ }, 0, 200, TimeUnit.MILLISECONDS);
+
+ tasks.put(boxSn, future);
+ }
+ @Override
+ public synchronized void stopControl(String boxSn) {
+ ScheduledFuture<?> future = tasks.remove(boxSn);
+ if (future != null) {
+ future.cancel(false);
+ }
+ }
+
+ private double getCurrentYaw(String boxSn) {
+ UavState uavState = UavStateCache.get(boxSn);
+ if(uavState==null)
+ {
+ return 0;
+ }
+ return uavState.getPtzState().getYaw();
+ }
+
+ private boolean isUavOnline(String boxSn) {
+ // 如果 Redis 中存在对应 key，则认为在线
+ Object obj = redisCache.getCacheObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
+ return obj != null;
+ }
+
+}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index 130b9c9..ef5925e 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -23,6 +23,7 @@
import com.ard.work.component.netty.command.wayline.*;
import com.ard.work.component.netty.handler.ErrorCodeEnum;
import com.ard.work.component.netty.protobuf.TelemetryDataPB;
+import com.ard.work.component.websocket.utils.WebSocketUtil;
import com.ard.work.domain.cache.UavSignalInfoCache;
import com.ard.work.domain.cache.UavStateCache;
import com.ard.work.domain.cache.UavTelemetryDataCache;
@@ -45,6 +46,8 @@
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.domain.entity.ArdDroneInfo;
import com.ard.work.domain.entity.ArdServerInfo;
+import com.ard.work.domain.message.BaseMessage;
+import com.ard.work.domain.message.ServerReplyMessage;
import com.ard.work.domain.message.UavControlType;
import com.ard.work.domain.receiver.*;
import com.ard.work.service.IArdDroneInfoService;
@@ -901,21 +904,29 @@
//公共日志打印
private void logPrint(String message, Object obj) {
- log.debug("收到{}回复{}", message, obj);
+ String text = String.format("收到%s回复%s", message, obj);
+ ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
+ WebSocketUtil.sendMessage("reply", serverReplyMessage);
+ log.debug(text);
}
//公共日志打印
private void logPrint(String message, byte result, Integer errorCode) {
- log.info("收到{}回复:{} 错误码：{}【{}】",
+ String text = String.format(
+ "收到%s回复:%s 错误码：%d【%s】",
message,
ByteUtils.byteToHex(result),
errorCode,
- ErrorCodeEnum.getDescByCode(errorCode));
+ ErrorCodeEnum.getDescByCode(errorCode)
+ );
+ ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
+ WebSocketUtil.sendMessage("reply", serverReplyMessage);
+ log.debug(text);
}
/**
- * 发送消息
+ * 发送tcp消息
*/
private void sendMessage(String key, BaseCmd msg) {
TcpClientUtil.sendMessage(key, msg);
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/UavWaylineServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/UavWaylineServiceImpl.java
index 6a065b4..a46794d 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/UavWaylineServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/UavWaylineServiceImpl.java
@@ -23,7 +23,7 @@
/**
* 航线Service业务层处理
*
- * @author ruoyi
+ * @author ard
* @date 2025-06-27
*/
@Slf4j
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index fdcc976..6c78ec8 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -196,4 +196,12 @@
</foreach>
</insert>
+ <update id="updateDroneStatus">
+ update ard_drone_info
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="onLine != null">on_line = #{onLine},</if>
+ </trim>
+ where server_id = #{serverId}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3