From 3d0611365fc906cfd7e40a0f5b570d11a85e02fd Mon Sep 17 00:00:00 2001 From: yiming Date: Fri, 16 Dec 2022 11:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/JSON通信协议文档5.31.doc | Bin 0 -> 441344 bytes modules/common/pom.xml | 2 +- .../common/CommonConfigure.java | 8 +- .../common/constant/CommonConstant.java | 2 +- .../common/properities/Md5Properity.java | 2 +- .../common/properities/Properity.java | 2 +- .../common/properities/RedisProperity.java | 2 +- .../common/util/FileUtil.java | 2 +- .../common/util/HttpUtil.java | 2 +- .../common/util/MD5Util.java | 4 +- .../common/util/PathUtil.java | 2 +- .../common/util/QrUtil.java | 2 +- .../common/util/SpringContextUtil.java | 2 +- .../common/util/Tools.java | 2 +- .../common/util/ValidatorUtil.java | 2 +- modules/filter/pom.xml | 6 +- .../filter/FilterConstance.java | 2 +- .../filter/aspect/SessionAspect.java | 21 +++-- .../filter/pojo/CurrentUser.java | 2 +- .../filter/pojo/SessionHandler.java | 2 +- .../filter/pojo/UserType.java | 2 +- .../filter/util/CurrentUserUtil.java | 4 +- .../filter/util/JwtUtil.java | 6 +- modules/pom.xml | 6 +- pom.xml | 4 +- readme.md | 4 +- web/pom.xml | 6 +- .../web/Application.java | 7 +- .../web/config/CacheConfig.java | 2 +- .../web/config/ConfigProperties.java | 2 +- .../web/config/PackagesSqlSessionFactory.java | 2 +- .../web/config/SwaggerConfig.java | 4 +- .../web/controller/AppCenterController.java | 6 +- .../controller/CameraControlController.java | 22 ++--- .../web/controller/CameraController.java | 28 +++---- .../web/controller/CategoryController.java | 8 +- .../web/controller/CheckLogController.java | 13 ++- .../web/controller/Login.java | 2 +- .../web/controller/OrderController.java | 16 ++-- .../web/controller/PLCController.java | 18 +++-- .../web/controller/RealTimeController.java | 12 +-- .../web/controller/SensorController.java | 11 +-- .../web/controller/StockController.java | 14 ++-- .../web/controller/StockLogController.java | 10 +-- .../web/controller/StreetController.java | 23 +++--- .../web/controller/TestController.java | 4 +- .../web/controller/WarnController.java | 10 +-- .../web/entity/Camera.java | 2 +- .../web/entity/CameraIO.java | 2 +- .../web/entity/CameraIOConfig.java | 2 +- .../web/entity/Category.java | 2 +- .../web/entity/CheckLog.java | 2 +- .../web/entity/LightSource.java | 2 +- .../web/entity/Order.java | 2 +- .../web/entity/RFID.java | 2 +- .../web/entity/SensorGun.java | 2 +- .../web/entity/Stock.java | 2 +- .../web/entity/StockLog.java | 2 +- .../web/entity/Street.java | 2 +- .../web/entity/StreetShelve.java | 2 +- .../web/entity/Warn.java | 2 +- .../web/lib/CameraConnMap.java | 4 +- .../web/lib/CameraControlLoginModule.java | 4 +- .../web/lib/CameraControlModule.java | 2 +- .../web/lib/CameraDelayTask.java | 2 +- .../web/lib/OrderInfo.java | 6 +- .../web/lib/OrderRealtime.java | 2 +- .../web/lib/TaskDelayExecutor.java | 4 +- .../web/lib/hik/HCNetSDK.java | 2 +- .../lib/hik/HikCameraControlModuleImpl.java | 14 ++-- .../web/lib/hik/HikExceptionCallBack.java | 6 +- .../web/lib/hik/HikLoginModuleImpl.java | 6 +- .../web/lib/joyware/CallBack.java | 4 +- .../web/lib/joyware/CaptureCmdSerial.java | 2 +- .../web/lib/joyware/CaptureReceiveCB.java | 4 +- .../JoywareCameraControlModuleImpl.java | 10 +-- .../lib/joyware/JoywareLoginModuleImpl.java | 18 ++--- .../lib/joyware/NET_IN_PTZ_STATUS_PROC.java | 2 +- .../lib/joyware/NET_OUT_PTZ_STATUS_PROC.java | 2 +- .../web/lib/joyware/NetSDKLib.java | 75 +++++++++--------- .../web/lib/joyware/StopDownLoadThread.java | 2 +- .../web/lib/joyware/ToolKits.java | 4 +- .../web/lib/joyware/Utils.java | 2 +- .../web/lib/joyware/common/Base64.java | 2 +- .../web/lib/joyware/common/BorderEx.java | 2 +- .../web/lib/joyware/common/CaseMenu.java | 2 +- .../web/lib/joyware/common/ErrorCode.java | 2 +- .../joyware/common/EventTaskCommonQueue.java | 2 +- .../lib/joyware/common/EventTaskHandler.java | 2 +- .../web/lib/joyware/common/Res.java | 6 +- .../constant/SDKStructureFieldLenth.java | 2 +- .../joyware/constant/SDK_ALARM_Ex_TYPE.java | 5 +- .../enumeration/CFG_ACCESS_PROPERTY_TYPE.java | 2 +- .../CFG_EM_ASG_VOICE_DIRECTION.java | 2 +- .../enumeration/CFG_EM_BODY_TRAIT.java | 2 +- .../enumeration/CFG_EM_FACEDETECT_TYPE.java | 2 +- .../enumeration/CFG_EM_FACE_SNAP_POLICY.java | 2 +- .../enumeration/CFG_EM_FACE_TRAIT.java | 2 +- .../CFG_EM_INSTANCE_SUBCLASS_TYPE.java | 2 +- .../joyware/enumeration/CFG_EM_VOICE_ID.java | 2 +- .../enumeration/DH_LOG_QUERY_TYPE.java | 2 +- .../lib/joyware/enumeration/EMDeviceType.java | 2 +- .../enumeration/EM_ACROSS_PARKING.java | 2 +- .../joyware/enumeration/EM_ALARMOUT_POLE.java | 2 +- .../EM_ALGORITHM_PARTITION_TYPE.java | 2 +- .../joyware/enumeration/EM_ASG_WORK_MODE.java | 2 +- .../EM_AUDIO_DATA_SOURCE_TYPE.java | 2 +- .../enumeration/EM_AUDIO_DATA_TYPE.java | 2 +- .../enumeration/EM_BATTERY_EXIST_STATE.java | 2 +- .../joyware/enumeration/EM_BATTERY_STATE.java | 2 +- .../enumeration/EM_CALIBRATEAREA_TYPE.java | 2 +- .../enumeration/EM_CAMERA_CONNECT_STATE.java | 2 +- .../enumeration/EM_CAN_START_STREAM.java | 2 +- .../EM_CAPTURE_PROCESS_END_TYPE.java | 2 +- .../joyware/enumeration/EM_CFG_CAP_CMD.java | 2 +- .../joyware/enumeration/EM_CHANNEL_WIDTH.java | 2 +- .../enumeration/EM_COLLECTIVITY_STATE.java | 2 +- .../enumeration/EM_COLLISION_MODE.java | 2 +- .../EM_COMPOSIT_CHANNEL_BIND_MODE.java | 2 +- .../EM_COURSECOMPOSITE_OPERATE_TYPE.java | 5 +- .../EM_COURSERECORD_OPERATE_TYPE.java | 5 +- .../enumeration/EM_COURSE_LOCK_TYPE.java | 2 +- .../EM_COURSE_RECORD_COMPRESSION_TYPE.java | 2 +- .../enumeration/EM_COURSE_RECORD_TYPE.java | 2 +- .../joyware/enumeration/EM_COURSE_STATE.java | 2 +- .../enumeration/EM_CURRENT_STATE_TYPE.java | 2 +- .../EM_CUSTOM_DEV_PROTOCOL_TYPE.java | 2 +- .../EM_CUSTOM_EDUCATION_VOICE_TYPE.java | 2 +- .../EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java | 2 +- .../enumeration/EM_DATA_SOURCE_TYPE.java | 4 +- .../enumeration/EM_DELIVERY_FILE_TYPE.java | 2 +- .../enumeration/EM_DETECT_SENSOR_TYPE.java | 2 +- ...M_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java | 2 +- .../EM_DIRECTION_AFTER_POWER_OFF.java | 2 +- .../joyware/enumeration/EM_DISK_STATE.java | 2 +- .../EM_DISPLAY_CAMERA_ANGLE_TYPE.java | 2 +- .../enumeration/EM_DOWNLOAD_DATA_TYPE.java | 2 +- .../enumeration/EM_DOWNLOAD_FILE_TYPE.java | 2 +- .../enumeration/EM_DOWNLOAD_TIME_TYPE.java | 2 +- .../enumeration/EM_DRIVING_DIRECTION.java | 2 +- .../enumeration/EM_EMERGENCYSTATUS_TYPE.java | 2 +- .../enumeration/EM_ENTRY_DIRECTION.java | 2 +- .../joyware/enumeration/EM_ENTRY_TYPE.java | 2 +- .../lib/joyware/enumeration/EM_EVENT_IVS.java | 2 +- .../enumeration/EM_EVENT_IVS_TYPE.java | 13 +-- .../joyware/enumeration/EM_EVENT_TYPE.java | 2 +- .../enumeration/EM_FEATURE_LIST_TYPE.java | 2 +- .../lib/joyware/enumeration/EM_FILE_TYPE.java | 2 +- .../enumeration/EM_FILTER_IMAGE_TYPE.java | 2 +- .../EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java | 2 +- .../enumeration/EM_FORBID_PARKING_STATUS.java | 2 +- .../lib/joyware/enumeration/EM_GATE_TYPE.java | 2 +- .../joyware/enumeration/EM_HEATMAP_TYPE.java | 2 +- .../lib/joyware/enumeration/EM_IPC_TYPE.java | 2 +- .../lib/joyware/enumeration/EM_IS_RECORD.java | 2 +- .../enumeration/EM_LINE_COLOR_TYPE.java | 2 +- .../enumeration/EM_MIX_SNAP_SPEED_SOURCE.java | 2 +- .../joyware/enumeration/EM_NEW_CONFIG.java | 16 ++-- .../enumeration/EM_NEW_QUERY_SYSTEM_INFO.java | 7 +- .../enumeration/EM_OPEN_STROBE_TYPE.java | 2 +- .../EM_PARKINGSPACE_DIRECTION.java | 2 +- .../enumeration/EM_PARKINGSPACE_STATE.java | 2 +- .../enumeration/EM_PARKING_TRIGGER_TYPE.java | 2 +- .../enumeration/EM_PARTITION_TYPE.java | 2 +- .../EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java | 2 +- .../EM_PASSERBY_DB_OVERWRITE_TYPE.java | 2 +- .../lib/joyware/enumeration/EM_PASS_MODE.java | 2 +- .../enumeration/EM_PLAYAUDIO_PRIORITY.java | 2 +- .../enumeration/EM_PLAY_WITH_MODE.java | 2 +- .../enumeration/EM_PRIVACY_MASK_TYPE.java | 2 +- .../EM_PTZ_UNSUPPORT_DIRECTION.java | 2 +- .../enumeration/EM_QRCODE_IS_EXPIRED.java | 2 +- .../joyware/enumeration/EM_QRCODE_STATE.java | 2 +- .../EM_QUERY_TEMPERATURE_TYPE.java | 2 +- .../enumeration/EM_RADAR_OBJECTTYPE.java | 2 +- .../enumeration/EM_RADAR_POINTTYPE.java | 2 +- .../joyware/enumeration/EM_RAID_ERROR.java | 2 +- .../enumeration/EM_RAID_ERR_SUBDISK.java | 2 +- .../joyware/enumeration/EM_REASON_TYPE.java | 2 +- .../enumeration/EM_RELAY_STATE_TYPE.java | 2 +- .../joyware/enumeration/EM_SCENE_TYPE.java | 2 +- .../enumeration/EM_SDK_LOG_QUERY_TYPE.java | 2 +- .../enumeration/EM_SD_ENCRYPT_FLAG.java | 2 +- .../joyware/enumeration/EM_SD_LOCK_STATE.java | 2 +- .../enumeration/EM_SEND_SEARCH_TYPE.java | 2 +- .../enumeration/EM_SIGNLIGHT_TYPE.java | 2 +- .../EM_SOLARCELL_SYSTEM_FAULT_TYPE.java | 2 +- .../enumeration/EM_SOURCE_VIDEO_LOCATION.java | 2 +- .../joyware/enumeration/EM_STARTUP_MODE.java | 2 +- .../enumeration/EM_STORAGE_DEVICE_STATUS.java | 2 +- .../EM_STORAGE_DISK_POWERMODE.java | 2 +- .../EM_STORAGE_DISK_PREDISKCHECK.java | 2 +- .../enumeration/EM_STORAGE_HEALTH_TYPE.java | 2 +- .../enumeration/EM_STORAGE_PACKET_TYPE.java | 2 +- .../enumeration/EM_SUBCLASSID_TYPE.java | 2 +- .../EM_SUPPORTED_COLOR_LIST_TYPE.java | 2 +- .../enumeration/EM_SUPPORTFINGERPRINT.java | 2 +- .../enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java | 2 +- .../EM_SUPPORT_FAST_CHECK_TYPE.java | 2 +- .../EM_SUPPORT_FAST_IMPORT_TYPE.java | 2 +- .../enumeration/EM_SUPPORT_FOCUS_MODE.java | 2 +- .../enumeration/EM_TALK_AUDIO_TYPE.java | 2 +- .../EM_TAMPERALTERSTATUS_TYPE.java | 2 +- .../enumeration/EM_TRAFFICSTROBE_STATUS.java | 2 +- .../enumeration/EM_TRAFFIC_FLOW_STATUS.java | 2 +- .../EM_TRAFFIC_LIGHT_DETECT_STATE.java | 2 +- .../EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java | 2 +- ...AFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java | 2 +- ...M_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java | 2 +- ...M_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java | 2 +- ...RAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java | 2 +- ...M_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java | 2 +- .../EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java | 2 +- ...M_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java | 2 +- .../EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java | 2 +- .../enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java | 2 +- .../enumeration/EM_TRFAFFIC_LIGHT_TYPE.java | 2 +- .../joyware/enumeration/EM_TRIGGER_TYPE.java | 2 +- .../joyware/enumeration/EM_UNIFORM_STYLE.java | 2 +- .../joyware/enumeration/EM_UPLOAD_FLAG.java | 2 +- .../enumeration/EM_VEHICLEINOUT_CAR_TYPE.java | 2 +- .../enumeration/EM_VEHICLE_TYPE_SPLIT.java | 2 +- .../EM_VIDEODIAGNOSIS_TASK_STATE.java | 2 +- .../EM_VIDEOINPUTS_SERVICE_TYPE.java | 2 +- .../enumeration/EM_VIDEO_FILE_STATE.java | 2 +- .../joyware/enumeration/EM_VIDEO_TYPE.java | 2 +- .../EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java | 2 +- .../enumeration/EM_VOLTAGE_STATE_TYPE.java | 2 +- .../EM_WLAN_SCAN_AND_CONFIG_TYPE.java | 2 +- .../lib/joyware/enumeration/ENUMERROR.java | 4 +- .../enumeration/NET_ACCESS_ERRORCODE.java | 2 +- ...NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java | 7 +- .../enumeration/NET_EM_2DCODE_TYPE.java | 2 +- .../enumeration/NET_EM_CFG_OPERATE_TYPE.java | 17 ++-- .../enumeration/NET_EM_LOGIC_CHANNEL.java | 2 +- .../joyware/enumeration/NET_EM_MASK_TYPE.java | 2 +- .../enumeration/NET_EM_MOSAIC_TYPE.java | 2 +- .../enumeration/NET_EM_OFFLINE_CALL_TYPE.java | 2 +- .../enumeration/NET_EM_RECORD_MODE.java | 2 +- .../enumeration/NET_EM_SHAPE_TYPE.java | 2 +- .../NET_ENUM_INPUT_CHANNEL_MEDIA.java | 2 +- .../NET_MONITORWALL_OPERATE_TYPE.java | 7 +- .../NET_RADIOMETRY_ALARMCONTION.java | 2 +- .../enumeration/NET_RADIOMETRY_RESULT.java | 2 +- .../enumeration/NET_TRAFFIC_LIGHT_STATUS.java | 2 +- .../joyware/enumeration/NET_VOLUME_TYPE.java | 2 +- .../ALARM_CITIZEN_PICTURE_COMPARE_INFO.java | 6 +- .../structure/ALARM_FIRE_DETECTION_INFO.java | 4 +- .../structure/ALARM_HEATIMG_TEMPER_INFO.java | 8 +- .../joyware/structure/ALARM_NO_DISK_INFO.java | 4 +- .../joyware/structure/ALARM_RAID_INFO_EX.java | 6 +- ...M_REGION_PARKING_NO_ENTRY_RECORD_INFO.java | 4 +- .../ALARM_REGION_PARKING_TIMEOUT_INFO.java | 4 +- .../ALARM_SOLARCELL_SYSTEM_INFO.java | 8 +- .../ALARM_TRAFFICSTROBESTATE_INFO.java | 4 +- .../ALARM_TRAFFIC_LIGHT_STATE_INFO.java | 6 +- .../structure/ALARM_VEHICLE_INOUT_INFO.java | 4 +- .../ANATOMY_TEMP_DETECT_PERSON_FILTER.java | 4 +- .../AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java | 4 +- .../web/lib/joyware/structure/Auxs.java | 6 +- .../structure/CFG_ABLOCK_DOOR_INFO.java | 4 +- .../joyware/structure/CFG_ABLOCK_INFO.java | 4 +- .../structure/CFG_ACCESS_CONTROL_ASG.java | 11 +-- .../structure/CFG_ACCESS_GENERAL_INFO.java | 11 +-- .../joyware/structure/CFG_ACCESS_VOICE.java | 6 +- .../structure/CFG_ACCESS_VOICE_INFO.java | 8 +- .../structure/CFG_ACTIVITY_ANALYSE_CAPS.java | 4 +- .../CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java | 4 +- .../CFG_ANATOMYTEMP_VISUAL_CAPS.java | 4 +- .../joyware/structure/CFG_AUDIO_SPIRIT.java | 4 +- .../structure/CFG_AUDIO_SPIRIT_CHANNEL.java | 4 +- .../structure/CFG_AUDIO_SPIRIT_LINKAGE.java | 6 +- .../joyware/structure/CFG_CALIBRATE_INFO.java | 4 +- .../structure/CFG_CALIBRATE_UNIT_INFO.java | 4 +- .../CFG_CALIBRATE_UNIT_INFO_ARR.java | 4 +- .../structure/CFG_CAP_ANALYSE_INFO.java | 4 +- .../structure/CFG_CAP_ANALYSE_INFO_OPT.java | 4 +- .../CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java | 4 +- .../structure/CFG_CAP_CELIBRATE_AREA.java | 4 +- .../lib/joyware/structure/CFG_CAP_SCENE.java | 4 +- .../CFG_DETAIL_DRIVEASSISTANT_INFO.java | 4 +- .../structure/CFG_DETECT_REGIONS_INFO.java | 4 +- .../structure/CFG_DEVLOCATION_INFO.java | 4 +- .../structure/CFG_HIGH_TOSS_DETECT_INFO.java | 8 +- .../structure/CFG_LINK_CLASS_TYPE.java | 4 +- .../CFG_LOCATION_CALIBRATE_INFO.java | 6 +- .../CFG_LOCATION_CALIBRATE_POINT_INFO.java | 4 +- .../CFG_MANNUMDETECTION_RULE_INFO.java | 4 +- .../structure/CFG_NUMBERSTAT_MULT_INFO.java | 4 +- .../structure/CFG_NUMBERSTAT_RULE_INFO.java | 4 +- .../structure/CFG_NUMBER_STAT_INFO.java | 4 +- .../structure/CFG_PTZ_ABSOLUTELY_CAPS.java | 4 +- .../structure/CFG_PTZ_ACTION_CAPS.java | 4 +- .../joyware/structure/CFG_PTZ_AREA_SCAN.java | 4 +- .../structure/CFG_PTZ_CONTINUOUSLY_TYPE.java | 4 +- .../structure/CFG_PTZ_LIGHTING_CONTROL.java | 6 +- .../structure/CFG_PTZ_MEASURE_DISTANCE.java | 4 +- .../structure/CFG_PTZ_MOTION_RANGE.java | 4 +- .../CFG_PTZ_MOVE_ABSOLUTELY_CAP.java | 4 +- .../CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java | 4 +- .../structure/CFG_PTZ_PRIVACY_MASKING.java | 14 ++-- .../structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java | 11 +-- .../CFG_QUEUEDETECTION_RULE_INFO.java | 4 +- .../CFG_STEREO_BEHAVIOR_SCENE_CAPS.java | 4 +- .../joyware/structure/CFG_SUPPORTED_COMP.java | 4 +- .../structure/CFG_SUPPORTED_RULES_INFO.java | 4 +- .../joyware/structure/CFG_THERMO_GAIN.java | 4 +- .../structure/CFG_VACAP_SUPPORTEDSCENES.java | 4 +- .../CFG_VIDEO_AVAILABILITY_DETECTION.java | 4 +- .../CFG_VIDEO_SNOWFLAKE_DETECTION.java | 4 +- .../joyware/structure/CROWD_CALIBRATION.java | 4 +- .../joyware/structure/CUSTOM_PERSON_INFO.java | 6 +- .../structure/DEV_DAHUA_RADAR_CONFIG.java | 4 +- .../DEV_EVENT_CAR_DRIVING_IN_INFO.java | 8 +- .../DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java | 6 +- .../DEV_EVENT_CAR_DRIVING_OUT_INFO.java | 8 +- .../DEV_EVENT_DENSITYDETECTION_INFO.java | 12 +-- .../DEV_EVENT_DISTANCE_DETECTION_INFO.java | 4 +- .../structure/DEV_EVENT_FIRE_INFO.java | 6 +- .../DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java | 4 +- .../DEV_EVENT_HUDDLE_MATERIAL_INFO.java | 10 +-- .../DEV_EVENT_NONMOTOR_ENTRYING_INFO.java | 4 +- .../DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java | 10 +-- ...EV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java | 4 +- ...ENT_PARKING_LOT_STATUS_DETECTION_INFO.java | 4 +- .../DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java | 11 +-- .../DEV_EVENT_SHOP_WINDOW_POST_INFO.java | 11 +-- .../structure/DEV_EVENT_SMOKE_INFO.java | 4 +- .../DEV_EVENT_STREET_SUNCURE_INFO.java | 10 +-- ...V_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java | 6 +- ...NT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java | 7 +- .../DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java | 4 +- .../DEV_EVENT_TUMBLE_DETECTION_INFO.java | 4 +- .../joyware/structure/DEV_RADAR_CONFIG.java | 4 +- .../web/lib/joyware/structure/DHDEVTIME.java | 4 +- .../joyware/structure/DH_DEVICE_LOG_ITEM.java | 4 +- .../structure/DH_DEVICE_LOG_ITEM_EX.java | 4 +- .../lib/joyware/structure/DH_LOG_ITEM.java | 4 +- .../lib/joyware/structure/DISKCTRL_PARAM.java | 4 +- .../structure/EM_CITIZENIDCARD_SEX_TYPE.java | 2 +- .../structure/EM_HEALTH_CODE_STATUS.java | 2 +- .../joyware/structure/EM_IDCARD_MSG_TYPE.java | 2 +- .../lib/joyware/structure/EmptyStructure.java | 4 +- .../structure/FACEBODY_ANALYSE_CAPS.java | 4 +- .../structure/FACEBODY_DETECT_CAPS.java | 4 +- .../FACERECOGNITION_PERSON_INFOEX.java | 6 +- .../structure/MANUAL_SNAP_PARAMETER.java | 4 +- ...LE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java | 4 +- ...ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java | 4 +- ...MY_TEMP_DETECT_FACERECOGNITION_RESULT.java | 4 +- .../MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java | 4 +- .../MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java | 4 +- .../MONITORWALL_COLLECTION_SCHEDULE.java | 8 +- .../joyware/structure/MaxNameByteArrInfo.java | 4 +- .../structure/MaxSceneSupTypeByteArrInfo.java | 4 +- .../NETDEV_VIRTUALCAMERA_STATE_INFO.java | 4 +- .../NET_ACCESSCTL_SPECIALDAY_INFO.java | 4 +- .../structure/NET_ALGORITHM_BUILD_INFO.java | 4 +- .../NET_ALGORITHM_DEV_STORAGE_INFO.java | 8 +- .../structure/NET_ALGORITHM_SDK_INFO.java | 4 +- .../structure/NET_ALGORITHM_SVN_INFO.java | 4 +- .../NET_ALGORITHM_UPGRADE_AI_INFO.java | 4 +- ..._TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java | 4 +- .../NET_ANATOMY_TEMP_DETECT_FILTER.java | 4 +- .../structure/NET_AUDIO_DECODE_FORMAT.java | 4 +- .../joyware/structure/NET_BATTERY_INFO.java | 4 +- .../structure/NET_BURN_PARAM_INFO.java | 7 +- .../structure/NET_CAMERA_CFG_INFO.java | 4 +- .../structure/NET_CARDNOARRAY_INFO.java | 4 +- .../joyware/structure/NET_CB_CAMERASTATE.java | 4 +- .../structure/NET_CB_VIDEOSTAT_HEATMAP.java | 7 +- ...G_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java | 9 ++- ...T_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java | 7 +- .../structure/NET_CFG_AUDIO_PLAY_PATH.java | 4 +- .../structure/NET_CFG_AUDIO_PROPERTY.java | 4 +- .../structure/NET_CFG_BGY_CUSTOMERCFG.java | 8 +- .../structure/NET_CFG_CALIBRATEBOX_INFO.java | 6 +- .../structure/NET_CFG_CAP_ACCESSCONTROL.java | 4 +- .../structure/NET_CFG_CAP_AUDIO_FORMAT.java | 4 +- .../joyware/structure/NET_CFG_CAP_SPEAK.java | 4 +- .../NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java | 10 +-- .../NET_CFG_FILE_HOLD_DAYS_INFO.java | 4 +- .../NET_CFG_FORBIDDEN_ADVERT_PLAY.java | 6 +- .../NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java | 4 +- .../structure/NET_CFG_HEALTH_CODE_INFO.java | 6 +- .../structure/NET_CFG_QR_CODE_INFO.java | 7 +- .../lib/joyware/structure/NET_CFG_SIZE.java | 4 +- .../structure/NET_CFG_SIZEFILTER_INFO.java | 4 +- .../joyware/structure/NET_CFG_SIZE_WIDE.java | 2 +- ...ET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java | 4 +- .../NET_CFG_VIDEOTALK_SIGNLIGHT.java | 4 +- .../structure/NET_CHANNEL_CFG_INFO.java | 8 +- .../lib/joyware/structure/NET_COMM_PROP.java | 4 +- .../structure/NET_COMPOSE_CHANNEL_INFO.java | 6 +- .../NET_COMPOSE_PLAN_DETAIL_INFO.java | 4 +- .../structure/NET_COMPOSE_PLAN_INFO.java | 4 +- .../NET_COMPOSITECHANNELMODE_INFO.java | 8 +- .../NET_COMPOSITECHANNELMODE_WINDOWS.java | 4 +- .../structure/NET_COMPOSITECHANNEL_INFO.java | 6 +- .../web/lib/joyware/structure/NET_COURSE.java | 14 ++-- ...URSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java | 4 +- .../structure/NET_COURSEMEDIA_FILE_INFO.java | 4 +- .../joyware/structure/NET_COURSE_INFO.java | 8 +- .../joyware/structure/NET_COURSE_RESULT.java | 4 +- .../lib/joyware/structure/NET_CPU_INFO.java | 4 +- .../lib/joyware/structure/NET_CPU_STATUS.java | 6 +- .../NET_CUSTOM_DEV_VIDEO_INPUTS.java | 6 +- .../structure/NET_CUSTOM_MEASURE_TEMPER.java | 4 +- .../structure/NET_CUSTOM_PROJECTS_INFO.java | 4 +- .../structure/NET_DEVICE_STORAGE_INFO.java | 4 +- .../structure/NET_DOWNLOADFILE_INFO.java | 6 +- .../NET_DOWNLOADFILE_OPTIONS_INFO.java | 4 +- .../NET_DOWNLOAD_CONDITION_INFO.java | 6 +- .../NET_EPIDEMIC_AREA_EXPERIENCE.java | 4 +- .../NET_FACECOMPARISON_PTZ_INFO.java | 4 +- .../structure/NET_FACEDETECT_IMAGE_INFO.java | 4 +- .../joyware/structure/NET_FACE_PIC_INFO.java | 4 +- .../lib/joyware/structure/NET_FAN_INFO.java | 6 +- .../lib/joyware/structure/NET_FAN_STATUS.java | 6 +- .../structure/NET_FFCPERIOD_RANGE.java | 4 +- .../structure/NET_FINGERPRINT_INFO.java | 4 +- .../structure/NET_FIRING_GPS_INFO.java | 4 +- .../lib/joyware/structure/NET_FLOORS_EX.java | 4 +- .../joyware/structure/NET_FLOORS_INFO.java | 4 +- .../NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java | 4 +- .../NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java | 4 +- .../structure/NET_HEALTH_CODE_INFO.java | 4 +- .../joyware/structure/NET_IDCARD_INFO.java | 4 +- .../structure/NET_IMAGE_COMPARE_INFO.java | 4 +- .../joyware/structure/NET_IN_ADD_COURSE.java | 4 +- .../NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java | 6 +- .../NET_IN_ATTACH_TRAFFICLIGHT_INFO.java | 4 +- .../NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java | 4 +- .../structure/NET_IN_AUDIO_DECODE_CAPS.java | 4 +- .../joyware/structure/NET_IN_CAMERASTATE.java | 4 +- ...T_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java | 6 +- ...N_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java | 6 +- ...T_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java | 4 +- ...N_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java | 6 +- .../NET_IN_COURSECOMPOSITE_GET_INFO.java | 4 +- .../NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java | 4 +- .../NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java | 4 +- .../NET_IN_COURSECOMPOSITE_SET_INFO.java | 4 +- .../NET_IN_COURSECOMPOSITE_UPDATE_INFO.java | 4 +- .../NET_IN_COURSERECORD_GETINFO.java | 4 +- .../NET_IN_COURSERECORD_GET_TIME.java | 4 +- .../NET_IN_COURSERECORD_SETINFO.java | 6 +- .../NET_IN_COURSERECORD_UPDATE_INFO.java | 4 +- .../structure/NET_IN_DELETE_COURSE.java | 4 +- .../NET_IN_DELIVER_USER_PICTURE.java | 4 +- .../structure/NET_IN_DOWNLOAD_MULTI_FILE.java | 8 +- .../structure/NET_IN_GETFACEEIGEN_INFO.java | 4 +- .../structure/NET_IN_GET_CAMERA_CFG.java | 4 +- .../structure/NET_IN_GET_CAMERA_INFO.java | 4 +- .../structure/NET_IN_GET_CHANNEL_CFG.java | 4 +- .../NET_IN_GET_COURSE_LOGIC_CHANNEL.java | 6 +- .../NET_IN_GET_COURSE_RECORD_MODE.java | 4 +- .../NET_IN_GET_DEFAULT_REAL_CHANNEL.java | 6 +- .../structure/NET_IN_GET_DEVICE_AII_INFO.java | 4 +- .../structure/NET_IN_GET_HEATMAPS_INFO.java | 4 +- .../NET_IN_GET_INPUT_CHANNEL_MEDIA.java | 6 +- .../NET_IN_GET_REAL_PREVIEW_CHANNEL.java | 6 +- .../structure/NET_IN_GET_RECORD_STATE.java | 4 +- .../NET_IN_GET_VIDEOSTAT_HEATMAP.java | 7 +- .../structure/NET_IN_MODIFY_COURSE.java | 4 +- .../NET_IN_MODIFY_PARKINGRECORD_INFO.java | 4 +- .../NET_IN_MONITORWALL_GET_COLL_SCHD.java | 6 +- .../NET_IN_MONITORWALL_GET_ENABLE.java | 8 +- .../NET_IN_MONITORWALL_SET_COLL_SCHD.java | 6 +- .../NET_IN_MONITORWALL_SET_ENABLE.java | 8 +- .../NET_IN_PRE_UPLOAD_REMOTE_FILE.java | 4 +- .../NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java | 4 +- .../structure/NET_IN_PTZ_STATUS_PROC.java | 6 +- .../structure/NET_IN_QUERY_COURSE.java | 4 +- .../NET_IN_QUERY_COURSEMEDIA_FILE.java | 4 +- .../NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java | 4 +- .../NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java | 10 +-- .../structure/NET_IN_QUERY_COURSE_CLOSE.java | 4 +- .../structure/NET_IN_QUERY_COURSE_OPEN.java | 4 +- .../NET_IN_RADAR_ALARMPOINTINFO.java | 6 +- .../NET_IN_SCENICSPOT_GETCAPS_INFO.java | 4 +- .../NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java | 4 +- .../NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java | 10 +-- .../NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java | 4 +- .../joyware/structure/NET_IN_SET_2DCODE.java | 9 ++- .../NET_IN_SET_BLIND_REAL_CHANNEL.java | 6 +- .../structure/NET_IN_SET_CAMERA_CFG.java | 4 +- .../structure/NET_IN_SET_CHANNEL_CFG.java | 4 +- .../NET_IN_SET_COURSE_RECORD_MODE.java | 6 +- .../NET_IN_SET_COURSE_RECORD_STATE.java | 4 +- .../NET_IN_SET_PARKINGSPACE_STATE_INFO.java | 6 +- .../structure/NET_IN_SNAP_BY_EVENT.java | 8 +- .../structure/NET_IN_STARTSERACH_DEVICE.java | 6 +- .../structure/NET_IN_STORAGE_DEV_INFOS.java | 6 +- .../NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java | 4 +- .../NET_IN_TRAFFIC_SNAP_RADAR_INFO.java | 4 +- .../NET_IN_TRAFFIC_SNAP_STROBE_INFO.java | 4 +- .../joyware/structure/NET_ISCSI_TARGET.java | 4 +- .../NET_LEFTDETECTION_RULE_INFO.java | 6 +- .../joyware/structure/NET_LIGHTINFO_CFG.java | 4 +- .../structure/NET_LIGHTPERIODS_INFO.java | 6 +- .../structure/NET_LOGIC_CHANNEL_INFO.java | 6 +- .../NET_MANUALSNAP_PARKINGSPACE_INFO.java | 4 +- .../structure/NET_MATCH_TWO_FACE_IN.java | 4 +- .../structure/NET_MATCH_TWO_FACE_OUT.java | 4 +- .../structure/NET_MEDIAFILE_GENERAL_INFO.java | 6 +- .../NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java | 4 +- .../joyware/structure/NET_MEMORY_INFO.java | 4 +- .../joyware/structure/NET_MEMORY_STATUS.java | 4 +- .../NET_MONITORWALL_COLLECTION_NAME.java | 6 +- .../NET_MONITORWALL_ENABLE_INFO.java | 6 +- .../structure/NET_MONITORWALL_NAME.java | 6 +- .../NET_MONITOR_WALL_OUT_MODE_INFO.java | 4 +- .../structure/NET_OBJECT_RADAR_INFO.java | 4 +- .../joyware/structure/NET_OUT_ADD_COURSE.java | 4 +- .../NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java | 4 +- .../NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java | 4 +- .../NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java | 4 +- .../structure/NET_OUT_AUDIO_DECODE_CAPS.java | 4 +- .../structure/NET_OUT_CAMERASTATE.java | 4 +- ..._OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java | 6 +- ...T_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java | 6 +- ..._OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java | 6 +- ...T_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java | 6 +- .../NET_OUT_COURSECOMPOSITE_GET_INFO.java | 4 +- .../NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java | 4 +- .../NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java | 4 +- .../NET_OUT_COURSECOMPOSITE_SET_INFO.java | 4 +- .../NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java | 4 +- .../NET_OUT_COURSERECORD_GETINFO.java | 6 +- .../NET_OUT_COURSERECORD_GET_TIME.java | 4 +- .../NET_OUT_COURSERECORD_SETINFO.java | 4 +- .../NET_OUT_COURSERECORD_UPDATE_INFO.java | 4 +- .../structure/NET_OUT_DELETE_COURSE.java | 4 +- .../NET_OUT_DELIVER_USER_PICTURE.java | 4 +- .../NET_OUT_DOWNLOAD_MULTI_FILE.java | 4 +- .../structure/NET_OUT_GETFACEEIGEN_INFO.java | 4 +- .../structure/NET_OUT_GET_CAMERA_CFG.java | 4 +- .../structure/NET_OUT_GET_CAMERA_INFO.java | 4 +- .../structure/NET_OUT_GET_CHANNEL_CFG.java | 4 +- .../NET_OUT_GET_COURSE_LOGIC_CHANNEL.java | 6 +- .../NET_OUT_GET_COURSE_RECORD_MODE.java | 6 +- .../NET_OUT_GET_DEFAULT_REAL_CHANNEL.java | 6 +- .../NET_OUT_GET_DEVICE_AII_INFO.java | 4 +- .../structure/NET_OUT_GET_HEATMAPS_INFO.java | 4 +- .../NET_OUT_GET_INPUT_CHANNEL_MEDIA.java | 8 +- .../NET_OUT_GET_REAL_PREVIEW_CHANNEL.java | 6 +- .../structure/NET_OUT_GET_RECORD_STATE.java | 4 +- .../NET_OUT_GET_VIDEOSTAT_HEATMAP.java | 4 +- .../structure/NET_OUT_MODIFY_COURSE.java | 4 +- .../NET_OUT_MODIFY_PARKINGRECORD_INFO.java | 4 +- .../NET_OUT_MONITORWALL_GET_COLL_SCHD.java | 6 +- .../NET_OUT_MONITORWALL_GET_ENABLE.java | 8 +- .../NET_OUT_MONITORWALL_SET_COLL_SCHD.java | 4 +- .../NET_OUT_MONITORWALL_SET_ENABLE.java | 6 +- .../NET_OUT_PRE_UPLOAD_REMOTE_FILE.java | 7 +- .../structure/NET_OUT_PTZ_STATUS_PROC.java | 4 +- .../structure/NET_OUT_QUERY_COURSE.java | 4 +- .../NET_OUT_QUERY_COURSEMEDIA_FILE.java | 4 +- .../NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java | 4 +- .../NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java | 4 +- .../structure/NET_OUT_QUERY_COURSE_CLOSE.java | 4 +- .../structure/NET_OUT_QUERY_COURSE_OPEN.java | 4 +- .../NET_OUT_RADAR_ALARMPOINTINFO.java | 4 +- .../NET_OUT_SCENICSPOT_GETCAPS_INFO.java | 4 +- ...NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java | 6 +- .../NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java | 4 +- .../NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java | 4 +- .../joyware/structure/NET_OUT_SET_2DCODE.java | 4 +- .../NET_OUT_SET_BLIND_REAL_CHANNEL.java | 4 +- .../structure/NET_OUT_SET_CAMERA_CFG.java | 4 +- .../structure/NET_OUT_SET_CHANNEL_CFG.java | 4 +- .../NET_OUT_SET_COURSE_RECORD_MODE.java | 4 +- .../NET_OUT_SET_COURSE_RECORD_STATE.java | 4 +- .../NET_OUT_SET_PARKINGSPACE_STATE_INFO.java | 4 +- .../structure/NET_OUT_SNAP_BY_EVENT.java | 4 +- .../structure/NET_OUT_STARTSERACH_DEVICE.java | 4 +- .../structure/NET_OUT_STORAGE_DEV_INFOS.java | 4 +- ...NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java | 4 +- .../NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java | 6 +- .../NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java | 4 +- .../NET_PARKINGDETECTION_RULE_INFO.java | 6 +- .../structure/NET_PARKINGRECORD_INFO.java | 4 +- .../NET_PASSERBY_DB_CONFIG_INFO.java | 6 +- .../NET_PERSON_FEATURE_VALUE_INFO.java | 4 +- .../lib/joyware/structure/NET_POWER_INFO.java | 4 +- .../joyware/structure/NET_POWER_STATUS.java | 8 +- .../structure/NET_RADAR_ALARMPOINT_INFO.java | 4 +- .../structure/NET_RADAR_CARSPEED_INFO.java | 4 +- .../NET_RADAR_NOTIFY_ALARMPOINTINFO.java | 4 +- .../structure/NET_RAID_ERR_DETAIL_INFO.java | 4 +- .../structure/NET_RAID_MEMBER_INFO.java | 4 +- .../NET_RECORDBACKUP_PROCESSTIME.java | 4 +- .../joyware/structure/NET_RECORD_INFO.java | 6 +- .../structure/NET_RECORD_INFO_ARRAY.java | 4 +- .../NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java | 4 +- .../structure/NET_REMOTE_FILE_INFO.java | 4 +- .../NET_RIOTERDETECTION_RULE_INFO.java | 6 +- .../structure/NET_SCENICSPOT_CAPS_INFO.java | 4 +- .../structure/NET_SPECIAL_DAYS_SCHEDULE.java | 4 +- .../structure/NET_STJ77D5_RADAR_CONFIG.java | 4 +- .../joyware/structure/NET_STORAGE_DEVICE.java | 4 +- .../structure/NET_STORAGE_PARTITION.java | 4 +- .../structure/NET_STORAGE_PARTITION_INFO.java | 4 +- .../joyware/structure/NET_STORAGE_RAID.java | 4 +- .../joyware/structure/NET_STORAGE_TANK.java | 4 +- .../lib/joyware/structure/NET_STU_LOG.java | 4 +- .../joyware/structure/NET_STU_OLD_LOG.java | 4 +- .../joyware/structure/NET_SYSTEM_STATUS.java | 4 +- .../structure/NET_TEMPERATURE_INFO.java | 6 +- .../NET_TEMPERATURE_STATISTICS_INFO.java | 4 +- .../structure/NET_TEMPERATURE_STATUS.java | 6 +- .../web/lib/joyware/structure/NET_TIME.java | 4 +- .../lib/joyware/structure/NET_TIME_EX.java | 4 +- .../lib/joyware/structure/NET_TIME_EX1.java | 4 +- .../structure/NET_TIME_RECORDBACKUP_TASK.java | 4 +- .../NET_TRAFFICLIGHT_CHANNEL_INFO.java | 4 +- .../structure/NET_TRAFFICLIGHT_INFO.java | 4 +- .../structure/NET_TRAFFIC_FLOW_STAT.java | 10 +-- .../structure/NET_TRAFFIC_LIGHT_STATE.java | 6 +- .../lib/joyware/structure/NET_TSECT_DAY.java | 6 +- .../structure/NET_UPLOAD_CLIENT_INFO.java | 6 +- .../structure/NET_USER_PICTURE_DATA.java | 4 +- .../structure/NET_VAOBJECT_NUMMAN.java | 6 +- .../NET_VEHICLE_DRIVING_DIRECTION_INFO.java | 4 +- .../joyware/structure/NET_VEHICLE_OBJECT.java | 8 +- .../NET_VIDEOABNORMALDETECTION_RULE_INFO.java | 4 +- .../structure/NET_VIDEOIN_DEFOG_INFO.java | 4 +- .../NET_VIDEOTALK_SIGNLIGHT_INFO.java | 4 +- .../NET_VIDEO_DIAGNOSIS_RECORD_INFO.java | 8 +- .../NET_WANDERDETECTION_RULE_INFO.java | 6 +- .../lib/joyware/structure/Net_PIC_INFO.java | 6 +- .../web/lib/joyware/structure/ObjectPath.java | 4 +- .../web/lib/joyware/structure/ObjectUrl.java | 6 +- ...SERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java | 6 +- .../joyware/structure/POINTCOORDINATE.java | 4 +- .../web/lib/joyware/structure/POINTINFOS.java | 10 +-- .../web/lib/joyware/structure/POSTION.java | 4 +- .../PTZ_NORMALIZED_POSITION_UNIT.java | 4 +- .../lib/joyware/structure/PlateNumber.java | 4 +- .../structure/QUERY_DEVICE_LOG_PARAM.java | 4 +- .../joyware/structure/SCENE_SUPPORT_RULE.java | 4 +- .../structure/SDK_DEVICE_LOG_ITEM.java | 4 +- .../structure/SDK_DEVICE_LOG_ITEM_EX.java | 4 +- .../lib/joyware/structure/SDK_DEV_TIME.java | 4 +- .../joyware/structure/SDK_HARDDISK_STATE.java | 4 +- .../lib/joyware/structure/SDK_LOG_ITEM.java | 4 +- .../web/lib/joyware/structure/SDK_TSECT.java | 4 +- .../structure/SOLARCELL_BATTERY_INFO.java | 4 +- .../structure/SOLARCELL_PANEL_INFO.java | 4 +- .../SOLARCELL_SYSTEM_HISTORY_INFO.java | 4 +- .../START_LISTEN_FINISH_RESULT_INFO.java | 4 +- .../structure/StringByteArrSixteen.java | 4 +- .../joyware/structure/USER_TIME_SECTION.java | 4 +- .../lib/joyware/structure/VA_CAPS_INFO.java | 4 +- .../structure/VA_DYNAMIC_CAPS_INFO.java | 4 +- .../web/mapper/CameraIOConfigMapper.java | 4 +- .../web/mapper/CameraIOMapper.java | 4 +- .../web/mapper/CameraMapper.java | 4 +- .../web/mapper/CategoryMapper.java | 4 +- .../web/mapper/CheckLogMapper.java | 4 +- .../web/mapper/LightSourceMapper.java | 4 +- .../web/mapper/OrderMapper.java | 8 +- .../web/mapper/RFIDMapper.java | 4 +- .../web/mapper/SensorGunMapper.java | 4 +- .../web/mapper/StockLogMapper.java | 4 +- .../web/mapper/StockMapper.java | 4 +- .../web/mapper/StreetMapper.java | 7 +- .../web/mapper/WarnMapper.java | 8 +- .../{zhehekeji => leaper}/web/pojo/Cmd.java | 2 +- .../web/pojo/IndexVO.java | 2 +- .../web/pojo/IpInfo.java | 2 +- .../web/pojo/OrderSaveReq.java | 2 +- .../web/pojo/OrderSearch.java | 2 +- .../web/pojo/OrderVO.java | 6 +- .../pojo/camera/CameraConfigSearchReq.java | 2 +- .../web/pojo/camera/CameraIOPtz.java | 2 +- .../web/pojo/camera/CameraSearchReq.java | 2 +- .../web/pojo/camera/IOImport.java | 2 +- .../web/pojo/category/CategoryExcel.java | 2 +- .../web/pojo/category/CategoryModel.java | 5 +- .../web/pojo/category/PageSearch.java | 2 +- .../web/pojo/realTime/RealTime.java | 4 +- .../web/pojo/stock/CheckByMan.java | 2 +- .../web/pojo/stock/CheckLogSearch.java | 2 +- .../web/pojo/stock/CheckStatus.java | 4 +- .../web/pojo/stock/LocalDateTimeConvert.java | 2 +- .../web/pojo/stock/RowColumnStatus.java | 2 +- .../web/pojo/stock/StockCheck.java | 2 +- .../web/pojo/stock/StockCheckSearch.java | 2 +- .../web/pojo/stock/StockExcel.java | 2 +- .../web/pojo/stock/StockExportExcel.java | 2 +- .../web/pojo/stock/StockLogSearch.java | 2 +- .../web/pojo/stock/StockStatus.java | 2 +- .../web/pojo/stock/StockStatusConvert.java | 2 +- .../web/pojo/street/StreetSearch.java | 2 +- .../web/pojo/street/StreetType.java | 2 +- .../web/pojo/street/StreetVO.java | 6 +- .../web/pojo/warn/WarnSearch.java | 2 +- .../web/pojo/warn/WarnVO.java | 4 +- .../web/service/CameraService.java | 37 +++++---- .../web/service/CategoryImportListener.java | 13 +-- .../web/service/CategoryService.java | 25 +----- .../web/service/CheckLogService.java | 10 +-- .../web/service/CronTab.java | 19 ++--- .../web/service/GoodsActionTimes.java | 2 +- .../web/service/IOImportListener.java | 8 +- .../web/service/InitService.java | 34 ++++---- .../web/service/LightSourceService.java | 6 +- .../web/service/OrderService.java | 18 ++--- .../web/service/PlcCmdInfo.java | 2 +- .../web/service/PlcService.java | 31 ++++---- .../web/service/RFID/CMD.java | 2 +- .../web/service/RFID/ERROR.java | 2 +- .../web/service/RFID/HEAD.java | 2 +- .../web/service/RFID/MessageTran.java | 2 +- .../web/service/RFID/RFIDMap.java | 2 +- .../web/service/RFID/RFIDSocket.java | 2 +- .../web/service/RFIDService.java | 8 +- .../web/service/RealTimeService.java | 16 ++-- .../web/service/SensorService.java | 8 +- .../web/service/StockCheckRunnable.java | 19 +++-- .../web/service/StockImport.java | 13 +-- .../web/service/StockLogService.java | 9 +-- .../web/service/StockService.java | 29 +++---- .../web/service/StreetConn.java | 2 +- .../web/service/StreetService.java | 27 +++---- .../web/service/TestService.java | 4 +- .../web/service/WarnService.java | 12 ++- .../service/damLightSource/JYDAMEquip.java | 13 +-- .../service/damLightSource/JYDamHelper.java | 4 +- .../damLightSource/lib/modbus/Modbus.java | 2 +- .../lib/modbus/ModbusCoupler.java | 8 +- .../lib/modbus/ModbusException.java | 2 +- .../lib/modbus/ModbusIOException.java | 2 +- .../lib/modbus/ModbusSlaveException.java | 2 +- .../lib/modbus/cmd/AIAOTest.java | 22 ++--- .../damLightSource/lib/modbus/cmd/AITest.java | 18 ++--- .../damLightSource/lib/modbus/cmd/AOTest.java | 18 ++--- .../lib/modbus/cmd/DIDOTest.java | 18 ++--- .../damLightSource/lib/modbus/cmd/DITest.java | 12 +-- .../damLightSource/lib/modbus/cmd/DOTest.java | 16 ++-- .../lib/modbus/cmd/SerialAITest.java | 18 ++--- .../lib/modbus/cmd/SerialDITest.java | 20 ++--- .../lib/modbus/cmd/SerialFacadeTest.java | 20 ++--- .../lib/modbus/cmd/SerialSlaveTest.java | 13 +-- .../lib/modbus/cmd/TCPSlaveTest.java | 11 +-- .../lib/modbus/cmd/UDPDITest.java | 12 +-- .../lib/modbus/cmd/UDPDOTest.java | 10 +-- .../lib/modbus/cmd/UDPSlaveTest.java | 11 +-- .../lib/modbus/cmd/package.html | 0 .../lib/modbus/facade/ModbusSerialMaster.java | 21 ++--- .../lib/modbus/facade/ModbusTCPMaster.java | 17 ++-- .../lib/modbus/facade/ModbusUDPMaster.java | 17 ++-- .../lib/modbus/facade/package.html | 0 .../lib/modbus/io/ASCIIInputStream.java | 4 +- .../lib/modbus/io/ASCIIOutputStream.java | 4 +- .../lib/modbus/io/BINInputStream.java | 2 +- .../lib/modbus/io/BINOutputStream.java | 2 +- .../lib/modbus/io/BytesInputStream.java | 2 +- .../lib/modbus/io/BytesOutputStream.java | 2 +- .../modbus/io/FastByteArrayInputStream.java | 2 +- .../modbus/io/FastByteArrayOutputStream.java | 2 +- .../lib/modbus/io/ModbusASCIITransport.java | 18 ++--- .../lib/modbus/io/ModbusBINTransport.java | 18 ++--- .../modbus/io/ModbusRTUTCPTransaction.java | 22 ++--- .../lib/modbus/io/ModbusRTUTCPTransport.java | 14 ++-- .../lib/modbus/io/ModbusRTUTransport.java | 14 ++-- .../modbus/io/ModbusSerialTransaction.java | 24 +++--- .../lib/modbus/io/ModbusSerialTransport.java | 14 ++-- .../lib/modbus/io/ModbusTCPTransaction.java | 24 +++--- .../lib/modbus/io/ModbusTCPTransport.java | 16 ++-- .../lib/modbus/io/ModbusTransaction.java | 8 +- .../lib/modbus/io/ModbusTransport.java | 10 +-- .../lib/modbus/io/ModbusUDPTransaction.java | 26 +++--- .../lib/modbus/io/ModbusUDPTransport.java | 14 ++-- .../lib/modbus/io/NonWordDataHandler.java | 2 +- .../lib/modbus/io/Transportable.java | 2 +- .../damLightSource/lib/modbus/io/package.html | 0 .../lib/modbus/msg/ExceptionResponse.java | 4 +- .../modbus/msg/IllegalFunctionRequest.java | 4 +- .../lib/modbus/msg/ModbusMessage.java | 6 +- .../lib/modbus/msg/ModbusMessageImpl.java | 6 +- .../lib/modbus/msg/ModbusRequest.java | 4 +- .../lib/modbus/msg/ModbusResponse.java | 4 +- .../lib/modbus/msg/ReadCoilsRequest.java | 12 +-- .../lib/modbus/msg/ReadCoilsResponse.java | 6 +- .../modbus/msg/ReadInputDiscretesRequest.java | 12 +-- .../msg/ReadInputDiscretesResponse.java | 6 +- .../modbus/msg/ReadInputRegistersRequest.java | 12 +-- .../msg/ReadInputRegistersResponse.java | 10 +-- .../msg/ReadMultipleRegistersRequest.java | 12 +-- .../msg/ReadMultipleRegistersResponse.java | 10 +-- .../lib/modbus/msg/WriteCoilRequest.java | 12 +-- .../lib/modbus/msg/WriteCoilResponse.java | 4 +- .../modbus/msg/WriteMultipleCoilsRequest.java | 16 ++-- .../msg/WriteMultipleCoilsResponse.java | 4 +- .../msg/WriteMultipleRegistersRequest.java | 16 ++-- .../msg/WriteMultipleRegistersResponse.java | 2 +- .../msg/WriteSingleRegisterRequest.java | 12 +-- .../msg/WriteSingleRegisterResponse.java | 2 +- .../lib/modbus/msg/package.html | 0 .../lib/modbus/net/MasterConnection.java | 2 +- .../lib/modbus/net/ModbusSerialListener.java | 16 ++-- .../lib/modbus/net/ModbusTCPListener.java | 6 +- .../lib/modbus/net/ModbusUDPListener.java | 16 ++-- .../modbus/net/RTUTCPMasterConnection.java | 8 +- .../lib/modbus/net/SerialConnection.java | 9 ++- .../modbus/net/SerialMasterConnection.java | 4 +- .../lib/modbus/net/TCPConnectionHandler.java | 14 ++-- .../lib/modbus/net/TCPMasterConnection.java | 8 +- .../lib/modbus/net/TCPSlaveConnection.java | 8 +- .../lib/modbus/net/UDPMasterConnection.java | 6 +- .../lib/modbus/net/UDPMasterTerminal.java | 6 +- .../lib/modbus/net/UDPSlaveTerminal.java | 10 +-- .../lib/modbus/net/UDPTerminal.java | 4 +- .../lib/modbus/net/package.html | 0 .../damLightSource/lib/modbus/package.html | 0 .../lib/modbus/procimg/AbstractRegister.java | 2 +- .../procimg/DefaultProcessImageFactory.java | 2 +- .../lib/modbus/procimg/DigitalIn.java | 2 +- .../lib/modbus/procimg/DigitalOut.java | 2 +- .../procimg/IllegalAddressException.java | 2 +- .../lib/modbus/procimg/InputRegister.java | 2 +- .../modbus/procimg/ObservableDigitalOut.java | 4 +- .../modbus/procimg/ObservableRegister.java | 4 +- .../lib/modbus/procimg/ProcessImage.java | 2 +- .../modbus/procimg/ProcessImageFactory.java | 2 +- .../procimg/ProcessImageImplementation.java | 2 +- .../lib/modbus/procimg/Register.java | 2 +- .../lib/modbus/procimg/SimpleDigitalIn.java | 2 +- .../lib/modbus/procimg/SimpleDigitalOut.java | 2 +- .../modbus/procimg/SimpleInputRegister.java | 2 +- .../modbus/procimg/SimpleProcessImage.java | 2 +- .../lib/modbus/procimg/SimpleRegister.java | 2 +- .../procimg/SynchronizedAbstractRegister.java | 2 +- .../lib/modbus/procimg/package.html | 0 .../lib/modbus/util/AtomicCounter.java | 4 +- .../lib/modbus/util/BitVector.java | 2 +- .../lib/modbus/util/LinkedNode.java | 2 +- .../lib/modbus/util/LinkedQueue.java | 2 +- .../lib/modbus/util/ModbusUtil.java | 8 +- .../damLightSource/lib/modbus/util/Mutex.java | 2 +- .../lib/modbus/util/Observable.java | 2 +- .../lib/modbus/util/Observer.java | 2 +- .../lib/modbus/util/SerialParameters.java | 4 +- .../lib/modbus/util/ThreadPool.java | 2 +- .../lib/modbus/util/package.html | 0 .../hikLightSource/HikControlSocket.java | 2 +- .../web/service/ksec/KescEncoder.java | 2 +- .../web/service/ksec/KescFilter.java | 5 +- .../web/service/ksec/KescNettyHandler.java | 4 +- .../web/service/ksec/KsecDataInfo.java | 2 +- .../web/service/ksec/KsecDecoder.java | 12 +-- .../web/service/ksec/KsecInfo.java | 2 +- .../web/service/ksec/KsecNettyClient.java | 8 +- .../robotic/HeartNettyClientFilter.java | 4 +- .../robotic/HeartNettyClientHandler.java | 4 +- .../web/service/robotic/NettyClient.java | 8 +- .../web/service/robotic/ProtocolDecoder.java | 8 +- .../web/service/robotic/ProtocolEncoder.java | 2 +- .../web/service/robotic/SendHeart.java | 2 +- .../web/service/sick/SickClientHandler.java | 2 +- .../web/service/sick/SickConnMap.java | 2 +- .../web/service/sick/SickDecoder.java | 4 +- .../web/service/sick/SickEncoder.java | 2 +- .../web/service/sick/SickNettyClient.java | 8 +- .../service/sick/SickNettyClientFilter.java | 9 +-- .../web/service/sick/SickSocket.java | 2 +- .../resources/mapper/CameraIOConfigMapper.xml | 2 +- .../main/resources/mapper/CameraIOMapper.xml | 2 +- web/src/main/resources/mapper/OrderMapper.xml | 4 +- web/src/main/resources/mapper/StockMapper.xml | 2 +- .../main/resources/mapper/StreetMapper.xml | 4 +- web/src/main/resources/mapper/WarnMapper.xml | 4 +- 875 files changed, 2214 insertions(+), 2248 deletions(-) create mode 100644 doc/JSON通信协议文档5.31.doc rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/CommonConfigure.java (75%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/constant/CommonConstant.java (96%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/properities/Md5Properity.java (89%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/properities/Properity.java (86%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/properities/RedisProperity.java (85%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/FileUtil.java (97%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/HttpUtil.java (99%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/MD5Util.java (93%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/PathUtil.java (98%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/QrUtil.java (98%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/SpringContextUtil.java (96%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/Tools.java (96%) rename modules/common/src/main/java/com/{zhehekeji => leaper}/common/util/ValidatorUtil.java (96%) rename modules/filter/src/main/java/com/{zhehekeji => leaper}/filter/FilterConstance.java (85%) rename modules/filter/src/main/java/com/{zhehekeji => leaper}/filter/aspect/SessionAspect.java (78%) rename modules/filter/src/main/java/com/{zhehekeji => leaper}/filter/pojo/CurrentUser.java (94%) rename modules/filter/src/main/java/com/{zhehekeji => leaper}/filter/pojo/SessionHandler.java (93%) rename modules/filter/src/main/java/com/{zhehekeji => leaper}/filter/pojo/UserType.java (86%) rename modules/filter/src/main/java/com/{zhehekeji => leaper}/filter/util/CurrentUserUtil.java (87%) rename modules/filter/src/main/java/com/{zhehekeji => leaper}/filter/util/JwtUtil.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/Application.java (66%) rename web/src/main/java/com/{zhehekeji => leaper}/web/config/CacheConfig.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/config/ConfigProperties.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/config/PackagesSqlSessionFactory.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/config/SwaggerConfig.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/AppCenterController.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/CameraControlController.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/CameraController.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/CategoryController.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/CheckLogController.java (70%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/Login.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/OrderController.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/PLCController.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/RealTimeController.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/SensorController.java (65%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/StockController.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/StockLogController.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/StreetController.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/TestController.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/controller/WarnController.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/Camera.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/CameraIO.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/CameraIOConfig.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/Category.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/CheckLog.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/LightSource.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/Order.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/RFID.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/SensorGun.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/Stock.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/StockLog.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/Street.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/StreetShelve.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/entity/Warn.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/CameraConnMap.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/CameraControlLoginModule.java (61%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/CameraControlModule.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/CameraDelayTask.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/OrderInfo.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/OrderRealtime.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/TaskDelayExecutor.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/hik/HCNetSDK.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/hik/HikCameraControlModuleImpl.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/hik/HikExceptionCallBack.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/hik/HikLoginModuleImpl.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/CallBack.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/CaptureCmdSerial.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/CaptureReceiveCB.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/JoywareCameraControlModuleImpl.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/JoywareLoginModuleImpl.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/NetSDKLib.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/StopDownLoadThread.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/ToolKits.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/Utils.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/common/Base64.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/common/BorderEx.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/common/CaseMenu.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/common/ErrorCode.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/common/EventTaskCommonQueue.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/common/EventTaskHandler.java (60%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/common/Res.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/constant/SDKStructureFieldLenth.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EMDeviceType.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_BATTERY_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COLLISION_MODE.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_COURSE_STATE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DISK_STATE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_EVENT_IVS.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_EVENT_TYPE.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_FILE_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_GATE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_IPC_TYPE.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_IS_RECORD.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_NEW_CONFIG.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PASS_MODE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_QRCODE_STATE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_RAID_ERROR.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_REASON_TYPE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SCENE_TYPE.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_STARTUP_MODE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java (67%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/ENUMERROR.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/Auxs.java (56%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ABLOCK_INFO.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ACCESS_VOICE.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java (69%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java (66%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_CAP_SCENE.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java (70%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java (69%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java (69%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_THERMO_GAIN.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java (70%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CROWD_CALIBRATION.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java (67%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DEV_RADAR_CONFIG.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DHDEVTIME.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DH_LOG_ITEM.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/DISKCTRL_PARAM.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/EmptyStructure.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java (72%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MaxNameByteArrInfo.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_BATTERY_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CB_CAMERASTATE.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java (59%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java (68%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java (62%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_SIZE.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COMM_PROP.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COURSE.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COURSE_INFO.java (68%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_COURSE_RESULT.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CPU_INFO.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CPU_STATUS.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FACE_PIC_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FAN_INFO.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FAN_STATUS.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FLOORS_EX.java (67%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FLOORS_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IDCARD_INFO.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_ADD_COURSE.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_CAMERASTATE.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SET_2DCODE.java (67%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java (67%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_ISCSI_TARGET.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java (70%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MEMORY_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MEMORY_STATUS.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java (66%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MONITORWALL_NAME.java (64%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java (70%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java (72%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_POWER_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_POWER_STATUS.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java (72%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RECORD_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STORAGE_DEVICE.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STORAGE_PARTITION.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STORAGE_RAID.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STORAGE_TANK.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STU_LOG.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_STU_OLD_LOG.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_SYSTEM_STATUS.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TIME.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TIME_EX.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TIME_EX1.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_TSECT_DAY.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/Net_PIC_INFO.java (71%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ObjectPath.java (70%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/ObjectUrl.java (53%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/POINTCOORDINATE.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/POINTINFOS.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/POSTION.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/PlateNumber.java (66%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SDK_DEV_TIME.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SDK_HARDDISK_STATE.java (79%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SDK_LOG_ITEM.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SDK_TSECT.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java (77%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/StringByteArrSixteen.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/USER_TIME_SECTION.java (69%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/VA_CAPS_INFO.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/CameraIOConfigMapper.java (71%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/CameraIOMapper.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/CameraMapper.java (61%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/CategoryMapper.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/CheckLogMapper.java (61%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/LightSourceMapper.java (62%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/OrderMapper.java (72%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/RFIDMapper.java (61%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/SensorGunMapper.java (61%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/StockLogMapper.java (61%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/StockMapper.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/StreetMapper.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/mapper/WarnMapper.java (60%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/Cmd.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/IndexVO.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/IpInfo.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/OrderSaveReq.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/OrderSearch.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/OrderVO.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/camera/CameraConfigSearchReq.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/camera/CameraIOPtz.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/camera/CameraSearchReq.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/camera/IOImport.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/category/CategoryExcel.java (73%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/category/CategoryModel.java (62%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/category/PageSearch.java (74%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/realTime/RealTime.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/CheckByMan.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/CheckLogSearch.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/CheckStatus.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/LocalDateTimeConvert.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/RowColumnStatus.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/StockCheck.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/StockCheckSearch.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/StockExcel.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/StockExportExcel.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/StockLogSearch.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/StockStatus.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/stock/StockStatusConvert.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/street/StreetSearch.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/street/StreetType.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/street/StreetVO.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/warn/WarnSearch.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/pojo/warn/WarnVO.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/CameraService.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/CategoryImportListener.java (71%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/CategoryService.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/CheckLogService.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/CronTab.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/GoodsActionTimes.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/IOImportListener.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/InitService.java (82%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/LightSourceService.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/OrderService.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/PlcCmdInfo.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/PlcService.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RFID/CMD.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RFID/ERROR.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RFID/HEAD.java (75%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RFID/MessageTran.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RFID/RFIDMap.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RFID/RFIDSocket.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RFIDService.java (70%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/RealTimeService.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/SensorService.java (72%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/StockCheckRunnable.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/StockImport.java (76%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/StockLogService.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/StockService.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/StreetConn.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/StreetService.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/TestService.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/WarnService.java (78%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/JYDAMEquip.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/JYDamHelper.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/Modbus.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/ModbusCoupler.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/ModbusException.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/ModbusIOException.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/ModbusSlaveException.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/AITest.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/AOTest.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/DITest.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/DOTest.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java (86%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/cmd/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/facade/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/BINInputStream.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/BINOutputStream.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/BytesInputStream.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusTransport.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java (87%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java (85%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/Transportable.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/io/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java (90%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/msg/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/MasterConnection.java (80%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/SerialConnection.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java (84%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java (83%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/UDPTerminal.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/net/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/InputRegister.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java (88%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/Register.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/procimg/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/AtomicCounter.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/BitVector.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/LinkedNode.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/LinkedQueue.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/ModbusUtil.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/Mutex.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/Observable.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/Observer.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/SerialParameters.java (99%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/ThreadPool.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/damLightSource/lib/modbus/util/package.html (100%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/hikLightSource/HikControlSocket.java (98%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/ksec/KescEncoder.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/ksec/KescFilter.java (91%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/ksec/KescNettyHandler.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/ksec/KsecDataInfo.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/ksec/KsecDecoder.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/ksec/KsecInfo.java (89%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/ksec/KsecNettyClient.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/robotic/HeartNettyClientFilter.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/robotic/HeartNettyClientHandler.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/robotic/NettyClient.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/robotic/ProtocolDecoder.java (97%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/robotic/ProtocolEncoder.java (95%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/robotic/SendHeart.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/sick/SickClientHandler.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/sick/SickConnMap.java (96%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/sick/SickDecoder.java (94%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/sick/SickEncoder.java (92%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/sick/SickNettyClient.java (93%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/sick/SickNettyClientFilter.java (81%) rename web/src/main/java/com/{zhehekeji => leaper}/web/service/sick/SickSocket.java (98%) diff --git a/doc/JSON通信协议文档5.31.doc b/doc/JSON通信协议文档5.31.doc new file mode 100644 index 0000000000000000000000000000000000000000..c65e140938cc6165547276fd93f167be2fc8e884 GIT binary patch literal 441344 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

x@3)kiidl}>#D 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

APIbM-pquHSPoM%b!xGdixCs|5~e&D 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%0Dy==C~_&hoO;%d9>= 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 p&I*qpsIJTXhsoc|pFa;iE+a6& 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

Al+AxR7F$1CX6mB^Xkl4Fc z%Uv{9KdMERQt&I=?hoDPzY9o&l`x_)qi;biY{sc2l#Yc{_}?mEfa+F8Lawyb@GinI z698xN>Cj|G=sXivl<-1wmZP-+^WEMKnRtshl4XcEZ2QeyPAA&60;LY&Faj)GZ8~s1 zzxp(p^b&;_1Y*l^L(_as$^MI~)UkE*&y$+tHzL$;>^h8YKn|%wma{>#gOm>i8AO}z z^?C^Ta?9{@NN;Rg-vu&az!_uLi_zJvysD->bA?@AI6-;_$W|La1s#eWR|X^*fdQNF zIS@M|PmRk~FQ;VPmpvL`Fg)X%zaedPyy) z%wJR#Q)5sW5!t*pOuFzI*y_DQw4`yQy#J>KNID=4k_!z)z)~qrWSCM=O8Dao zLk@9b%xUzM0_iy~XWWa}5eP1t4zLJ)RJXQ80KCKzwra7g6QyC4xuA$X0pO*?;e|Jw z{%ev*kRaD9CsS8ANN3nAlTK-TY2F_n^$+_>PLwj8n~Or^?Db{Oom1n7_1bihYP!uMP#YH8@*mqUsCm)`2HbV!1KW4>jl49->S=)OE;f{SJ1og zumT8p0w3`!l&4b?6I1jto>0)x9sro!;?xNq!yWMKa-`}zKV~G2q2>3&n9DASl_cYc z0a7w4M%a>OX2jGm5&?ICw${E^-61LYJuBj>q1L9ph)A|hNZ)N|)aX7f@B&K};Kc!) z##Vnop``x?7UXhugS#7dovBa0_0@`5{C!0I&gTk<^sq_9rC;by+lb@}gF^E-Kop0y zKmFrvm&&uC{Ock5+haWi-o$#l&tBt$T^I&aHi}r}ul^U%qgN{SU-pu9OVdgX zd2y4Zko-=@ij(mwk}#+$Mv6myyTu4Q^}O}3d{%qi_Cd59fw4j5Z=nMLZ*oFhaX>pJ zi?wBTu6Fx_v29;xU2{V4SXqQ6c(YIN82!@J;5_*L?#8Lw5Y)otmh{!#Sy8^`TWp4N zn6{`d4}w>}24hWBrf2V0rKaUm%e^<2z)YYQ89;@O(eQ`@8xv55CwkKAC!*pd$V zEGjIoNf>%0r#0)#_SzyfD6@$CP09CS1lY zh52Crt*o!l?5WH5*7r&O=kwKzA8h>@CJrH^6TR_%w?~E_F3ey-!P9n{z)zy}>n&WH zdV2Jv1AH|3_(VgEKXN}461O_;_KXugUCWKmA5$epA^iNafeal38zc&40>w~^zC4#A z970-F1~P9fCfZuV4xLw|=*!Zj=|i#Kn5{7T8XbP-X%Xx=Qldk?Ldn#U8||kI$?1cpp46D3lf%w zjOg*dA9o+Gs{^zI>8C{X4D!uR<1G6PHEUmOU}L+ zQsR|RJy>wbhcfeMA*UIZMN&R*5RvF_WoTm zQ{mgubcg@V4H}ESPF8wFwutZE;>U9}>-B^G1KLynTuU~RJ7=)g`XT`*miW$oK|*U zrqLcQ_?#Rj<0=a%TpRPOtD)2+i-2D&mCXWc3L8e!4ZW$a2k~$k=;yDG-8B(7-g|zF zdyiLoKcwqyS~|z$`aeGBmNuV1ga5F%JrsZ3L3e}HQ*ty&vC_VfCk_=z=3f$7vfvpO zVV3z?=r_TTYoUk(5tq(a)|NQyyeAtKHnW=Dc5ded&~SlvSSmquVxT`YYJ6O7`8jf1 zot4d-RS_hF1cF{JA4{?`wp?UR_qW>Hg2^`@SAR$t8sw_5<;2fNkpWGiwIWlD@KgKq3)|1cEnG?(-B-sf!i(?Eer06fyC4JQ7{5Wo zmWcbZxC8~SKz#V%Nx-kKXwPMrJCkn*K2sl;cOu^%*YE0ox7ONp%9Z~ED1*^xs)QhU zG>946>zpSFDCEf?%+sM`l^h$9>qigXicy#4woIA|M!@S0 zAcw>J9xGRM3`K4NeIt9 zPlZM>$NV19VTh?E52XwjUv=(oN~J3F9XCPi^YLe{7s3ypcyxSP7L_~>gPuWgzpAnW z5zz{GOj3xVA!sl|iVeaF5_rxT;{>fz4pzcQG$n{$4O?23f&=SltNZlU#q0VMJbUoN z@YRnmIk^ah1>AlXOOcSr|D~+oMx&I05QdX2!Tf3c3JHtkY=upT@2Xs3r%p7ZDXmel zl`KQ<(m9tMtwqE~d9B0U+q#UKyO_iKpm-2|P?{i8!G5DzUyhGW_!{lwMv0%;dGAXV zOCxhuSBHmx?Xqptsyqe7Ym@)WbhqezrhmufRu44QCpNasOJr&|Di1RgnQw(+4FO&< z1~+E%t!&Dgqzu2 zXC0Ia3)V2JjY?=JN*}u-?@x2-0@`-?3$QyW`*InAzKbvbG?aWv#0gjn=x|h=(LS#A z4%h2~;8l^OCQoz0aiYphGzNf)AaZ&|M`VqfSe>Sfg%AAhn?%>gfet^2-0OBdwu(~l zVWtO7|APZ>QBNcpN_Tx@gP6Jkx2aqw-UcmE_Mb9jUq+2+)rM_riR>vKSXU2MFV=%b z4(3F+8L6{kP3IMCb9OTyJk73-H*9lq&0jWv!t3cyRAm#(I}WBLELTUBI2M-6q{_H? zngfx$zP}s1zp%tNaoMCrgDZ%>ypmk#bv>MH`puKmSF#PjZoa;bPV6y&x5IctY87@R z3SjyqW<4=dQ#F>hZ=3!o>Kh399t9R9CMI6(&vcOfT4x8(6rS*05T+Gc*|j8v`!!mp$rCF&eaL^EuYGN_$QRNzR1Z?QiZ|dNRal+b1P{wru=4ChrJOuG0R_bGWM7 zn(@i^>Q+JuYI=9G68AD!WlnwaeEvfC`w5}l`ScE&;RgrKqJCG<7wNcTUzSCyXxCA^ zL|MwZ49J#*#D(^dBeE=4Q8)r?vjhT1t3>3hN<5Y;ai6X6I~~uZ*emL{`&7>YrNse! zqgLoxWn752jbAmweCui&Io*~y=4D9!O>u4qPAh8t>w$G$RFVEpnx<%uF6aHWKhwW- zxMb;T=4j^P<747RZ*TO{XqC&wN?JG?v1wQbb%bM4q6RPFh{?d0|qvz4NPwvxc^ zg{7P_q@TXfn%>5K5H=mKiZK?i){dWzTE7acfpN_V*d<%cQ6WzF7_28s{eS7cAk);Z#Q@| z>%`~nu1T|c(;hE0xzJ?UG>E>no?eSAOb&RKG3x~#?K9apJTCAM7#)}~5$C)!`2H^9 z=T@!SI8P+tSPHI4J;8Qyv3(utp~&^&zg`c0vRO=JiU;#&*IreQ<5qHFKh?dPLoVR@2svX-OCgv4bRSu6ghj}J78o6Wv|hWWMNLlrv2Nm+3R z5U^{W>OeVpmHZq$??=<6{ZLUeC*88X7a(5-PIUb?7yUF6+w{z(Ht!#s8@4`U2F+8? zXBSFq2ERmHwuateoLAlFG&J~c9#%mIF*h4YwVplx?>Er1LG^uRGxMqQdrQNa(P!pg zdqBN;f*#PxpKSRETkAt?9(3_0eP0f$C#|)Ak_RNyq9Y+Arn~0b+NF=WohjO{(SID} zP8xLjw9o=~Ra7VC*#Au6ELLrH_`Nl5_mCD@e*IS2-tO`wOe(eA0Zd}AheG(y`Iz_H zHcNiUN#LIjti}9idmjU5zsbhs$+&ZoR&Nh;*wXLnrNz}^{rIX@!Ez)HA7O&qWK!h@ zf~}SRhHY;j({$hddbTW9pGY$0a4&l8?kCIQLE{f$3VS)Mp7zsb_7}MtS|^MQ%e=60 zLEQ{hJiFd_g$7Y}Qh3^!ni@50@Bkaj);m<^1KMl9IVI9yh4!ujN{i_ME|v+XU+{?t z*6Yn)4oSK?9o{BpOymR9{)WtS>&&lote$;b=T>jDd+AE_X~gTI$U&=|Rr1xBvj|!G zdA^RcjG~=yc5PaNBZgYMI9NIb{q`T1k$Mo)3JpXDd+6u}@Svg{^KLdbaL z+2gCmN+0+Zy$M6YQViQY4`eWAgHf8kG}bie@bZrA-=h;Q8a*d&Yl$WP^9SI<(>Vl~ywfAmq^y^=Y~?6QDu$>GMRypaL?Y9iXu zI>a<6TwL6oC4x||K6>)dprxAHF%2=X(h)q#G1KM*(SBH#JvkFopYHJ(lrKUxd% z&a>M4&{2)Ga>=ZjBb3J-2;D?&KPaz#Xekq5*#XJWzevu%O;Q<$!`sR^by`&7j)SRLmCanvu zX=nYv5Wun5NRlGKMvK-g=#b^I+T|)XeY0C{vYX9S(i6HrJ3Dbd_s&f&y2>gB_w;&K z!$V6*r^H~2jgo3JG03xs{UR+R5I4zsD2j-X{Ye=K{?E1;V7n8e%x(sP)@+F@=at#% zki)MDyWWd5=5O$xq>(X4J;NuqDcR%3A`PhR|H=}jQnEn&I~ei;s zBz)yvC;aU=2F*78BlU1r-V4VzQNX+Wh6QwW=Ine-RLM6XOUHkn=@6oTE4mJdmrQwZ zl6Fw<_7ANMgHqWKemSmperdeexP8)u*t@oh5s!1-9CPS0v||LaMH+{9|K4B~-`F1c zRyy*H5}J+)K>KT39u8y3fdICLA>vo0SYaXNuOYS|7T(7(x!`DG-NE=TE7v`prIj3C zr30tQfq=lupY!k3s5URdz_MIrW=Zl%7&fY-m5BoVS@Ao+2L!q+Lc^RznVdaBOrTQL z`_S@S3%!qi%2Hu9WD?;40~rK-7!}JDw2~EWt5#$DR(tmc0#vTUU>FK4tnf)cp8NSD z`OQroogYmC!dyS8-MaA^41!9?s6Bf7YNVqEW#CW^V3znSeg%u?e*Hh=%9D%IB=3@5b3VI-CFD$B-3ECk@QPM_mNwj;a5-sJ^-!6OPt#`Y+7VXTf@ zWW)|o?>TGL2yvy~HXfU{=!zNo9x1+UCn{S0>beN`j|MP;-c6Bbesw4lx8Z5HyQ6`@pR>pT$W%BbZiA(?#}tWaVS<=t3Qz%`Z1@{~(!QQ_G~88W z#=cJd`}b5P;>A5X**N?0z-ne)J+tEUujRi#Xk>Sqzwx|sjL@b*?H2^4W>)w^WQ_yt z>Ev*5T3oGY(ERxJn*Bs&?D(TuZ8!L~RdJFbqhxco;RL-17CH&Boh25$@Ux5{Io0XW zeErGJnSz99$>Ej4|`p^`Kiq?{D+DGJ@_+ecJSiHd%wCzd7UHFK@CCAwgim@3W{ z&bn=W#qCm!eRUE|=(E@MaePjt;Xl8C*8?l=Yh*}fa*NIzkib1Nk9Tw^`63v?|3XAo z!BOG0sk?gqH1lQUJ8xT#BIwYJkL)3#HgKaT*QC_zx_ znTYsCa4>3>G_1c$<#gy4u5-p=GO68^>@o!J&&HDu>^C#)Q-CZQMlbPpMH>wyhZFJ* zQRc;@#uQP4A*mdHmq3jcCu=k^jXv%E<|d+8C}Arg^m%n{&Is60nm)iUeAYrExX2?v z)N>SbNZ$vy^$tIDj@e&kYOPKg=m*qjr;0=|n0+5=+AiqSgy5G3JDu@5s?I8ffn5A( z`Z1My^cScDPU z+ZN_rWqg_lvwV9ywRU?MIcve9*VevdMM#-dJUU)PnUX;#?o21vYBoF6^X5!Kvfged zpQ>#hs%mzu%U*JVj_s{S33;h%NEG8hMVck#Wb8KLf7jI5x%k2UhP!hu(;~zIzUL$3 zbwlAvt=oA|Z_CpIG~sbR_tX1!nKlrimJT!rzU0Wd|c{JS2g)rhabN}b*Ko|jTC1h(87zPPr zC|P?R40U62Fy1#|$fL+F=#*(+|5D5#y(&_Yt9MFcI#QC4gw%RnZ*Np)7MpX&ZoKc} z{W0f>|F}MQX`GBPkAdyoiG}z|d|Si_dg+-^TeKUAf;4YK-qP5>3q*DC1Nt{i3=E<^ zcCGv}OWu0VwZ=v?eZgGf4S{-_QHOy%%rG$((a+XWYTf;**dUyr=pl@7pC*=gzT7eW z_kZj|@av9Qa_IA&?^=H%0oZ6j2vDEYd-SoS$JxYJ@x~R~`qYYX>CF(uf`gE?%lpd^ zp~+}5v?cn-6knhyC?H1#*EtwWzza%bkUMccUNcG*NX}#oR3Mx{4GR@$2TThCU{Lj? zRc|z3zpX>;qvB&1qqBU5bjN*c3v;Na^U(i?$@K3_)EQSXJ)F{_Yh{i@15{)>5ZuRtUa8oxN| zOcuJNH`##Sv((fYEZw#&=)b?puz28X3ifJTvz{mTanX6Es@s&?;^293zN~;1>o(o$ z>z>cpfmWleBK;q>Uy0r~zXs)DC-;JI6Bgxocs0mLNCN`+Lvy-3US{t8qQ>AmKlfHP zUd9OtoHH@`yY84^7-3}=x|(1y0sq5f0~3M?1Obe@q=`~-(j3er9d0p8hrC+*%?$<~ z2|J&|g2_hQvwQGITanz$14QUA;C8%Pj&Of5Dld~v_p1QHt^SwD|GgBOPSa0i(re@k z#2WMh;eVJwCy<0xMt7~VEW3>LQl6WAzGYa=M|XT`D#6Fo$IEe#$+2rmdXh>^(f^OG zidhnQkwL4M#5yS2_M7!GCRCwhf=WZOr1JL`=aYMpk41)$y+wDdjh4EA_70bu7w^@B z{bR5isb~ZJf9duj3rRQ9`BVg|(p!Ki@P13Y1X~sMT24c?L@Se3m5kKLl64hqe{lIr zQ)ErMDi#@Uuv73Nnmi=0Y@I0$0tu$)WQ6#3wj^vBB{CI$H>@armR4grrn?XxG=TjZ zJYq~wzUgL8%b5VY2Cn1jNhZSmB&BJ!--9UFkOCO`-|sIXgn<|IW%D9I=&*=EzmcVm zBtT`?e54_Ds<<1X>PDreOvu}FS0@&Ve!94O4#C-E5=J41|1SnKkPMrciEo;V9hY^O zFy*pf!f2RhWY%xKdP}MQi_YO)p$%ttRYc9oLB{ld22t}V;h?P}&FJ%pHK+q&O9F=fb|n6{ zGW`Bq8MK9Rz!LOLL*}Zrw(kT5kbzpu|9oZ*n&(RiOOvv*Wf{G9aQiUXxdF)~YN+TM zfn21bT++J#)xC#g$e|U}%3Ce}8~OAz%tE_I>JA#`oIO;E9O9H>&!AHF$DsdKG@e27Ng2TGyun@cL{9boBPvDb!k z{4IkT-;+(A=t?Ye<&efMbj`fsk+yu80M0*-&#H81zkiR;@t+@I#k}mG&_qCyX{%xsICW52bQs0)_~Gz}ONmTfNI-9<{E{U1p;6_84Kt z!pT-ZfJ1;2D2@mUa119UzDy!H!-J7aCAR>S>s%3|&jz^*>L;Z{s%B}u1d%sjhqWVD zxG$+_LL5#~V|TcTUv#sz^ZuSDv=Exd=g0tgKB(Rr4x+l}?aw;~2|4z8aDXpmU}?5{ zFm@sZ4F4D5-dO7rAw^>)S~U1gGpiw2!7GIYJbs`!{Gk2icje|BFZ;(arslsB$&mh& z{A6&>GFBN@HLiw%t@Flb%e!#0?{f<|d)qHUIwYu15Ct!(#Gqm430O&h!p4jkB8B)L zFWXK=R!$?Ul4oKOflTRk(SOoWeoGlZWWs%^J5(iphVj&G${o_C;{|Lwm_}DqPv0J zyqvO^U?V4=J8by7k+42=gOygR$HC!|4L$4e{Z5Q&YND0ADh%2o<%Ctu9XVF%$5!ov z{u9FIaqvA6>MP_z3g*8l(3DubMJ2o~UWhp>m{Rw=MFjr|*7@jPVEYb@&=XKvw9sA+RywRqCSiUBU!y`!0^IE#aIM}bMF0#9qdz2(u?(d%VT6gam!Q7+ zqL-E=G%mOtTctn}{J9+Lc+FWq$@$>{B_t0}>-;n4vcAyj3*?;wxM&85R=o|ht1 zw!NM;9hwoBNIL?E$B_xE-*?5TDZZ#sEauFJ34)Ra!Pk9zqGj(XQM3-CL>C}nXedRq z6kpezthta5c7;F?ig*wNF`~Ts-pj{em2*JAU~pMAHLN&7-6<2&4wQr%H9vx|jr+q8 zm&88ODG>gj< zm2$>(!=nmlx@YIuthYOz^$u`p(&3IqNdTt+d@cX@h<1ti!$w`#zVX!UZ2Glm!p@!@ z++M1mSp+Q|5noUOfwnEF7geioYX=AEEgHwJl8AN$R8dr)A{k0Qjb|UiVZ!OmZucp9 zyd`LD`~eln*UX`H+5Fv|;#=lZR5BImh;MugNOX@=FJVg*&IT7g=nxvwa(LX}b#grE zb)E$t4|2x&$D#oNl3zE4m68+ZDvs5>+SYa=khLK^2AqmGX3AWYy+l+3%n?Y;Slte? zyKM7B5Mcx$QTQ5Lkec2Ti2&5p33mgu4oZ5UxSx8EDl@r@g?D)eris9~2NV@J`-SQ4 z?>Vo|NAIXkbEPa0FeMB)kqi-rNDyYZ<_sS_vd`lK2i*THK(4Weu!O;+XS+vF6-vuc zh19g~PZhr5)P}_N;gurTo59ErSCkL^#4Xuc0yzra!ACg@ zL@z{`(pbk1=p^;DR1t{2-gqejF{9GkZ!^Wr&C?4xKcGWP(QUt!ptDopo^!g2e$pqI z3CK-mQI?Gu>>+O-yhan=THTpZo!7<_Z>NAIg3y!>vPvSQJ9yFwIw)H=|$o?MwQh(%sSb?z)DX=#QSy)XHvFG3R{g5RM75PJOv|us{tjXaIrZx5%;s zW;X&yG{q8UE@mEQ=|fUe^}8{h`*82m#&rl~!Mqw@0PDnY-gp3XWtAertvtqUy4&mt z;{{N`rb96i5Rda(6O5QI>=#P#&zbM%D7sM1d~jrBl#@?{RK61-14p zTr%8a}o^c1Z@7K-E6FauR18W<{)5dsTzG8ru^;3zp_Z(`e()D4b8MP!(cejdexAtntkw$@cwoRbx)0 zs5QWeKv2F02!&=qS*jCIAb|Hw=LAJIw!l$qutMxskp4pD#_ox5VuhB-y2^9C zt*4KAy$z$BypHpU1yYshY`}bav&YyV?m)%@4g-}LyHD~5G~-}h?Rv9H0HGALxUV?H z*i3UMv=KJ63W6X*vOdaaz6O)iCv@YUDrO@ULez>nKT;xmk=~R4eZ>gE+f1~e+(|)y z!B4uoqUMc>Cqhw*GeH=4q$nH|=mIc2`23_u!a#T>aa1OGaGFnjl&f$D zTz#Gr-HaQpThgss%gR_j4^%s6w%EQs9%WGX zpe=@?qQE2Of}|J3wQ1*3b5wl~`@oZ;Pv^bUW=bhG7+mNH81ICw^SB z@qG|DoFjLA?9B8^>LhDmVrmr@D-Q#IuWU)nFU;6>`W$5c3Tb}jYd){6VCDfcDOQ@f za3-UQqBMBfZZwsaUTwVYJBZ>k4B8$as`=bZH{!C%WwHyL-YAA;){gK8M1Nh^sYZz~ z{31T9XSr-mM9;`zf{FQ-;?o(Q^6h(AqRn&lH7`oge}QWyNdAm`VU$S$zRu~UsO#6K=O zm6fxs4VDW!y5`YdQfqU|$IH%^(ptZ@HrQF{ub)d62^c1`xP2}jo7IvOYXT^k=3Hpp zsGm;N?OkKIT8s}T*NVE$)6GX8&RvpIR)UQfe&PEtv$Txhy^K1o1c`sH*5G;DlsAxZ zzJeUx%uB?|Zo&TfX9!;wc|IY7Ed_On)`56%^kIV@%a6P$p)l!w1a0QL0qHpKR_4QM zoj6}U6ug3_L7*%I(xc31-P(=-BoKy6>v;6zJE8HyAylp1B zYVDTyJ2g|d*^%+{s`=hU-E0zB(-hHS)`?Jhv>o)X>$kcG9pFsjKUher6cP`GU(W&w zI9G3EU9=!xYx9tNlqX~Ot1)Z~_FjJIqGl4akXF)Vs}1)Cd4D!A7$+*{?eWj*_~muJ z3xjCGx#MsBcv_|mHY@j-(6}$IHi6*L*3r!|QEF z+e0zgkXVRCazJd;s0oi$;g1o^qZ`)JZY&Y47@xQKw-+mx#^ej=BGnA0LHQ16*Nc7d zysWX5$+v48Z&vwoTKctS_ytbbI^lZdN~fQMiB<^lztai1m{{0u>%#)gXO+?%-s|Of zuX-Y-$s@*Kqzr~x{;rcvi*4QguR3Qbw`dFW%kO4ohBl4MSpEHOf3VM8DjOB`8JRr5 zNvjSQ|Ce9SwCoV(`dX)x>AQDabB43yPorG#ozX`6cUxE;xH`+93{NLroVE|=uWB1# zi8Bz`sy1}MSwD~auk7}=<_1eqNL#ZppJS%1i3{`crek8f`SUXdLlUB2ERM}bIRDj` z@NwUEQ!JNBc@s@)xzW0_GXK)`a+Z=MD8spG87_r0S=7lu9WjBXo5RZcw4183 zG)2!6p&eopGB`NjmS3sCx%(@j*Mj7K_8ymzAAP+~J>@sFN4ot*iN6frF!w&S_UM7I8E7X;E_6v`Wuhi{mNB>TKZXg%jzhXzPtJNjm8)t6C2Yq-MP&= zHxtVEqia^C74z{8bp$*wtd&=maNa*S(S}VB71ZvEzkd+%#D!(8)5en8gI#7kGHh#q zVqHRhS9Bn%Y0)G}Z1U5!WY(>w{kLVq&GOKT_xshPsL2Y)o9@TO@?PdiR0Sh%WcJ@3cS z)VWt7G{igC2Zyz z;0~F)fgsPq9jp}0s*Oo~uD)Mp^=l9%$;jI<+z&5fFcq5XF;@6e>(;&w zC;i>C?(I3xnL+mI>MZ^K$V4UGeP^=b9_bAJ>$5`jLizjYi3Q)^ET2?aGbftc`JDO` zKZQJVnh-D<@WM*r!2Y6cR`cBJ>8uv&@Z5#*dZMmDZa-GvWIj-X9@12a~#K zIl9tlc(~aWqya-+ydKX>K`m*eG2ZPT3u`co*zC5po5Mr+$Wet|Pp_lfk|D0X%aM^W zU%BfZj-#a1I=jr^em=jP)H9*|yx3?lo?W`kg*ILy!b(}VmZf$gg`owibvoIyHA)fgW0WSn~34yVJ-dtBaNB$`~~~jFmPc zA=)mmzWC0#40lEXAkafWXSZ!vF+cWhXhOpy$phxyX%Ls@@FBeUPJ#>mpFL`+ zG3uVB0*VpifUi+r z4jn@c|7Td*i`Vy;RV_I>t&TVQm4CY)Gy2X{Exh$bL*Yb^ z!Ob^|Rm~Tx)NnXtWB&RH^P(nXVkX6+*emA^5BOho)#+qCJvhd23@ilfEhq!ostz{5 ze!`Z0#Z z9%F&5IhJ~y;d^27cJMB7I`iHsXCB`i?fsK5JkKaCUu~@MTNDV8HW$p})%&APr6QZz z;&$Y(I807{b|`)JIxv~@?r2e{U1vApTzt8%sjBPCgS#6<#Xktk7(5!}!A9$h@$KfR z%SX%kx`*Zy?@x-&3@D`2wPu(Xwiu)|uIB!k>!L7CknZl&luzx=Jt}RLxJDV1gsR2s zzRQNi69FTz$6l#!MX&g0bNZQw3qIJpF^H{)MW{SkJfMI3IPF+=_$HCO|B$tVhw`v( zKnkeZlqF+I&={BASCn#5QFBtGXG+JLow>;sOB=Z@;}eaEmvGO3OB*S`%TTyb(bm?; z(okuM8zF7EP!Ij)5;pMml}GpohyVdZ0Kn9^)tyPbjku(>?R$&Z8G8Gno9gvg)0j$2 zH`-mLIb`hfQZIL~Z?DhmYIG6veh3Eqc&dJYCuCluzVVy`{EU|Z~jzvL>%dxVjr3AlD=v--uf&sY%dXKvT zg?b_cY6;!cL5x9zli?H}8cdv_Yp^N$7=#UWQ12&1;`~vAo?8mwYOttNWv>bEM%@yW^enqV^y-2bODS+6t`eQb^t#mBTpUxAOol>TiLC? z=6LR`)w=rqo9e|NSM(Dq|CjM(2?Qd@D`?Vy&@ci-69sXBV~X(s$E_mA<6QmKS~a4%0ySFaItKM z+udkXX{kg~fBNZ(gRXQm-y_%`%JIIY&q2Bu!S{KbRMYjUoxApV+IS_YT`>L@_tWv= zPmGUe8B30Km*d;vQm2Q@g`Dh^=fewMrp8b0PEV_kr98HEcK0?HeQW3Q_sYVwD{40| zV+0SYbB#+bZw+;@jLCk+Z2h;U=_=>_ergKp@b={uu9cU`BPRR~A3bLs@4KU*hjkuo zt(PP40M%vP*TW$n`=XCkzYTA%!j>hY=q>yNBfoDX@Ih*DFi_GnnI6AQ9T{rhB0iOd zYGxeF5QS-&i|lh3+6fM}OlvD-Oh$G(kl3uWMnIHvt3GI)? znSnPSM&l2JH&P$ltc6asH^fGti;^oek}NQ=_w zYBgmw0dG3_7fHcWLrgN30!+!+bL6p|P%1dQ^^s1S(~NrOGZcVgXnb-uVm^@$HzRIe zji4qdT__LEXtbB^n^hvfTKguMBxkD!F@ZxM{Z~o|By86ZQaqIH%_w00{`GFj%^QJ!J zF8HnIsKaH5{Dz3nyFwNH!sq$OW}V&p5V_N5b)g{CQzr?G-+0@ds`#kx2?)frSGFAj-=mq z|NO{#edM}{xM8!|kohDL&*O4#d~*|laM0oOJ|egN`*C88tNEOcPWEhl@#F2H>*mN5 zs~CS08|`7vz+%bPvW2zDWor1(;aSEG)2B~fjeaIN1!*pHa2f`w7y+AgTFb#HNVIx{ zjAnwNgubZU03l1&N0pWN0h?Pk0Ho!7UFL1baM06%O}!w!;R{bsy{^oVh?-{Mp`dPvN$c1pLz#8qr*d< zV!nTDOyrEm#hq5D3O4pdgtJ3!bBJ6Pj>*{QF*LGitVvKA?$W%=dHIX3&hPJCb6@|q z9gH8bMJ>vCJKZ&dX-=+2CqB-ry*Zr^cY8gxSf0;a_;|f7S!t_oXR>qZ@?pk)%8F*%XN89Ib zUnoI#yMHy@Z|+ygyVAQnuj;05Iz=m48ER6EIp$6NM)@~Z>R0vLfNLd@ht33WL|c=`!he) z^i1xB!=sa!iZ`G4=l7PN8-wsZ!Mqh+KU456$0QEq^4-={~hbhb)z{x3w?g&ThAvprpX2VER|tgPR8Ivjo4S-#KQ*tRlx+ptCxquk6t zjpUa|j5^HT{7EHlWxI<#b}l{RIBs(^e)nwsW4@RNekt{e`H0n+)%Jwfc5-lA4x+7BtJC>wAAMIRYuBI1_{a7BxyQM8)nhFU_xJ4y z3pVmu=OHef!?mRFHdm{454Mf_#?H79hY1r#r=xuyv_(lR>CGUNz}|9bD3qP?Bg3|k z9o_d+!8nOu#h4juY}M;;ySj9(`MTOufA}}VE@EzlM;5y}=DC&}&L$^ji{-R`FSoeu zl?B}*-*vj|cV}fFN8_!pEzbV7^Z3CmMMSFBA50W~KVx7XQ9@5R@rC7Qy*Rm7a&x$B zTN0*-XjyQSzcLTN(W+iD16w(%KVx;dSK&MsMa+m+od*M0t!H2Y-$xx;La1rnK)_8c zA@_7tSG-i8aGRK8oqs=}`e1ZzcD5lLpS_lK=Pq_a#-_E#gj?_Jv{nEJ>aE3W+Oaxc zMmwkw4h6t)5MaR6s-zx#s95J-WIXP3pLvX}1^UAWW48?b!1HoHw>~Hzc{6;G>+-st z8;RTMWG7P31#m~&?jo7C&;#+MOrYtA4+ulsMaLDkmatD)AaUhoJehfD&lY} zWEYRJbl#rZ5J07a>Gn&ui<10GW|A^2I$F-+d}5{9=>VTr>q-oqlU?8N5+#E0(=|9I zrcV(Q$r0vWIj=?jouA*JpSXmb~5+cw3IuK_KbDCM0U7fy= ze~v<0YjY|tu97%~g$pC{INe;I>hxq_;f3m7s6k7zC-5XeMo+?cTy_;9`w>eE;*#GQ zpg<9qDPRDSf%+KK2_eOj3|&VrMbTJv}|#SuZ$tO{lk%)zAtCD?2g5Gw*w|LFgA~J@budc{?$8<#2R-Pd zX$yha(xONX&1bad?h5;jSLaVM}C+EwB*s;c8O-M-gaDxNwOyN=~2VGDpR*uwQbOMRpF=4+r z!L~BAb17-AdT3%AB^`H9NeLCUc_=Zdt4gZoF+fG2K)&vWD@?_Mxn%cC+#^K@NX$5}c{?x~9jF^}KMX-xlvE$?IU-DVm+j8B>NI98C&8M8VWjWE1&61~) zE}ivyo70WAwjGC?tem$SHsoTw_lu7MpQo{|*AX?{)ppmdYA{F}W@jQ!MF=%2HH+Gk^4XN#yg&`BnxtF5q|XMdb3y^cJrueki? zy9u_8_tib;tYwM5g;i;Cp}u!Uf=R? zN1|$5lr1jJbMK2Lk&pL14j#=+v%tWDh{AJAKQe5)L>4wXQ#|>=>X9P+*OLD-LxQMi z4~#?{mj%&%|2QOalP|=c&R7D7CQ+b;UqYj&%vW$3wRH9vkE+2@i4*|bK2J{R{zM4& zpkZP5_xJgp=1min+TIU`F4lhYyl)C1D|gOZnJ7ZDamS5vu16aH zBmCsi4_>$HKHAmf>pK%l9z~`m7Zc+&bmN$A=_E)3{ge;Yrf7Y?*cs@Pt zR#G2CX+@IOaURYooF)nPkRbFiWp7wVN_+bd3)5`WSv=km`MG#yuYjVF)_pK z)baZYB6+w7H&SA&l14&IEet9Qg@f?@ZY!1->s?a1f0A|n;$ZR+&8cuIP#P=sNr0Jo zLpGT+F5P=SJ;k%MBek&7)9jsZz4P)4zdc7xqI{O@SSlWmw3x~lL!Go-xk?Yc0P@c$ zA9R_sPa-yjx?WPIV$ly@Xh7|jy7cLMvD-p4F*`Xcjxz^SMGzr`2&{p`FovYOounX4 zs5D_F>DjF&UFqWT24+0tWr`uyV#NHZ|a)~8|{8|3Y zOo9+b5=4C>Qcw2fe<3YV)jTn1iP`=}bquIQRjN!_!rld~8aayV(OgD}968?rJ8W;{{xnknQDl^XU^7-H)S_ zZ?8vkeB3UbrtZ$qIo|gJQMewH*Zb#p$?%UM%hEsb+CB-V~It6`e9I_L_P zREAW(lEjwc6d;LTvSKmO?QWJO*4OG$Nx@3=gOsIIal+90*S;uwGEs|Vl3J-hn^XV) zE)b-vAd`rN_ts(D78<$p9ZMuNkeG#E;PVd(2HY#LX=(RLZS{cvx%seS;r*(Q2J zPUcmhN~-H|_ix&=hTPSAZKq)P)4)A>&Z=gnmg`Q`7EJ<$;(P;zW@VE?s9NPb?odoj z7Kg*;R^P(oec+|Y$ww&zJ8+sMVuW0&p2 zOJv^lwNP%3+E9KFol6vDN{C2`DYwn_03CeLhE`s#yN&%;&WFC|MrR)1bDz*cA{-(} zell1msi7@t6Xy2qsh&C)1oOp}0PbAo2rFlUYKD1=tMc329 zvLPVcvE9N1jIZ-2tlxu0fHhEV@|5xg9`0O1E#T3o1pF9$&(lY%#yQGTe*AktCH9Of z7_g5~9(a>2(67pU2lfJSxHPK;3Ru6R`aF0DnT>Afbm*eBnab^)dbC+gcOP_hWVP&G z*3O2=MaoXmq%PsH|GpURVdQmhNY0(l4zqB){DU{Wlp4&)&CdS&qx+m#Y{+DP|Klk| z_bUf;`$zXy_0(D?8}G}ci|pC5%jWEqwN4i!2LpTN{*1MY^eWPDO}la%V<>RUt-mxc zF*fd}5gZKOr6Qh4F{6-rmVC?4mXRxWrbQc@`^x%`vkgnLjET>GyaKMZhlBAd%ek8PP*Y+^W0r-zg^7V}=a|S$uZzbv z8{|{`v!jc=)F`OPeG1M&G3og$X=8j0+1QAEV0jH7j;_lMN_{<0VjkDiY@Ym63BZ?- z<jtx0*8o2uCr)G@+t*#+W3|3ZN>Y^v>kk}_J`LN-1=E1 zwQA|eXgt@GETIE>+0|AjVwdT+t3r>5P8rM9k$qeqyw~8L??c;vWUB$8-PIW%BEC8<#AiSR$?~WoDQ~awMrqkSnqd zt8!>>(kyLHSyg1Rq6Ug89cOL>M{Eh5+*EL4>Jo*>AhWqdjDWToL#C|xc))JAS-L^Jy9vB$2xv-``O`2N@Qbk)-xNS>%Fp!oJh~MsZ?IfmY^+l=i_Brh2Kwm zhEeHL{T~u-dnTz*qew(qnN#EkrhdYCSulF~2sqU6L<$CV`B1scfMYT>IQa2IY~k?* z{xn*SS(a}gzw)?jX^umiNyx~`wDbR)*nyz_c)|^v2J-Dx4e_zFIOw`R@Ss?FHoRn} z$>@8q8DoObLrWo-5jFaJ_6^LXQ{3g*;0$0em=XK}L$K}|71yt^6-G-;)mKT8iCVq@ zFFc=?s9yWIq&!At@q2zaY9Li55r~+BM;?ieachr zyW{R9t`L+--n=vV-vT=q_hbBzJKag|18fW_o@93qci01W^8G>bq9T#XC|oq;zbREb zKe@<%j3tHAKH0DRf@M&E05vGPekSo%*-~7gB%)B2g6geH3WSyf?r)T)`>eqWZq55A zO1ou`hYuA*F8{VX*qxUE6du^JY0$oXA&3{lqNsHJa9a&+{juWAn;~5&Q2YAJ_^4m6 zG+Ez9C9iH)|e|WX;cFkBY_RgU*nhUW{^M z`ri$#`JUr;+g03MQskpV3ua%Wsmb*p6|d6dgaY!+XEz@M`s}+7fAuB-LhE9PTfJVM z`5I1!?icvj9d0wKtJd9PyFS)t-B$3HSsd@*@K0BGgoh6fOstFms*38j_o6~PP$FZb zO}u|h(<_A==;_5dMqlNBHFI=q&fzYI>*r<yV|>B(6>B#Jm7P;w;jrToqTzlC;9{gL(W%G@zZtM_DD(GGj*TS(@ z-}bKe9i!3E0~z`A(OHIrOSm(5(wJDtESksphM7*A9r9PM+QeI=dn9_K^yQ#A4_F5m zdZEoEFyj30r?S+I_jB1xYZI~yrfZsfe*V-exu15K`urm&!f>U_#wge3r$Kwm?-~Ys zy@#HFmnq#;l+81?nDdQ|VN9;L-4|zl$KQ->vm9=>;sal0VaQy zj{HF2Kv)U{^y4SE#8GtfDl%IMJrwh~-CA}r7vfm}fpPZq%*-Vhz1{mYH~anlMvs&# z?WYHyy9=!SbhicT!pbSWj2D&rKNMh?;Lj5B`lwRp^I2A{kl6bXzR$ws?cqpsqPYwC z0htMxnSQ8&3Z)tvR5gVF1vI2z_leLRQh_!cEbhSF`tG`GImaT-7Y4DR;I7yG(G~}+ zNzcoL*ItA5(a(6C@+XydcP9g%4n(fqXSkXfEJ|H3Dw#H3E{E57-hAE``MMkq)?ZBJ zvUt7RYm?qDhscMDPtUH>h@_U8D~z!-u$C`=Z}`!I0tE>`@a@itA*cX~>-=R$EIOTO z$E_^3hirF4#3G%Gvu3-xhSZH#aFW@_7TiQRZBr#HGbQUXGraQiVSV~x>eTB6%AsS@|J;X}8IbQ%H!~NrD@uv>2D3dlTOX=X@%diCU4R)5-iIx{SE1!>FJ3?&_ z9e=wl^47vuMuvZ07?dYqYN%9T>V>o4oqcqJ*Kn zfJ71&I}U}joeMA5eaG)y2}K-SWzF_@T-=v9&!@rH*X_99cAG`HZSQpZJolSp^ zccW3Y;BcDHn?H6wyzC6Nd-_V#^85t)P3-A1(%bF^o;(y#x$=4i1m2(mvSd+id&~d# zEN}|ScbAw~u8Ys^CzUVKQf~^>9vr?7WRRTY4+KANKkHH3$ZoV(ukL6YStYuo#6&yH zrd%wC%2*X7DV_gGn2V~NY-u=JPSyOrIY&?HgeXQBJ^Sz3Tu4cT#&^@lxj!))VXCc^ zor0V{9Cya6pB0kG)_$;;@NYgK!zfEQ&DRcSCv@+Rxxcz8s$igyK@pJ$vBbqvbC=ib zxp!1=-IOFv{uMQ-fLUA;USM~nO$N#cP*c~29h(u(*h!#@)l&X|AT;^KWguMw z8%w7+mogk$()FizQQOS93oOBRL_@QC*{s*B*(W z4D9fQG1?r<^?`;*2N9BCE7rG%QG;C9UaXfKTt&9Q4^IX94mv~2LNmNDc zLRiX=C4QB8DI?-T(d_N07($@EF~2$F&nM5HjUZT*I1qZG5{3kEyNzWS0lIVSwFU{y zCImzzq$J+1fV3iU6oed!qIad*L}(0;+LY(`Lf1R#n5+)_!)aTO2lpm~C)^gQLYJrOGMsmmhdr4$)Bg*d#Bx75$zIi_3xuxGU%h-x4-&G-E^4&o} z@aT+CsxW%hR0|-$-RH7#l0uL^s1p9Pi7=_Alu^xCYy#zL8ELpmeAVb^J)S>-5?~k70sMKAI^qjn35lj!o3V2z`&G>{!vFkP}f6`7Vn1C#sun5>;DC>+f)ISv=|f& ziOAxsR)UIk~!l(Qp{g|Q=Q`}$)#&~rcEva(~9ahhLyJW`!?x9)pZ=I znzn!+LOmAbcFr3bd9KB$BHJ^yxBT0Co;v5LIJu(mBq`rQX=yk0M%XR`+aEn}#s*5Y zCy6$wz@qGjPBml9V0t&^Kgq{c&0!h%DKyGc<(T=weBlp7P)`3+QKkClge+(GDk;J# zL2l%o$O6l_#P1rIS92^lBNpRHaJf>~&LQ3nKtr4Z_b=t@z(YcYhDtQwt@iEReMrL4 zw24&|IQD4X1C~xxZ(Ngb@%>BeSJVr$05EPr+EizrASF$3hU8c1peM5XjC zYGO!%kwo0eW(&z5jHD;wK8IySixGYesKAVG%y`v~OopNU@O1_#fiV5@K|l#JpNJrcv|n}LAfHk|yrS1vILKth`~?@r^{^X){p^)#LFhvgh*QGo0D9`{5NBR|+wTWx|TCD+b3-AZp*Aq3}NdG#|@1uebO;Z8>A|UDu zj?$+rz{Rq!4;b7@vNk~^bjq3(jQXpLm{118sHFm-@{W5bnN)V9PqK_7KygX{9qamQ zl8D%hOyP%k276;cBsK#i>S#~)ywE32TJ+Eb>Hj^dl}%9>vFyJ_3z;ClaJy$x_QxSW z0~8eu{N2k%))Z$_0Hx27n*f#Xc&d5`l2ftBgt@HAj^foklA#3oSP2fQXk3bQO$ zmd<}%BW0oqMGQE36sAMJxlNgueix5-_TmW$m}Ldy1)qCCzn;W%IGpwLs;pY@K4m_C z-4;ie1Y$Nx3Y(A0%#69|UZ;6SEECU(J-YZ?-Q8)Sn=b=SbOj8FOo>4f zk^Vs8gtp^w`^9%`K(-uI`|#33Oau?}?6WfNiaiWC%y z(gHdm9v;uQC{VUE1vN=7FiyC5>nu${|BhQc(ae44R%ZusBRT<;AKNeuf|(#HCBdB2 zm{+06Gp&hQ5SDsy;pfeHtg%jwc^K{Dq03x29o@NruTaEqc0L;=;lwU-PIORdAnnzPRb&g>D)jM>06GtGn{maxvjr1PB98o`&P-p(|$tB?{y!*aBff zt-#oJRv@+|B1cea<}Yz>`-paK%~0%ccz`&+JccH37xtVNLw2_3jFoy)C~LZ>{bJwq zyp_jU{`ekB!va7x7ZDY{dsW*Q5!sahphBxyhi*qx6>2Dy$OMc}|Cs+iDq2Cw5JO3Bp^mib`%9l|iA&F*++c#A7Gm`U1w5F1O zLbA-#D?k9p9Q*_|Wd8*p;Mht%fdKvACm{F=iT@%Xu$Q^;KVcWxX9u?i{)-jB-(mS5 z2NWEzr2miW>&LGr<1hd3U;mFD$Gtim`G0Bw{vSPhX~PLhhgw;UQlL#9~hF<-VNUNa?-#{R8ZrZAF z4a;g4njRUWhO*EnB9u*BYm<|$CV+fY&OZP&d~ z?S!U05KziHgU~Qz!StWxIKY<{#aIRaUzbrH)fhr}3;H;#u67T)y!>5Mje^3DCbh@n z)a^0riK0ZXttxGtz~6k42}-^s)D%iVL4}Bn2*sFHfcBp_#^k`_09G&kQI~1VhlCV| zCXx?wuOSvPzlqeeT0Ae%NN(%hnO2s}? z!Jqa(w1lJG{=N{Vn+cP)`C~`UmK!_*3Md)^NVog!tYrFQId_CVq6u;j3b|2aDL2VY z&?ezKnsRcL+5N)Qv090)AXE)iVhKZ0O@*8n@SQkerH4{lCps z0f$ssd()!)R6MBvAA4s4kJa)%@OfXaCE527LP#Y^k}Z2e_NDB}7DDzdB+AkvrQK2~ zLbNJnNokYzLM4h+%2E`Sc>m9kdMj?Xa_{}!|LypEoilT0=FH49^UR!i=gd4*Qrg9$ zU)9WAP_?}8%AMTfSyl^0wvbdT65<*7_Hb>Z6?i9sgtDIJFbn#Lkq%rZ^698Nsay~; z!Bc+Wa_GXtHWzOsb~>q#6Cb<()T@WpPoKhu)Xy)5b?_?%`1?2sty|1xP8@fTyKGf~ z7S>O8QaH6aDbbzJ9A&EgO-cg8ULBd%5$+e_>n?YB|1|1cRynRH3A2)HUXNqj*9%US z%X>GrH`F!0pl~ca$jZQ~Qxdlwv_qPOBD#gUbEsRG2CK3Xv zcj+eXiOYP!9{;=~EoYAa=h4Qz=;m|8w$eUJ1DeZAcc(0^2=!pxt!t=!W?P(@*{%mV zhT11;CIqS+uW-13RWW3HWakULREu6(!O~?PeD=81hBZsd2eA+<>EzagIQP9 z@aC+0c%73r&GFoR=aij{_FE5V5UJf3UJVjCCSjz~c9~?jrzRSA6NqLcwDqR`(koI& zn`brX_rHI!gS%k-6s^*& zk_(Cz_x3oX&bUU;FW_0cyHt>|=Os6(BHxAl8+a`OU#3xK$S0gzVtk_0Ha$CmFwdDT z*Y}*NU_h>opTtH|_5|UHGbJk=gvC~gn=g1&x>~Qj=BYrT!oH-%-uy4-GfZx#A@an& z(%mbfZTW;w$l;Frb>o9ViOn-< ze;{$$x*GC2pyBO>U5NS)a>?o2loDl#;VAM4jWTmRWg{z`3Q3R(J9T zX7iLyI`Kk8y7D9LEoG|D>2K%7dn}V$B37DohVD*ND91u74+$=v?Z;&IwU^Iz+QhkP zYpuH-htxFTb-S%JG|e<0#glT@n9SUCK~rkh(+w}Q-Z5oeJ~d~Th51E-!Mx&R;cm0^ zC6(_k`yES*&z1{(t!gqu`wkV0%z~xQRC~Dccvs7H)gR8wPg_6Lr9t8T{r)SP3-7kR zuqRjDl#A#~Aah5}4bfcEGloh@(mTy}&-GQjW&2B8{kylU?p(UJx8P1Xt(_i}L*vRG zUlUaZuR5#u?+UI)cD21#cZuaYUr`@#=_+BeNnEZV`Kh7U7$j`Y?CiFL+et5e_2rvY z?hG#3hK-tP2IUFDdLoNcgAJ0`&^Mb{ZMu6mG5c1n=92BRg*U=C;-xI~*-2Tt?Jq;8 zF{cz{CexR*7N4P_7h`2JWSu*s%P&1LWOjlT|9Iunf-P$1JF|T!Q447WO(rdwslUy) z*{M%MD6RN~VFS1>)&l*sBT|g;X9W{mqjmyaDlYvjE6eNdd&VD zIvqN_spNC8fmVT%TL7Jnt8N?vo%HjEZYya5oh4T4>@p&ti5(LQ51mdtbJ#p;tI{4F zQ$2dBtbCR&6#)VD8fq1lHseIh5`|m#``L6Egtx~r9%2n~vbycQ!dIkk>Z~C7(@i%H zkC~)1d-sXbO;UEnzQ-di{T*Ikkxwv+Jt$FNHqlw?LJ(1Ba&Fc$cGeT=%QhCu`L}e0 zw%)Jr_AXT1(GzW3fM+2$862f&3pRW?<&53Mu!Ae8wj?ZsmXc$aEx94Jtrxyh^M7hD zrn^XWGF1)hb!G7b#g8%5FVD63HgS?`cZsXfnhsbqhwUd_I%#R0`ZL5^E9c1u=e z8YR(f&Ea&>Ze}!=T+e+eSFv=9=d#lK_0J0rP0y6D^~^it_U63DNv+N7TU*{=KQYy^ zhrjrtVwoRHd6LwriOPY#b?o`qS2P4ciB;QNLdbgBSCkmkZg`wOlrx|}+w9U7yExlh z{pS;IOX_nNzp0#G0;Bp?Cr+xDz@?kQ}bA8`)8-n#z!yy*S(Ac=_gtwYLwP;F!GQxZoTzDml~87<3l@KJ(yi_@<;cIbkk~ zoA(Etj_UX(sKIZG09E5bS%+q{#m{Kn%z?$yxT$_ZQ^_>S5(n*<-&I% zMsx+-&_$8f6p)>Mt2jJN=1u&)(yDQMcO1Elv#jVQ=`304vFrAOeP+r<>MVDPeePa& z=!4cqRWrTsA#^^_Vy{B&V9s(XnxEn;Wpn}oz!Voy-aQ7OU%rX zZ;q7&w@RgbT%8JjRS?U{tV%2vjOlS@_2M0mF@ym;02#JiG>drHI- zJcN9s*vw8}7D>9{Wiy56LF;+i2RAiO-D$OU4ZB}<_om#A<$W*G7v5V{(6N1N+(ef{ zd7CSbT;W6-A}BA4EpAH>Lx*R>@mal>N#!dtU+giSO0{jzsCqx(1hHSb@^E%k`(#%AWX(Ynrlrnk4i`%*k{6e2yFBkma z@bYqjm;b#P#!l|>)7|IxHs0vJXT&VvtJu=9yn)tx#vn(n9;5DAo}%` zx0ZyluhwQdJKMy3Po=1O+QRaX{0;6`SW?njU!U0VbjICA)Tb!eaQt|mb#d6Ws(yX( zx;J|FpS@uao{*JyRbtH_@{5NKE6rk zl7`kD#dHNuW9DQpSiJYhjunjTF=q_awY9jnIE6~tRvHVL944)zSJTltdib#Svw0#Y z=VjDF75dnR2bP@*>Pb^t<`C-ss4@1`Y9@v?Yuc3q8g&e#t#%6Vlrxw0q#o%=UAlK` zusr$7IqR$j9wil*sWA_Pc4ha-g|6wl%C~m;sh(VdgvFj2Vd&e082u z?uG}E%X$t{PvU0b(3IBQ#M#~dR=@YaO633zM-;tXy{JiNOsc`=S=K9;Ezd4n9aU-S z*kr~xKaIQ3w&P60fDQwNU3EUsesB)$;6;JGe z%~iV7w#@IBoK@GuxZKY|G`-8R=-jlMewJBLRJm3(N1{&)u&`_iq!Aa+$%(pY!Ljt= z9X!aQxhwiz(cV~>xwU7ko=%L8;?Jepv`A;+B8!3-1yqFF%9<0R*-o!|+XT~XYA zrJ;GxC)|Ff=<#zpaz9|2+g4+@ z=WgK+uP3LpH%N!wiDi1Q-77L;N#p$;O-(%=?QJv1YqHJIG3(oRUgX>@N88fuuQks3 z0&b)G^O&O7D&JohHD=6=T{gvuD1Yaod5HO$LC^BABV|f-wJB;Ixkqm6Zp>KbFpXh> zSRu!uf{TnyATT{Bka&iyVpQ2OuSwj>uKkE=nov@bYrS2`|+r$k* zGW5}FcfYMqz5ArKb;Y5+l9D%(AMWmrExMXce!WNe)cidgT6yIn-_FfyPzh^?wc z&xvZ5;?%! z@%)9+)QK$P&OJGQUx*{ZJ~sOBwMR;C!rX&jv+RkQz;ZkK`JM8n3VQQeA&xY@mQXfR z&c_18x0U8`B}blL9J^8c$TG#n56#8k4O6`BaY#Go6r{QVk}&!qM*QYj&!j3#H~u-_}!Uhhu1oYB#JoC zJ>e^n8@PXrdG9?&Gde5zx^$13CFwR(^6j>M=)9a;Bfi~qf502HThEqC=}$fBbaHQx zpiA?M$|vVN9^BJBb!?a-A#qMdW$%8z?bbOB+g`2}ILd8ne{8;qv9{fEr{%k0QfaqK zWJpr`stwwLTrj>WL-;;{=4UeC^*=s7!R97@h`EXcG>2fMD-u#-X zIupHJB3g%~gG{@sDgqrHySsxMO3$ulUU$2jxkhBAsrTAcrIMa|Z7!QnDKfj*s4cUZ zRxC44^@x(5@Vz)AWU({!{@StgSfV#APB^2%xG*7fquz0s{N=q5@1660`czR%)^m5g zndf!|z8Y?Bt4K0)dcR!dyr`Lumic#K*fK&eHu}u*zMHBYwXOayZpPjZYL8%_o3m|2 z0jqB_2mE4^NuL`B9V;Te6T`JTT+W1IqeYIVnc3Vm?N-#CWve>rdWtq;&cJVR(cCQK zE^~xk?G#?;s2cMye%zXy2J{Y#Hy&gmk?2IkW8abQEA~8s~=KhPx5?1RjC$v58G3&4Tkd$tck|~*zlWB8UvT(6@GLO|dr{tt}91X$s58C~o zuD<&~QK{W0@sx;~k4h|2`b0~}6qlf|P?wXFCLUc|elDn??^%;yev_2F663RttAo}H zJ`%LGg<{fi&!ci%(c5-ovZCMf+N_$Zy44CN<=?p7brvq` z>s#yX9a&br>ewsotSiRKCbypF)wl-)q}uMtYM#Y*+FP;V@T=Xmxf!Xqj~NutTps>D z_^iuuFZilQ|6c0at-^XynO7>peVW@${pubcJz2f27Tkh={oV#J)G+0FZsmoJd`h&6A+cU(A2_&sW z(Q(m?yr$JGQQ>q~-mCHylFH+<-Sk=}PFY*v4; zcVI*}bQw!}PV|Mp37LGk`u_g-r5qPFOo(IXm6phg^eH0muyKBwxUGIU`}CuW0v2sA zu#pdMso1red2?iB-;FH|N*}sz9W%Qx%r~D8mIQkIeDAnUkCJoyBptRsxc|UMDeRtN z{sWeK8s@XQ4?KruBcDCq+}%-^+Fx?tq&I)8@d< z@AUW$fuhqR=IohfTTT*mR_l3Lz@O8hv3_SxQ(!CAlJ$3PbT^ZT3EP;_*?#)TvO7bA zMd%XFkY1H;+I}m3rsV!38!joJg|X~q@T$}sv+6b{oe;;PtoY7%v-t`ym2}kDoO)Az z$ux1U3*W6PnXG5UT(70uFKElYcdjXMe3rXJ{zSQT`Ncsk8`Jr1ZL973pGQixDcLul zV%`$jbLUDrx$#~@|AS)t!#DGYA*TeasWo$~M z@v?{rBI_a|yQzHVOBWW7*fG1&LS@-oZgLxGCoh$IIU(6h%RJVMGg+{i_iFlv9;?Tk zA#dzjqpXi0ruZO2lv54JY?kSNrahI}2*&^u0^5|8S+nTJP?(IXg}s^FMy8 z1##TnRevX@u0$o{Sz4Bp#5|RookjE-uEKsN1ZoJn<7bRlbaG)DZ>1#DcOzv_P1(+n zmstfx$M|pUTo2RQ<8!U1PkFQ8++5eq;+<#YbB&P z)QqRP&z>pHW;@a>w{hlV4O{aM!p=0q457}~>DuX~u+kDYtXGJSbiS4)#? z`}?&oUcAWl$)7!5**c|nz4fH|Qyl90M6m&nJ9JvpCb|gl>rFZr>F9;%I!l@V(Ya zfk87Q*Sb{fh5a%^%>~;uGL}GdXiRTg;6^Q}nMMKCB?K zy@9)u7!@}L@T>0p|O6$e_3SJjflDaL%ub6$@GH~kH9F}GD&cZI*hgw_r|@V?xzrSlnu#pz|DjJ^3T2JtayY};0uaZUGictBrS0lB=$f;XRYvEKL+c{nUf6MY za_(e4NBy;T`=8G#OGp;IthwUiy(yQ?NM}>GioLzCN3uNKjf(Z5vgV|Rbm|uyb*`2M zv>NT9p{`hAx_HcETeHJdj=7R&HeU*64r%6m*0pB%*dR18F z9rXUSmtNaIt_=KBo)=4Rf({+4(q7JC&ar6j*trRhJ#LgQ7xa2;);ITcTkB=s*(=FM zIFqAO^MY5cX-I2nn)CYExD`|eMjT>s>V*B`;f>F#>dam{?VZTsN?f#uz9cbM~1wLa(>fA-EYt=fGZB7M|XFH?_^R#Dnzw2}LbX>ggc6rgJrBzkL zkkZX6)*SQnx86P z$g@y}=3T!8ovHTYE!*P9g(O*fmmF|EJO0L#-pcvso0gK}EWIrUE6j-x#KKJn3vDHn z>Gv-Z9AkTY4GYatkJH=z8!k*PEqiu{ssfwr=fU)}HfpKHYdOc4FYu7PtRo{gspY-@S-WDN z4==-S(H<9SFcDT=qpri}~Im*jZfR?o`HK0WDFQ)iI& zE1DTXoIFv{uIH6C&{8{wwl=*Qqt27v(~Q>Q;z|@+cUpX1gdl)?t0zxBC}y5@ z&_F_FmCg}^)!SCxe`_W+PIvvBxs@FrNz56vj>Z;r?`}Qrk6-9g-RUW-=I4FjUP(*W zOuac*T&KPm&vsQ@kd&l4&L^*N=ihu%X92r-5BTHo4eVR*z4m?6e|>SoYMFs~&HY8xzc(t)$;H`Hl0< z#$I}=)(mRTNCuMaqbouuo~Mb@6Q@f|KjFLR(KM;loe7G`CDOMiIHejW>Wx1uCbmmg zPWN8Rld2kyOC6RL2hY$SVrdBs*qysn;$i2sd*N@RjU>jIJ-WR@I&;nHNviZtZPlR< zOqA92`MPfTK5A`k_6zVx2r$r~XPYj`<(Smrb#cc`C;u0xcMw9}95MDa9Sfe^e zHhq)l``wMXx5u4HiI_ph6?^H7kVf7%Dg7OS_9ZX-5>sC28K#)-qH~(3W4g%PG3Ov- zM&fRdWp~26+m6RIU%M$|y+o^4)GpYL>ZBO$G*z_aMRJZt`-x29M*e0lYL@+ajd8Mi z*3+1-JzUvy)owZ2|AB;>S<1yHV)M7Wn4O6xnFg&tyDs!bej87$W&dkF@7}q^p{Ej< zuaCwCV1*BQx$H%*@D0+|`(J0Z*Aeo4cF?3cXO^NDBK zp&e8w(QM3-5Z>pPwF6efXus7BZJf=LpbG67)jTH{+%MjLn0wQf`+E31vo4XVA$9K0 zw=rK|x6!YyzN08)UZG0E?Xvx=8R*X`YrX57C?k4c^TePhw{Lg|+Ck-5qqgH=!X5S| zDuXwk($ku>Sk&elzKwg7uY2r66Q^J*XdU+@=I3aiHXJ+psOyw4$0^I`zBQJ8ER$9p zBt|^$9WS@By*Kz=53{oMKH8mWC@Nuk8?j(AZk$Mg+u{^Fgy&B;pV47!6@E|mzJ1;M zTdCZl<2CZsHS3Mi-zgrftIaN5)83&PADi9oU;$@uM%~;bUVd)pPKqsqUWXUiDg`~UULa1HZRYQZAK*36yLE)@>5(N>f3HptiB^odV!9*x=YrWOMV?Bn|QzQHD!{UjXEfu#NVl+;f@`jdh zS9|RVFVCZeH@cZMI!?!-i5IJ{Fp%DEIbpJXuW91((rddMc-?5*W^);f&Pt)_oN=;P zmL(&{AZF|74bazHVY+35yHmtda1r*Du(5Hty!zq-e5YWpR}~b`V5!<{cRb_J^42y zxtdXQI4u3Ww(QY4WIIo5{XRMT^WG z^NCa&&CiwW*)dg^Mo1%PTaNl2=^0CQPBq-6?3Z0AJty*c#iPql4bv2r!?Med(dE$x zs4lBWEtHbO6ImPt**IdiXsXOIc6L$KoHX6vv!35wKsm^zzkFqPP{Y!?qOO;Bk38i& z5GX$XeyXgWiGKQrO{wEIykPfVc>KyGTG8BuJ)RX@ab_`F^A62BV38PH8u9FH-t2(J zi}zi**7JK+$u@}!ui~XsJALkCJlzS$*UtuKSgFE1zUWtEa2@5 zT(&RbRok{>Z{FQ`(|ynCWMS!{8}6JJ1hbDyWV4kgcc&=`aVRo$C%x`yv)!1fIQP+H z_3I`acdZ?wM+9x+Ll~P zj<`M#Q>}~B`8Ci4r%Prsvr_09^<$h2%=@%2eo);i$$IF_^Q*7Y?9U6tj;~P)XEs-> zAj!RCb=$>s^_>wL+H`SlrU(yE4UThKnl`L#+7Q&`-Oam@LpalFvzl@P6`oaf4Qhhur1^w*W9DXQ zNsE)y9ybQet5S}rBMEhMUEGpf(8E4161L2Aty)>bR5*2_8Arp?X`--(bXczT4R6&9 zb&{&kyJHuZchETFNk`qvg|}KZ#n<<&P)ANqGqQvmcj_I<+vvg~1|#s=>MXYir*%pB zCvQbaizKYS8hp>b!jgpIEIE!Yh?a2F3$xUJc6Uy#^(i8Y#LAtKV>;$&?W)R<&bSgb z!JN<%s5M4HU9WpmWW@>&ntGms`rxaVUr&SgzICFePj@CH_$BWfcl4}K+?Afol9M^= z2*tf71AW>4lQVAQ&Z=LwU?#cNqd?Ry#kfMNf@h=ixEb8*{iz-7i-Qj>rlu!M&^UT> zbAACnrWNG*TOHUg%P13Vnp&wdF_b{92enqE@xhk9C-#B+y*v&F`}Hg}qE3I8;&H); z>cOe?t*kWyuVlPSQx?6ww{o|1!do>H4h0>{nvE8@#|o=M4;4FJ**;;_WmpcxEt6#{ zV|Ma+HRIq*Fqos>Xg*G>Zg!2Q-2Jw|WYKD?O$q9IZqyzk#!4hfUO1$=jQ_$ilic}t z|f#3Bga>0R>j4SW-li-p;btB${)>_{lHzm<=w)XD+$d;%~x=gr$wj+|nk~BTctC zZvv-~v>pYp3ffqiGu56}lun3FVkwW`w`BW1gA|f*;}oL>9193ZswrmCyI&?l5sj(H zl}QK=@`!%V`1Ni`r2&ULK;pZ7}MK`Gc)Iz4-iZH>%M^1yowc>%K*2Un=t|6y>K$yCj^E^yQ)&rU;d%+oT^%vX1a#@D}( z|0g-ny0;v~$H63g#9>r6m?oBi6CFYk!U!=TJySi?vj~je93(m}G~>)?YjMWU*Z7M2 zOCutanLpW#bUoxC6S=|VZd&x|JalL1Ob@~9fFTghILZy2kcOd~f8tCJNy;N2R5%8q z+Z688=@C)~`(Himcn~7~Kp^Xx5Q4e#NSp!E3?3hiMMxXW2@oGh+BZi(7ee3^t%CFm zd~^3(i%f8b^XCMdvA-WZx*!r`M}=me$8SaQb+`B_qNnT4ZM1oFliuD9a)4vL5G1xmnIE&!?ZOmyG zKQ>@Av$Up#czo>>$HNbKpn2f`>lEX(nVa^Q(t?}mP@-laStwC*Xx3LxcY%0$!;?)R zr*Y2H4&=B$oTnoNw9ziscrX`a5HES79oIr^|7AW5g`f#OeIbO!kUvWXO5x|Qikw-^ z2E&;S;XJYZ9A+29aQN^vAPmoe-1VY}6}QQt-;sQofUh75_xf=oxip2i`atgZ0^i11 z!Jx`i-cWpPp(_KK!$84+Yhl)asoPn|PzEuOYtu3l6$}RRg0fWj!}EVWFR|~@%10d5 zkL4lu@%{W8OyOUVcR>Tv@EVBqU|IaK7Mp#n-3kVpsN0!=EM%x_=8`yA!x+fC3ndLC z0=ScUOleFuZKj1%fMx3i<#o!ZYniXg+G0rYa8JT=7hk)?7l$o@LPPPjkl}ct@j{aZ zLikeRxCDia80!U&wSj}-?DE9dUxuSOQ2MYw@r1beLwvD5`MNe^{S)Fi!Gn%`&>5e3 z4XYt0r>d}A&G{J1FaJyQbJ)!_>0z17<94lKr1H;5}#{Snuz0ppAJ2NM101jczS>u!tK%%+d+L66DW)H<7Ogm6KRvdJ6)zj zcV@vIdALKAhF(B~Z#1pjGtZd7X)ajOe#ZD3x8=C~AClUS$6X!bj#D($uHqEo)PLK$ zeoiZP|7EK=cn`~ND1Sb;jDz=v+Q48G3^mRVG{T_Eky|h959^I_`A>H~$7AykJ{|j|m_P3<}VoA%v8wKu_;ePXv*Xz;kmHpP>UVpK)Kfl}It1tWUGoTkg3wrTC zUJA56*3!}FvElcfk$Y?|(8vC=FZ}H&2yO!hd%Pp{#|L}3Lw7&-d}oYme|%`nV5o15 z$JT~Y_T@+brHdhrNBNfj<$YXBhI-j}gcD1$-hy$V1i~h)wW<6STrWF&uD{~wx=hc2 z$qdFk46%#m#J!HIVLU|JFwlsa_tNZ_0atKuLD>Xm`kN|3c z2A~D#fH43)Fcx3{7y%}L8DIfe0XBdg-~c!QE`S^00mcEm03W~)j0Xe&K|lzY00;vj zfG98#5Cg;k31AW+2}}m208;@eU>YC|Ob29u8GtM>6OaRD0rJ3XKmkw$lmKNw1(*Y< z0&0LdpaEzCT7Wh%7tjIb0lI)5pbyLkEC55m2rvdr08_vWFb5U@mOww5OkN0QE5I7C z`Dh2$|1$?3%^4h#7;VjgM?@JB{*TAt=*UA?yoOkFXgXapl3geb<5AnK=No!O;*lYI zo*pnXT8hUw@Q7$k;FK^teuVuWG2U*?Kpq-djR_n>{uzCt`B6)bMr)$^sWtgJ-h(<7 z|AvO!iWvicpY|E^y-e?Mo$9Du1PJOD2s00;rXfG8jaNB~m+DL@*K2h;&gKpzMM zHUnFM3?K){0}ca6fl{CXxC&ecYJqz|9qbVzjm0KPkBCfy1++0d=PCd^1K z$HKiKpToJKy#H;;gR%JbX`gLqASMtEG;|&}la2t7{5sM$bcFA_0KYg@-}+ra;rBZ( zzKt0Y#`*pMKrjoA2+#m@00Y1TumM~E4-rj;=)6@do#ADtWSuE2=QC$=4fMS3=tcvq05FK z>5Je*hp+L)7q)+oi{YO=yzP(0=;vKi`ux#rT%wU6mO%`#4%iHA2hxBHU^lQ2$OH0$ zgTPS$&zL+3R0FlZJ>W6$1b7K_03+gh3osI8yPux%V>E4%AeMn7 zAOpw(@_-Tm8{8uuzyvS@EC2_<5pV}Qfp8!Sz%x|W0Na6`KpL}-*P(u2PLwVv zuZNe^_g#GUCx~;wNS7M)-+z@r{cz@py`P-8Ib2eX>s{y-oQ4#WUkf$hLfAOqM9R037Nb>JRQ4?F>$0ndSVUG2}B z9@N~dI)D1)v4Wh;^lcm0#YKk)dO6#g>5WqD|2qAYIsa#_e^!3O`y1Z&?~e!N6VZ4q zi+128&aEry~sHk)bXD8S6q&aQ^sy zuLq3)elPu;hM$$l-|g?8i}A0Ncf^L}<^}iwzJNav4nzPifllB9&=1JN=bH+E5}*R; z0{XxLzzT2y+yGy|A4mo^16zUZKqXKO+ym->dH{dANd!m$4L}Fb16%+Pzz@88-GQDp zJwo;9{@oh*R`UkBiY{NeP+nGY3Y{oCdidbJ%AMDz;pjpNg2)^g+BbK3wavJb?tDv+i2yp^S~oee6xtWGO4&2-hRa`d7-yulSw(IbXkN zgTAiu|6gN|7_lrffovcL$Op~<=Yfkr6>txz2Oa{C0R-dk?T;>(9>_>o?rA?yY4SHR z|98vfpD!7IR}A1MT973TKnE}ZJb(Zo3Wxy`fFz&|=l~7?uKRm7NBP+rDNOxF^q(w7 zt}~;Py8oq6WJhf4pt&Dv?!HzkztlpGPU;Z@mZu}&4+H``fec_bkPYMm2Z0m7N#G37 zQg^;6ZLP1fq58~ktNwuehiijJE)OH$8J$#ubdZl5M2!3cDj!Q{1Ybh}{kd@e>eT*7 zo*@P-&kCRts0QkQhrkn{9e53N0}Sk-7XVQ}444AEc~(<-G;4FbpNqMU%*4MsUBBBD zm@PM=o*62WBTHepekWqWa#R3R0d+tZumJplbwDz(3D^qc0SAG@z+n5oKHAgXKF|w@xtu5%kLCPcNI%2@`WC7R!4nP`^0dxUBcC~z7$4^#rzfm)y*cwAF{G%I!E zssJ|=Em?6~3`WkOe|J3@u0K1R-N@-5`OfG_{pb3khzZN_Amz2?w=HHbEh!M*&9Ebp-fz7~nU?-3P=$^PR=LLF--@f_{XaNEI%h}-1ZwP*f`)1^e;yz)x`y-dwk?)L7 z+4;G46tvmDviFM^usqX%9N-{u6gUZ-0WJcSz(b%DcniD-@WQ^I-vLd2O8<|Jw0^fD zzcwZWycydZz!9H z5z8_G*b3|f(tzDSDS%gKJ`Yp@)j%E42z;*lqdNXGf~>#u3(5$-zCRv1Y8vQY90SCF z<@p$R0z3nr19+Ki5}sVsOYCFM|KCvJN3O4CBq0CQwM*8h=C z|I0b>&&%LfV(`89sPElJj98YBf#<+mpdTQPgRww>1CRmq0VBW!umIeFq4B>F=l}eR zTg6|I$d72>f4*KIMl4G&zz6ULqJdRF9Iyt+2J(S}Kp}7%pd9-fsm_1T9`g8KTtY@o z%Kva4AO>K0^$!$-f4-dmFUMeX%F@q` zTOkH4PkMj}-~spn0YDf~05ky|Ko>9qEPx^1?`SMH>Dzifa$f&j|LObM_~*hMIiBBt z;>dnSN1A_E3=jjB=K{b1a0I*nA0QBj2I7D0cwFdpdM%hIv)+r|8g|{?yLWI`hPzX*S|(X zk4_9mCzPM-!+{R`>G}fWzgV6?H}Dqt0MPJ5pAcXGSO5t?29N{ffzRLmXwLYy|2Le? z_x1GeJ{~ z{rUeC{jg!@8+`BnaC7~Jvm03!Bi|V{-7&)N4uACf8Dhe6%mDTQ*+4099jFFsfqI}7 z=mfff4*=bGN*yrT^Z!OCKfbSV{%VQ*8)ASMu`F2t4uBVs1>^w*Km{-XEPw@o4d4!V z0hD8azvur^u3z!>WT%nK**{-G5F?hQ58w|Z0h@uXKpKz@312nLWHXFbN@Bjk9 zns{y;FW21o*ufz3cBkPZCq|9!Ef(I32Ija>VFMJJ3-9YKs( zmN`H^PzhWIZUVJHBk&Ap2VMf5z-!=l|8HcOj*eXZu9ATmuspkget<;?-T?t2U!V?gUv0a7)xVsEt`KNvBCMQ_SC}LYeTjtS1YaBJ z=@7pWm%R>wghuc;Am2aoCxxH)`HQFTy8qed{LxBoe{^qTZH2~SnFa#EKr|2oJO-Ws zL}8fo1IPjLfCBKU=|XO5;&Kn$xqq(L|G9X4B~>(Btr7?df7JW=>RH3q z(7)3E2ofGh^B)v41@y_ zKug1&5_Iy!5rhg*-e+O|=dV7m^NF*9&I_6cf8f&!pRj}7P!E4lOF`BSt~NSSd57N{ zzENAl+5JczLd=K`+IRr(=Y;og!h1B~J(-5~1;Tp*;r)P^01lvsQnHi_&m~(r|&&P)=$1e{f9$18Sm#c`gJ<%b&SMBzQA-awCBIAHSj<^1Dcs zKqX2*W3f!R0KBgg-p>i|-(&$Sq|8}UO2d3g!(2*(8l~Y+U;mjjQ@TNW2QrL%D9;ou z#v<8j8brWbSq@wfsXPZS@P?KHHgsS^UCl#+OdAgNYH1u@5*ERqJaftsIJ&_-U9}A& zZ6X`eRM73`od=!h(LD&8H<5X(VO>^4riAZXEBYWzp~;Qx#Kv8?g_Z2W*E zfcF4X0Djm1|Azdrtd#(~#~a?;4e#p~0sNN#e?$IQ)=|Jt0PojV44ejj%m2S2e=KXf z*B{>F5AW@V_wi!^e#`&AA%84uyl*4kt5E^KdjV<#zvchmkUy3+-un^n_lWm-#CtsY z0Ket`-;h6+HQv*6JAn7?#CvvL1%Au_zaf7t>+1mCm-Qup_xof3e#`&AA%84uytgaf z(-rUKY5^<&e#`&AA%84uyiYIQ2Nv)DiuZj@0DjB=zaf7tYrM}d-rE=N>5KRCJqY}k z|9?aNSk`#|X1r%J-m4k!(@YQimj8c4{#e#{Uv9h)G~WLi@B17M{FeWJL;hIS5dhxb z8}I8~3Y-Rh%m2S2e=KXfXFJ{p9Pa^+_x+{=e#`&AA%84uyw5w{;~nqsj`w!A0e;K> zzaf7tYdgRJa0Kvv@OUryFXV5AXG07fdP5iZtU+mzqcjY64gJf(nQP23;bZLp)|gC! z1AxAomj;ti7KtJ%Q6w*lW{Dyl*kYPgw+iHT+*M(})hs7w-Xs*8#_C zfa5hF@%oQ=4IsS!&uvNpeNktj4t+k-KVQQ8Bc&mT(qKVp_~GkONbjezCGxRo;d=R% zOh&CNeHHGgm(@`SpBBp)ukVD{0Knh><8Q$n0Q~J2{w4^24>a`c&jU({eWAKL1A1df=|Ziy&;+}$tg#(#8_)>uN2lGO=($Yz z^+Gqwq0ti%-3|To7&5fk%o)t0FYn;?>|=4JA;K-G0hc%wN_XUe17|RNLr7vr zY~YGSV8%)K7%~Y5GyrrB(GbuDL0I~*h-k6LYUcqp4P9_5Dp9KGqA+5OG;}!!KJ&$&_~Nfg zNBXeW0ufXRh=`!~@hMCaqIKK4RR~RoM~H(qVsla@5|FhhTA+!b187FD5k(8(k|R@> zF!)xWDu!dAp*sb>Azq=UGX>t85pf_~J9sr3Ql3NM$_#`%^wRMuT+-)oNuR=n9w&s0 zKUt=N&xlFz$ubpw2IK+NK=_as&@&r6hQgmQ5I)t%-pe0{PlRqi4j+eUhe)5|{B@YJ z17VUNOn-P$`V=P5=Qs<0iZj(focX_r^H7-ZMHy04?IiDl^XG#G)uv@89`jI+v9vZd z#P$YgiE0=52%OPiLjiUqd zK|(NW;f59=U${Gb&PyTzoJ$1Bp#b4bLLrXNJXbqgT4T-10woa-P{0@S$PV1H5g@Xk z4w``!NFd|LyP=c7Rt&LzbZ;$6V9#_yHlhR$I5EdSDFT=PTYw+rgv&Ad=1WibKpokj z?W#wR2*Ku4Irbq^!84TH5-ky$1v$lre&SO$$RRcyb7(H`SDz6u_#y#arEEYQvh+EC zX9wV4i0~*e9wFj~dejOeu!2AE>;Rkrrm(}Wi2&YJ9`7uUcbCRH4C7s9@lK=oO#|;Z zh+s5D zc=am0f)QTD2Crm-SF>0k1hZHt41TSSzfi_$gD4@03W8{$k5L$?Qt&tgk3kSTpvRGduC@K0Lz<&+@@DJ@Bvn_!nRNs~`U52ao>a5nwzDh)06(XaIgA#BT-o%W#~3 z_!CbZU>=|g=mGk`e82#})z}Cy2221`zzi@4EC5Sj0k9CT0;~ZWz!tCr>;VS=k1`D$ zb0AW1KoSQ&h(&WrNd&k}q@kiFQ4^_1WGVE}IvAbC>Ba|{fb)t>HbYC$Qsj*MKy(Ih z4uZ1@@&>y_$P3&}g>Y6urKUkt1bpCDAEEUUL%kvVVI)2h2UOE6(SfHjQxl0q5)~0Y z^>LW!7f%(!t~DTZPk6E;sFNjNo&o+qb&RDUfk*H`KF$(B^iaI05zbrq*qvoilmj=x4R$r?5~|i< z_Ji`NL@rR#CP4*~g36!>h2It}N7?8&x^A*rjn+X9wR+g zno*irnpK)pnp>JcCX#8%W5^6-CNeLXk1R-5CaaQd$hKrV@UXyAnrUu z{6cin^wJE{OwugU9MW9UbPzv9vNib;x%ro4MMs-KeH86PgcWR9&-`V_KqbVXpZ?G{ zB)MT8hU-6?^peaBG6vn1{ZY2VxE!z&$2-hIWy7lR%YzU_7*NokOa7o4yBe}P2NA(F z700a^-}rb;hyXWJ#v*+mMzn)-3R*i!8m$VQfpi7rk%FZnve8gSKGMeMzN{(QNo$GH ze67)XMtgK+q61|plI$|B&z)qwRkNcB$_%9!W5PfwvN*#78B7!&u? zOk$6rt@PVUi!24{$TpMc&e59CJ$G}U+n^Lpw@kKzZtLVrbeYqu>Gtx8jX6w|8z=)0I?M0|~0EM+J7UUeruwRd(uUUCKO(ZMCsHyNrMd z`+CmB>?Mnx*^gM=X5S|HhJ7W67>5@+&Y{dSku!MQL{4UD56(rQTRF{^N^un_yKvnN zKgM-n4iz_9k&Sz`(lTyZx;XCnluzaMpWMT}nTeanft{Pj%}$qx)?hhL`ot|f z!>_?VZ>s&0D>|QE3QU9G_(h@2mPZeq*Mw78ZYSywsYqbJ|BCXd5_0Hg% z&}yzcVR4At1XqUp6W*FH6)vz_A?$1WT=;z`zXK>RKmV9JOYLL~GsgKBT2v^hPT#;Jwz1N+a!E#{Jq(`gXb&hBtKM<%IS2 zIn358o>i|OFT`nZhttpCbkSdfFhxVd8}Z(T*H|hHkC-$V{$;pisHUi9lwp6#$hq`} z(f-grW8}oYvL|i>1H-t-^^*VuFhF%?W=Lz`ZWuSjh;cGO|?#@&C19U8zt9T zo5vY9Y!=qNuu%wTwbkbFw5zLMV5ele!tQ^>8M_M+ckDK#3EB5>INSF*``8OxdphRH zZ+D!QE$qaQKi%mW`yQuRmD8Q&{AW5}_uuUNAbztmKf?~^yP2n*y(?K=I)bHLH1waj zRM&oX$&ajrno<~QLoTrK7R?k8a2Cv{sX|HMpHLo>BF zxqBxTO!qePnD5GFI1JJWUq94h1tT;x#^sH@NuC?B^pu&aDUU}NREKtDalAgMUdpw*mdL7TLj zf{wAx3u5M)A7mR57hJ-o6O!VS5b{p1Bjk^dV%Q1i8SaJd4oT`1F)J@h`I;#;+{;8}E`Vl3*aIoDk)roUo*FZi1EW z!h~$M^9dSaI}=SajwWh(+)R|p6G%Fj>YbEhv^dE@duh@KnRiKk9y-Y@-BXg!SWQme zWx6(bq4JJoDYui!({)}X>({+YJ})4) zCGC!sX?kkfmGq9Rw9J38D>5HS`DXoa49)gY56_OWEy~U>?#uqcrJj4a+C2A!#rxa` znH_mK^*{4&`v1?{^qD_D$N0Ju^=17!{N?VYcIAs@ zE6W`#7MHJ8+Ebp*bFW-4ptRx|+rEmF>YU1MgWAeDLfXM_@)Ro7G)+?mQ*Y~IHs=qIMwcg;txBd1i`Tzge%==&R;19T;0qswNTT!4H z8Ghi1cLTTzWBUN?&@nIp8`4Z58i--76A)XUf$>8GkWOM?|DXb-+1O^Z$7y)k)>-Ip zdjCv%$Ma{H-57-0j?K=yX1`;WFaK}0v#7qYk@G+(jRX~FU7&tzF8uMTW09!Zw z49p)uy&B+5(FYA6&B(y{0oYo?089*AV11z804q=yq+Sb13qi$!M>>Khl8hO+KY%*H z`+*&ELC|mkuMRgzLVMF7H89tL#Qp=l z!~)cx3?A&r1(JCTDZpWg5+Gio^H0fn!TmV16W!?++Zo2?UNoA7oAtP;V4aUnp2z g7ErtrsLmZ|b|$bx9|#=FvSs-10Cego7{nm}0B+h+)Bpeg literal 0 HcmV?d00001 diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 238ff5f..f84f507 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.zhehekeji + com.leaper common 1.0.0 diff --git a/modules/common/src/main/java/com/zhehekeji/common/CommonConfigure.java b/modules/common/src/main/java/com/leaper/common/CommonConfigure.java similarity index 75% rename from modules/common/src/main/java/com/zhehekeji/common/CommonConfigure.java rename to modules/common/src/main/java/com/leaper/common/CommonConfigure.java index 874114d..7306cde 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/CommonConfigure.java +++ b/modules/common/src/main/java/com/leaper/common/CommonConfigure.java @@ -1,8 +1,8 @@ -package com.zhehekeji.common; +package com.leaper.common; -import com.zhehekeji.common.properities.Md5Properity; -import com.zhehekeji.common.properities.RedisProperity; -import com.zhehekeji.common.util.MD5Util; +import com.leaper.common.properities.Md5Properity; +import com.leaper.common.properities.RedisProperity; +import com.leaper.common.util.MD5Util; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/modules/common/src/main/java/com/zhehekeji/common/constant/CommonConstant.java b/modules/common/src/main/java/com/leaper/common/constant/CommonConstant.java similarity index 96% rename from modules/common/src/main/java/com/zhehekeji/common/constant/CommonConstant.java rename to modules/common/src/main/java/com/leaper/common/constant/CommonConstant.java index b981f78..9ad5c6f 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/constant/CommonConstant.java +++ b/modules/common/src/main/java/com/leaper/common/constant/CommonConstant.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.constant; +package com.leaper.common.constant; public abstract class CommonConstant { diff --git a/modules/common/src/main/java/com/zhehekeji/common/properities/Md5Properity.java b/modules/common/src/main/java/com/leaper/common/properities/Md5Properity.java similarity index 89% rename from modules/common/src/main/java/com/zhehekeji/common/properities/Md5Properity.java rename to modules/common/src/main/java/com/leaper/common/properities/Md5Properity.java index 2990e0e..6782426 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/properities/Md5Properity.java +++ b/modules/common/src/main/java/com/leaper/common/properities/Md5Properity.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.properities; +package com.leaper.common.properities; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/modules/common/src/main/java/com/zhehekeji/common/properities/Properity.java b/modules/common/src/main/java/com/leaper/common/properities/Properity.java similarity index 86% rename from modules/common/src/main/java/com/zhehekeji/common/properities/Properity.java rename to modules/common/src/main/java/com/leaper/common/properities/Properity.java index ca5ceef..2614961 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/properities/Properity.java +++ b/modules/common/src/main/java/com/leaper/common/properities/Properity.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.properities; +package com.leaper.common.properities; import lombok.Getter; import lombok.Setter; diff --git a/modules/common/src/main/java/com/zhehekeji/common/properities/RedisProperity.java b/modules/common/src/main/java/com/leaper/common/properities/RedisProperity.java similarity index 85% rename from modules/common/src/main/java/com/zhehekeji/common/properities/RedisProperity.java rename to modules/common/src/main/java/com/leaper/common/properities/RedisProperity.java index 40d9edf..b0ff6f8 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/properities/RedisProperity.java +++ b/modules/common/src/main/java/com/leaper/common/properities/RedisProperity.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.properities; +package com.leaper.common.properities; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/FileUtil.java b/modules/common/src/main/java/com/leaper/common/util/FileUtil.java similarity index 97% rename from modules/common/src/main/java/com/zhehekeji/common/util/FileUtil.java rename to modules/common/src/main/java/com/leaper/common/util/FileUtil.java index c56f19d..ae7f965 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/FileUtil.java +++ b/modules/common/src/main/java/com/leaper/common/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/HttpUtil.java b/modules/common/src/main/java/com/leaper/common/util/HttpUtil.java similarity index 99% rename from modules/common/src/main/java/com/zhehekeji/common/util/HttpUtil.java rename to modules/common/src/main/java/com/leaper/common/util/HttpUtil.java index 2211fc8..8e392fa 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/HttpUtil.java +++ b/modules/common/src/main/java/com/leaper/common/util/HttpUtil.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; import com.zhehekeji.core.util.Assert; import lombok.extern.slf4j.Slf4j; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/MD5Util.java b/modules/common/src/main/java/com/leaper/common/util/MD5Util.java similarity index 93% rename from modules/common/src/main/java/com/zhehekeji/common/util/MD5Util.java rename to modules/common/src/main/java/com/leaper/common/util/MD5Util.java index e650e15..9264cda 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/MD5Util.java +++ b/modules/common/src/main/java/com/leaper/common/util/MD5Util.java @@ -1,6 +1,6 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; -import com.zhehekeji.common.properities.Md5Properity; +import com.leaper.common.properities.Md5Properity; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/PathUtil.java b/modules/common/src/main/java/com/leaper/common/util/PathUtil.java similarity index 98% rename from modules/common/src/main/java/com/zhehekeji/common/util/PathUtil.java rename to modules/common/src/main/java/com/leaper/common/util/PathUtil.java index cb36cc2..4c10afa 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/PathUtil.java +++ b/modules/common/src/main/java/com/leaper/common/util/PathUtil.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/QrUtil.java b/modules/common/src/main/java/com/leaper/common/util/QrUtil.java similarity index 98% rename from modules/common/src/main/java/com/zhehekeji/common/util/QrUtil.java rename to modules/common/src/main/java/com/leaper/common/util/QrUtil.java index 1ca4bf7..d170c06 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/QrUtil.java +++ b/modules/common/src/main/java/com/leaper/common/util/QrUtil.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/SpringContextUtil.java b/modules/common/src/main/java/com/leaper/common/util/SpringContextUtil.java similarity index 96% rename from modules/common/src/main/java/com/zhehekeji/common/util/SpringContextUtil.java rename to modules/common/src/main/java/com/leaper/common/util/SpringContextUtil.java index 28cece2..ca3e4ca 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/SpringContextUtil.java +++ b/modules/common/src/main/java/com/leaper/common/util/SpringContextUtil.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/Tools.java b/modules/common/src/main/java/com/leaper/common/util/Tools.java similarity index 96% rename from modules/common/src/main/java/com/zhehekeji/common/util/Tools.java rename to modules/common/src/main/java/com/leaper/common/util/Tools.java index ec03c77..9e0f1eb 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/Tools.java +++ b/modules/common/src/main/java/com/leaper/common/util/Tools.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; import java.util.List; import java.util.Map; diff --git a/modules/common/src/main/java/com/zhehekeji/common/util/ValidatorUtil.java b/modules/common/src/main/java/com/leaper/common/util/ValidatorUtil.java similarity index 96% rename from modules/common/src/main/java/com/zhehekeji/common/util/ValidatorUtil.java rename to modules/common/src/main/java/com/leaper/common/util/ValidatorUtil.java index 8a56117..861c31d 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/util/ValidatorUtil.java +++ b/modules/common/src/main/java/com/leaper/common/util/ValidatorUtil.java @@ -1,4 +1,4 @@ -package com.zhehekeji.common.util; +package com.leaper.common.util; import com.zhehekeji.core.util.Assert; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml index 7899c38..75de4cf 100644 --- a/modules/filter/pom.xml +++ b/modules/filter/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> modules - com.zhehekeji + com.leaper 1.0.0 4.0.0 - com.zhehekeji + com.leaper 1.0.0 filter @@ -65,7 +65,7 @@ - com.zhehekeji + com.leaper common 1.0.0 compile diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/FilterConstance.java b/modules/filter/src/main/java/com/leaper/filter/FilterConstance.java similarity index 85% rename from modules/filter/src/main/java/com/zhehekeji/filter/FilterConstance.java rename to modules/filter/src/main/java/com/leaper/filter/FilterConstance.java index 5e2d1ba..949722c 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/FilterConstance.java +++ b/modules/filter/src/main/java/com/leaper/filter/FilterConstance.java @@ -1,4 +1,4 @@ -package com.zhehekeji.filter; +package com.leaper.filter; public interface FilterConstance { diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java b/modules/filter/src/main/java/com/leaper/filter/aspect/SessionAspect.java similarity index 78% rename from modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java rename to modules/filter/src/main/java/com/leaper/filter/aspect/SessionAspect.java index 0ee91b7..6532654 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java +++ b/modules/filter/src/main/java/com/leaper/filter/aspect/SessionAspect.java @@ -1,22 +1,19 @@ -package com.zhehekeji.filter.aspect; +package com.leaper.filter.aspect; import com.alibaba.fastjson.JSONObject; -import com.zhehekeji.common.util.HttpUtil; +import com.leaper.common.util.HttpUtil; +import com.leaper.filter.FilterConstance; import com.zhehekeji.core.pojo.HttpStatus; import com.zhehekeji.core.pojo.Result; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.filter.FilterConstance; -import com.zhehekeji.filter.pojo.CurrentUser; -import com.zhehekeji.filter.pojo.SessionHandler; -import com.zhehekeji.filter.pojo.UserType; -import com.zhehekeji.filter.util.CurrentUserUtil; -import com.zhehekeji.filter.util.JwtUtil; +import com.leaper.filter.pojo.CurrentUser; +import com.leaper.filter.pojo.SessionHandler; +import com.leaper.filter.util.CurrentUserUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -39,12 +36,12 @@ public class SessionAspect { private String userUrl; /** - * zhehekeji..*.controller - * 匹配zhehekeji 到controller多级目录 + * leaper..*.controller + * leaper 到controller多级目录 * * @param sessionHandler */ - @Before("execution(public * com.zhehekeji..*.controller.*.*(..))&&@annotation(sessionHandler)") + @Before("execution(public * com.leaper..*.controller.*.*(..))&&@annotation(sessionHandler)") public void handler(SessionHandler sessionHandler){ if(!enable){ return; diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/pojo/CurrentUser.java b/modules/filter/src/main/java/com/leaper/filter/pojo/CurrentUser.java similarity index 94% rename from modules/filter/src/main/java/com/zhehekeji/filter/pojo/CurrentUser.java rename to modules/filter/src/main/java/com/leaper/filter/pojo/CurrentUser.java index fcc379e..815223a 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/pojo/CurrentUser.java +++ b/modules/filter/src/main/java/com/leaper/filter/pojo/CurrentUser.java @@ -1,4 +1,4 @@ -package com.zhehekeji.filter.pojo; +package com.leaper.filter.pojo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/pojo/SessionHandler.java b/modules/filter/src/main/java/com/leaper/filter/pojo/SessionHandler.java similarity index 93% rename from modules/filter/src/main/java/com/zhehekeji/filter/pojo/SessionHandler.java rename to modules/filter/src/main/java/com/leaper/filter/pojo/SessionHandler.java index 3d07997..e562e44 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/pojo/SessionHandler.java +++ b/modules/filter/src/main/java/com/leaper/filter/pojo/SessionHandler.java @@ -1,4 +1,4 @@ -package com.zhehekeji.filter.pojo; +package com.leaper.filter.pojo; import java.lang.annotation.*; diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/pojo/UserType.java b/modules/filter/src/main/java/com/leaper/filter/pojo/UserType.java similarity index 86% rename from modules/filter/src/main/java/com/zhehekeji/filter/pojo/UserType.java rename to modules/filter/src/main/java/com/leaper/filter/pojo/UserType.java index 4f863f9..eeb790a 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/pojo/UserType.java +++ b/modules/filter/src/main/java/com/leaper/filter/pojo/UserType.java @@ -1,4 +1,4 @@ -package com.zhehekeji.filter.pojo; +package com.leaper.filter.pojo; /** * @Description 用户分类 diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/util/CurrentUserUtil.java b/modules/filter/src/main/java/com/leaper/filter/util/CurrentUserUtil.java similarity index 87% rename from modules/filter/src/main/java/com/zhehekeji/filter/util/CurrentUserUtil.java rename to modules/filter/src/main/java/com/leaper/filter/util/CurrentUserUtil.java index eedf95c..af3aa06 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/util/CurrentUserUtil.java +++ b/modules/filter/src/main/java/com/leaper/filter/util/CurrentUserUtil.java @@ -1,6 +1,6 @@ -package com.zhehekeji.filter.util; +package com.leaper.filter.util; -import com.zhehekeji.filter.pojo.CurrentUser; +import com.leaper.filter.pojo.CurrentUser; /** * @Description 当前操作人线程 diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/util/JwtUtil.java b/modules/filter/src/main/java/com/leaper/filter/util/JwtUtil.java similarity index 94% rename from modules/filter/src/main/java/com/zhehekeji/filter/util/JwtUtil.java rename to modules/filter/src/main/java/com/leaper/filter/util/JwtUtil.java index c744b85..f4676fb 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/util/JwtUtil.java +++ b/modules/filter/src/main/java/com/leaper/filter/util/JwtUtil.java @@ -1,8 +1,8 @@ -package com.zhehekeji.filter.util; +package com.leaper.filter.util; import com.alibaba.fastjson.JSONObject; -import com.zhehekeji.filter.FilterConstance; -import com.zhehekeji.filter.pojo.CurrentUser; +import com.leaper.filter.FilterConstance; +import com.leaper.filter.pojo.CurrentUser; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtBuilder; import io.jsonwebtoken.Jwts; diff --git a/modules/pom.xml b/modules/pom.xml index 2fe343b..c610f69 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> springbootstart - com.zhehekeji + com.leaper 1.0.0 4.0.0 @@ -15,14 +15,14 @@ 1.8 1.0.0 - 1.0.0 + 1.0.0 - com.zhehekeji + com.leaper common ${common.version} diff --git a/pom.xml b/pom.xml index f094cb0..0bf3ef9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,11 +15,11 @@ 2.3.1.RELEASE - com.zhehekeji + com.leaper springbootstart 1.0.0 duoji - Demo project for Spring Boot + 堆垛机随行监控系统 1.8 diff --git a/readme.md b/readme.md index 8cd3a98..ca67a82 100644 --- a/readme.md +++ b/readme.md @@ -1,8 +1,8 @@ # 舵机 ## 通讯协议： -![image](plc通讯协议1.jpg) -![image](plc通讯协议2.jpg) +### 昆船通訊協議见doc文件夹，每个项目的协议会略有差异，但是格式不会变 ### tcp通讯用的netty +### 昆船通讯协议编解码在web #### 1.HeartNettyClient*类是维持与plc的心跳 #### 2.解码：MyProtocolDecode 这里收到plc的包解析处理，见通讯协议的两张图片 #### 3.调用sdk拍照，录像，转动球机等操作在com.zhehekeji.web.lib里面 diff --git a/web/pom.xml b/web/pom.xml index 67d7005..568eaf9 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> springbootstart - com.zhehekeji + com.leaper 1.0.0 4.0.0 @@ -39,7 +39,7 @@ true - com.zhehekeji + com.leaper common 1.0.0 @@ -49,7 +49,7 @@ 4.1.50.Final - com.zhehekeji + com.leaper filter 1.0.0 diff --git a/web/src/main/java/com/zhehekeji/web/Application.java b/web/src/main/java/com/leaper/web/Application.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/Application.java rename to web/src/main/java/com/leaper/web/Application.java index fd31041..8372997 100644 --- a/web/src/main/java/com/zhehekeji/web/Application.java +++ b/web/src/main/java/com/leaper/web/Application.java @@ -1,12 +1,11 @@ -package com.zhehekeji.web; +package com.leaper.web; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cache.annotation.EnableCaching; -@SpringBootApplication(scanBasePackages = {"com.zhehekeji"}) -@MapperScan("com.zhehekeji.**.mapper.**") +@SpringBootApplication(scanBasePackages = {"com.leaper"}) +@MapperScan("com.leaper.**.mapper.**") public class Application { public static void main(String[] args) { SpringApplication springApplication = new SpringApplication(Application.class); diff --git a/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java b/web/src/main/java/com/leaper/web/config/CacheConfig.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/config/CacheConfig.java rename to web/src/main/java/com/leaper/web/config/CacheConfig.java index 53c130a..d289f80 100644 --- a/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java +++ b/web/src/main/java/com/leaper/web/config/CacheConfig.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.config; +package com.leaper.web.config; import com.github.pagehelper.cache.GuavaCache; import com.google.common.cache.CacheBuilder; diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/leaper/web/config/ConfigProperties.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java rename to web/src/main/java/com/leaper/web/config/ConfigProperties.java index 2c919dd..7a64eb3 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/leaper/web/config/ConfigProperties.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.config; +package com.leaper.web.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/web/src/main/java/com/zhehekeji/web/config/PackagesSqlSessionFactory.java b/web/src/main/java/com/leaper/web/config/PackagesSqlSessionFactory.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/config/PackagesSqlSessionFactory.java rename to web/src/main/java/com/leaper/web/config/PackagesSqlSessionFactory.java index 1ad8ae7..9b7a65d 100644 --- a/web/src/main/java/com/zhehekeji/web/config/PackagesSqlSessionFactory.java +++ b/web/src/main/java/com/leaper/web/config/PackagesSqlSessionFactory.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.config; +package com.leaper.web.config; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.SqlSessionFactoryBean; diff --git a/web/src/main/java/com/zhehekeji/web/config/SwaggerConfig.java b/web/src/main/java/com/leaper/web/config/SwaggerConfig.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/config/SwaggerConfig.java rename to web/src/main/java/com/leaper/web/config/SwaggerConfig.java index 0063daf..b022efe 100644 --- a/web/src/main/java/com/zhehekeji/web/config/SwaggerConfig.java +++ b/web/src/main/java/com/leaper/web/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.config; +package com.leaper.web.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -22,7 +22,7 @@ public class SwaggerConfig { .apiInfo(apiInfo()) .select() //指定提供接口所在的基包 - .apis(RequestHandlerSelectors.basePackage("com.zhehekeji")) + .apis(RequestHandlerSelectors.basePackage("com.leaper")) .build(); } diff --git a/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java b/web/src/main/java/com/leaper/web/controller/AppCenterController.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java rename to web/src/main/java/com/leaper/web/controller/AppCenterController.java index c470d1f..58c2c38 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java +++ b/web/src/main/java/com/leaper/web/controller/AppCenterController.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.alibaba.fastjson.JSONObject; -import com.zhehekeji.common.util.HttpUtil; +import com.leaper.common.util.HttpUtil; import com.zhehekeji.core.pojo.Result; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.pojo.IndexVO; +import com.leaper.web.pojo.IndexVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java b/web/src/main/java/com/leaper/web/controller/CameraControlController.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java rename to web/src/main/java/com/leaper/web/controller/CameraControlController.java index 766b3f2..07425ce 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java +++ b/web/src/main/java/com/leaper/web/controller/CameraControlController.java @@ -1,16 +1,18 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; -import com.zhehekeji.common.util.PathUtil; +import com.leaper.web.lib.CameraConnMap; +import com.leaper.web.lib.CameraControlLoginModule; +import com.leaper.web.lib.CameraControlModule; +import com.leaper.web.lib.TaskDelayExecutor; import com.zhehekeji.core.pojo.Result; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.Camera; -import com.zhehekeji.web.lib.*; -import com.zhehekeji.web.lib.hik.HCNetSDK; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.mapper.CameraMapper; -import com.zhehekeji.web.service.CameraService; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Camera; +import com.leaper.web.lib.*; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.mapper.CameraMapper; +import com.leaper.web.service.CameraService; +import com.leaper.web.service.PlcService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java b/web/src/main/java/com/leaper/web/controller/CameraController.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/controller/CameraController.java rename to web/src/main/java/com/leaper/web/controller/CameraController.java index 340f29a..f71d473 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java +++ b/web/src/main/java/com/leaper/web/controller/CameraController.java @@ -1,22 +1,21 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.alibaba.fastjson.JSONObject; -import com.fasterxml.jackson.core.JsonParser; import com.github.pagehelper.PageInfo; import com.sun.jna.ptr.IntByReference; -import com.zhehekeji.common.util.ValidatorUtil; +import com.leaper.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.entity.Camera; -import com.zhehekeji.web.entity.CameraIO; -import com.zhehekeji.web.entity.CameraIOConfig; -import com.zhehekeji.web.lib.CameraConnMap; -import com.zhehekeji.web.lib.CameraControlModule; -import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.pojo.camera.CameraConfigSearchReq; -import com.zhehekeji.web.pojo.camera.CameraIOPtz; -import com.zhehekeji.web.pojo.street.StreetSearch; -import com.zhehekeji.web.service.CameraService; +import com.leaper.web.entity.Camera; +import com.leaper.web.entity.CameraIO; +import com.leaper.web.entity.CameraIOConfig; +import com.leaper.web.lib.CameraConnMap; +import com.leaper.web.lib.CameraControlModule; +import com.leaper.web.lib.joyware.JoywareLoginModuleImpl; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.pojo.camera.CameraConfigSearchReq; +import com.leaper.web.pojo.camera.CameraIOPtz; +import com.leaper.web.pojo.street.StreetSearch; +import com.leaper.web.service.CameraService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -27,7 +26,6 @@ import javax.annotation.Resource; import java.io.*; import java.util.List; import java.util.Map; -import java.util.stream.Collector; import java.util.stream.Collectors; @Api(value = "camera",tags = "球机管理") diff --git a/web/src/main/java/com/zhehekeji/web/controller/CategoryController.java b/web/src/main/java/com/leaper/web/controller/CategoryController.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/controller/CategoryController.java rename to web/src/main/java/com/leaper/web/controller/CategoryController.java index db68c7a..22f28e8 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CategoryController.java +++ b/web/src/main/java/com/leaper/web/controller/CategoryController.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.entity.Category; -import com.zhehekeji.web.pojo.category.PageSearch; -import com.zhehekeji.web.service.CategoryService; +import com.leaper.web.entity.Category; +import com.leaper.web.pojo.category.PageSearch; +import com.leaper.web.service.CategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.core.io.ClassPathResource; diff --git a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java b/web/src/main/java/com/leaper/web/controller/CheckLogController.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java rename to web/src/main/java/com/leaper/web/controller/CheckLogController.java index 4c22b24..3dba28e 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java +++ b/web/src/main/java/com/leaper/web/controller/CheckLogController.java @@ -1,14 +1,11 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.github.pagehelper.PageInfo; -import com.zhehekeji.common.util.ValidatorUtil; +import com.leaper.web.pojo.stock.CheckLogSearch; +import com.leaper.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.entity.CheckLog; -import com.zhehekeji.web.entity.StockLog; -import com.zhehekeji.web.pojo.stock.CheckLogSearch; -import com.zhehekeji.web.pojo.stock.StockLogSearch; -import com.zhehekeji.web.service.CheckLogService; -import com.zhehekeji.web.service.StockLogService; +import com.leaper.web.entity.CheckLog; +import com.leaper.web.service.CheckLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/web/src/main/java/com/zhehekeji/web/controller/Login.java b/web/src/main/java/com/leaper/web/controller/Login.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/controller/Login.java rename to web/src/main/java/com/leaper/web/controller/Login.java index 24dba8b..9ae0def 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/Login.java +++ b/web/src/main/java/com/leaper/web/controller/Login.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java b/web/src/main/java/com/leaper/web/controller/OrderController.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/controller/OrderController.java rename to web/src/main/java/com/leaper/web/controller/OrderController.java index f1d9cea..24059f5 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java +++ b/web/src/main/java/com/leaper/web/controller/OrderController.java @@ -1,14 +1,14 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.github.pagehelper.PageInfo; -import com.zhehekeji.common.util.ValidatorUtil; +import com.leaper.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.pojo.OrderSaveReq; -import com.zhehekeji.web.pojo.OrderSearch; -import com.zhehekeji.web.pojo.OrderVO; -import com.zhehekeji.web.service.OrderService; -import com.zhehekeji.web.service.PlcCmdInfo; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.pojo.OrderSaveReq; +import com.leaper.web.pojo.OrderSearch; +import com.leaper.web.pojo.OrderVO; +import com.leaper.web.service.OrderService; +import com.leaper.web.service.PlcCmdInfo; +import com.leaper.web.service.PlcService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/web/src/main/java/com/zhehekeji/web/controller/PLCController.java b/web/src/main/java/com/leaper/web/controller/PLCController.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/controller/PLCController.java rename to web/src/main/java/com/leaper/web/controller/PLCController.java index ac53d0a..89b19e8 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/PLCController.java +++ b/web/src/main/java/com/leaper/web/controller/PLCController.java @@ -1,13 +1,17 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; +import com.leaper.web.service.GoodsActionTimes; +import com.leaper.web.service.PlcService; +import com.leaper.web.service.StreetConn; +import com.leaper.web.service.StreetService; import com.zhehekeji.core.pojo.Result; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.service.*; -import com.zhehekeji.web.service.ksec.KsecNettyClient; -import com.zhehekeji.web.service.robotic.NettyClient; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Street; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.service.*; +import com.leaper.web.service.ksec.KsecNettyClient; +import com.leaper.web.service.robotic.NettyClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java b/web/src/main/java/com/leaper/web/controller/RealTimeController.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java rename to web/src/main/java/com/leaper/web/controller/RealTimeController.java index 5fd8d84..789ad03 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java +++ b/web/src/main/java/com/leaper/web/controller/RealTimeController.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.Camera; -import com.zhehekeji.web.pojo.realTime.RealTime; -import com.zhehekeji.web.service.CameraService; -import com.zhehekeji.web.service.RealTimeService; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Camera; +import com.leaper.web.pojo.realTime.RealTime; +import com.leaper.web.service.CameraService; +import com.leaper.web.service.RealTimeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/web/src/main/java/com/zhehekeji/web/controller/SensorController.java b/web/src/main/java/com/leaper/web/controller/SensorController.java similarity index 65% rename from web/src/main/java/com/zhehekeji/web/controller/SensorController.java rename to web/src/main/java/com/leaper/web/controller/SensorController.java index d72caca..0b6ee19 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/SensorController.java +++ b/web/src/main/java/com/leaper/web/controller/SensorController.java @@ -1,21 +1,14 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; -import com.alibaba.fastjson.JSONObject; -import com.zhehekeji.common.util.HttpUtil; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.pojo.IndexVO; -import com.zhehekeji.web.service.sick.SickConnMap; +import com.leaper.web.service.sick.SickConnMap; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.IOException; - @Api( tags = "传感器") @RequestMapping(value = "/sensor") @RestController() diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/leaper/web/controller/StockController.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/controller/StockController.java rename to web/src/main/java/com/leaper/web/controller/StockController.java index 99fb632..001c68d 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/leaper/web/controller/StockController.java @@ -1,13 +1,14 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.alibaba.excel.EasyExcel; import com.github.pagehelper.PageInfo; -import com.zhehekeji.common.util.ValidatorUtil; +import com.leaper.web.pojo.stock.*; +import com.leaper.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.entity.Stock; -import com.zhehekeji.web.pojo.category.PageSearch; -import com.zhehekeji.web.pojo.stock.*; -import com.zhehekeji.web.service.StockService; +import com.leaper.web.entity.Stock; +import com.leaper.web.pojo.category.PageSearch; +import com.leaper.web.pojo.stock.*; +import com.leaper.web.service.StockService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -23,7 +24,6 @@ import java.net.URLEncoder; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; -import java.util.Map; @Api(value = "Stock", tags = "库存管理") @RestController diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java b/web/src/main/java/com/leaper/web/controller/StockLogController.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/controller/StockLogController.java rename to web/src/main/java/com/leaper/web/controller/StockLogController.java index d8e3dde..deb0ca8 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockLogController.java +++ b/web/src/main/java/com/leaper/web/controller/StockLogController.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.github.pagehelper.PageInfo; -import com.zhehekeji.common.util.ValidatorUtil; +import com.leaper.web.service.StockLogService; +import com.leaper.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.entity.StockLog; -import com.zhehekeji.web.pojo.stock.StockLogSearch; -import com.zhehekeji.web.service.StockLogService; +import com.leaper.web.entity.StockLog; +import com.leaper.web.pojo.stock.StockLogSearch; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/leaper/web/controller/StreetController.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/controller/StreetController.java rename to web/src/main/java/com/leaper/web/controller/StreetController.java index aa1e52b..93991cc 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/leaper/web/controller/StreetController.java @@ -1,18 +1,18 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; +import com.leaper.web.entity.LightSource; +import com.leaper.web.service.LightSourceService; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.LightSource; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.pojo.street.StreetSearch; -import com.zhehekeji.web.pojo.street.StreetVO; -import com.zhehekeji.web.service.LightSourceService; -import com.zhehekeji.web.service.StreetService; -import com.zhehekeji.web.service.damLightSource.JYDAMEquip; -import com.zhehekeji.web.service.damLightSource.JYDamHelper; -import com.zhehekeji.web.service.hikLightSource.HikControlSocket; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Street; +import com.leaper.web.pojo.street.StreetSearch; +import com.leaper.web.pojo.street.StreetVO; +import com.leaper.web.service.StreetService; +import com.leaper.web.service.damLightSource.JYDAMEquip; +import com.leaper.web.service.damLightSource.JYDamHelper; +import com.leaper.web.service.hikLightSource.HikControlSocket; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; -import java.util.Map; @Api(value = "StreetController",tags = "巷道管理") @RestController(value = "StreetController") diff --git a/web/src/main/java/com/zhehekeji/web/controller/TestController.java b/web/src/main/java/com/leaper/web/controller/TestController.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/controller/TestController.java rename to web/src/main/java/com/leaper/web/controller/TestController.java index ec8c8ed..cb0f1aa 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/TestController.java +++ b/web/src/main/java/com/leaper/web/controller/TestController.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.service.TestService; +import com.leaper.web.service.TestService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/web/src/main/java/com/zhehekeji/web/controller/WarnController.java b/web/src/main/java/com/leaper/web/controller/WarnController.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/controller/WarnController.java rename to web/src/main/java/com/leaper/web/controller/WarnController.java index f57dde2..fdc342d 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/WarnController.java +++ b/web/src/main/java/com/leaper/web/controller/WarnController.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.controller; +package com.leaper.web.controller; import com.github.pagehelper.PageInfo; -import com.zhehekeji.common.util.ValidatorUtil; +import com.leaper.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.web.pojo.warn.WarnSearch; -import com.zhehekeji.web.pojo.warn.WarnVO; -import com.zhehekeji.web.service.WarnService; +import com.leaper.web.pojo.warn.WarnSearch; +import com.leaper.web.pojo.warn.WarnVO; +import com.leaper.web.service.WarnService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/web/src/main/java/com/zhehekeji/web/entity/Camera.java b/web/src/main/java/com/leaper/web/entity/Camera.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/entity/Camera.java rename to web/src/main/java/com/leaper/web/entity/Camera.java index e599dfc..e29cd7c 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Camera.java +++ b/web/src/main/java/com/leaper/web/entity/Camera.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/web/src/main/java/com/zhehekeji/web/entity/CameraIO.java b/web/src/main/java/com/leaper/web/entity/CameraIO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/entity/CameraIO.java rename to web/src/main/java/com/leaper/web/entity/CameraIO.java index 1d6ca73..1a39c9d 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/CameraIO.java +++ b/web/src/main/java/com/leaper/web/entity/CameraIO.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/web/src/main/java/com/zhehekeji/web/entity/CameraIOConfig.java b/web/src/main/java/com/leaper/web/entity/CameraIOConfig.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/entity/CameraIOConfig.java rename to web/src/main/java/com/leaper/web/entity/CameraIOConfig.java index 231bc68..4bd1b5b 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/CameraIOConfig.java +++ b/web/src/main/java/com/leaper/web/entity/CameraIOConfig.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/web/src/main/java/com/zhehekeji/web/entity/Category.java b/web/src/main/java/com/leaper/web/entity/Category.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/entity/Category.java rename to web/src/main/java/com/leaper/web/entity/Category.java index bafbc90..32e3fab 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Category.java +++ b/web/src/main/java/com/leaper/web/entity/Category.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java b/web/src/main/java/com/leaper/web/entity/CheckLog.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/entity/CheckLog.java rename to web/src/main/java/com/leaper/web/entity/CheckLog.java index 736244d..59ffb25 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java +++ b/web/src/main/java/com/leaper/web/entity/CheckLog.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/web/src/main/java/com/zhehekeji/web/entity/LightSource.java b/web/src/main/java/com/leaper/web/entity/LightSource.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/entity/LightSource.java rename to web/src/main/java/com/leaper/web/entity/LightSource.java index 3cc146f..32d0206 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/LightSource.java +++ b/web/src/main/java/com/leaper/web/entity/LightSource.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/web/src/main/java/com/zhehekeji/web/entity/Order.java b/web/src/main/java/com/leaper/web/entity/Order.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/entity/Order.java rename to web/src/main/java/com/leaper/web/entity/Order.java index 55c8354..26c61c0 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Order.java +++ b/web/src/main/java/com/leaper/web/entity/Order.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/web/src/main/java/com/zhehekeji/web/entity/RFID.java b/web/src/main/java/com/leaper/web/entity/RFID.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/entity/RFID.java rename to web/src/main/java/com/leaper/web/entity/RFID.java index e56642c..994cfe1 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/RFID.java +++ b/web/src/main/java/com/leaper/web/entity/RFID.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/web/src/main/java/com/zhehekeji/web/entity/SensorGun.java b/web/src/main/java/com/leaper/web/entity/SensorGun.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/entity/SensorGun.java rename to web/src/main/java/com/leaper/web/entity/SensorGun.java index 9288fe8..c74014b 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/SensorGun.java +++ b/web/src/main/java/com/leaper/web/entity/SensorGun.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/web/src/main/java/com/zhehekeji/web/entity/Stock.java b/web/src/main/java/com/leaper/web/entity/Stock.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/entity/Stock.java rename to web/src/main/java/com/leaper/web/entity/Stock.java index 9d53521..9950e99 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Stock.java +++ b/web/src/main/java/com/leaper/web/entity/Stock.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/web/src/main/java/com/zhehekeji/web/entity/StockLog.java b/web/src/main/java/com/leaper/web/entity/StockLog.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/entity/StockLog.java rename to web/src/main/java/com/leaper/web/entity/StockLog.java index c891dd0..ef90e67 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/StockLog.java +++ b/web/src/main/java/com/leaper/web/entity/StockLog.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/web/src/main/java/com/zhehekeji/web/entity/Street.java b/web/src/main/java/com/leaper/web/entity/Street.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/entity/Street.java rename to web/src/main/java/com/leaper/web/entity/Street.java index b843850..cf8e9f5 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Street.java +++ b/web/src/main/java/com/leaper/web/entity/Street.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web/src/main/java/com/zhehekeji/web/entity/StreetShelve.java b/web/src/main/java/com/leaper/web/entity/StreetShelve.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/entity/StreetShelve.java rename to web/src/main/java/com/leaper/web/entity/StreetShelve.java index 1fe91de..b3b19f3 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/StreetShelve.java +++ b/web/src/main/java/com/leaper/web/entity/StreetShelve.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/web/src/main/java/com/zhehekeji/web/entity/Warn.java b/web/src/main/java/com/leaper/web/entity/Warn.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/entity/Warn.java rename to web/src/main/java/com/leaper/web/entity/Warn.java index bd35223..eaf3450 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Warn.java +++ b/web/src/main/java/com/leaper/web/entity/Warn.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.entity; +package com.leaper.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java b/web/src/main/java/com/leaper/web/lib/CameraConnMap.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java rename to web/src/main/java/com/leaper/web/lib/CameraConnMap.java index ef03a71..64ca929 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java +++ b/web/src/main/java/com/leaper/web/lib/CameraConnMap.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib; +package com.leaper.web.lib; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import java.util.HashMap; import java.util.Map; diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraControlLoginModule.java b/web/src/main/java/com/leaper/web/lib/CameraControlLoginModule.java similarity index 61% rename from web/src/main/java/com/zhehekeji/web/lib/CameraControlLoginModule.java rename to web/src/main/java/com/leaper/web/lib/CameraControlLoginModule.java index 49d198e..5d4a706 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraControlLoginModule.java +++ b/web/src/main/java/com/leaper/web/lib/CameraControlLoginModule.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib; +package com.leaper.web.lib; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public interface CameraControlLoginModule { diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraControlModule.java b/web/src/main/java/com/leaper/web/lib/CameraControlModule.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/CameraControlModule.java rename to web/src/main/java/com/leaper/web/lib/CameraControlModule.java index 7c124a3..e10d205 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraControlModule.java +++ b/web/src/main/java/com/leaper/web/lib/CameraControlModule.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib; +package com.leaper.web.lib; import java.time.LocalDateTime; diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraDelayTask.java b/web/src/main/java/com/leaper/web/lib/CameraDelayTask.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/CameraDelayTask.java rename to web/src/main/java/com/leaper/web/lib/CameraDelayTask.java index 3552de4..fd7f470 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraDelayTask.java +++ b/web/src/main/java/com/leaper/web/lib/CameraDelayTask.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib; +package com.leaper.web.lib; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java b/web/src/main/java/com/leaper/web/lib/OrderInfo.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java rename to web/src/main/java/com/leaper/web/lib/OrderInfo.java index 04b4b5f..3044dee 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java +++ b/web/src/main/java/com/leaper/web/lib/OrderInfo.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib; +package com.leaper.web.lib; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.service.PlcCmdInfo; +import com.leaper.web.entity.Street; +import com.leaper.web.service.PlcCmdInfo; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/web/src/main/java/com/zhehekeji/web/lib/OrderRealtime.java b/web/src/main/java/com/leaper/web/lib/OrderRealtime.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/OrderRealtime.java rename to web/src/main/java/com/leaper/web/lib/OrderRealtime.java index 16ecf87..6fc1118 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/OrderRealtime.java +++ b/web/src/main/java/com/leaper/web/lib/OrderRealtime.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib; +package com.leaper.web.lib; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java b/web/src/main/java/com/leaper/web/lib/TaskDelayExecutor.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java rename to web/src/main/java/com/leaper/web/lib/TaskDelayExecutor.java index f37e459..691f256 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java +++ b/web/src/main/java/com/leaper/web/lib/TaskDelayExecutor.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib; +package com.leaper.web.lib; -import com.zhehekeji.common.util.SpringContextUtil; +import com.leaper.common.util.SpringContextUtil; import java.time.LocalDateTime; import java.util.concurrent.DelayQueue; diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java b/web/src/main/java/com/leaper/web/lib/hik/HCNetSDK.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java rename to web/src/main/java/com/leaper/web/lib/hik/HCNetSDK.java index 9e2e61f..501acdb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java +++ b/web/src/main/java/com/leaper/web/lib/hik/HCNetSDK.java @@ -9,7 +9,7 @@ * Created on 2009-9-14, 19:31:34 */ -package com.zhehekeji.web.lib.hik; +package com.leaper.web.lib.hik; import com.sun.jna.Native; import com.sun.jna.Pointer; diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java b/web/src/main/java/com/leaper/web/lib/hik/HikCameraControlModuleImpl.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java rename to web/src/main/java/com/leaper/web/lib/hik/HikCameraControlModuleImpl.java index 433bbe9..f877174 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java +++ b/web/src/main/java/com/leaper/web/lib/hik/HikCameraControlModuleImpl.java @@ -1,19 +1,15 @@ -package com.zhehekeji.web.lib.hik; +package com.leaper.web.lib.hik; -import com.sun.jna.NativeLong; +import com.leaper.web.lib.CameraConnMap; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.ptr.IntByReference; -import com.zhehekeji.common.util.PathUtil; +import com.leaper.common.util.PathUtil; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.lib.CameraConnMap; -import com.zhehekeji.web.lib.CameraControlModule; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.CameraControlModule; import lombok.extern.slf4j.Slf4j; import java.io.*; -import java.nio.charset.StandardCharsets; -import java.time.Duration; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Timer; diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikExceptionCallBack.java b/web/src/main/java/com/leaper/web/lib/hik/HikExceptionCallBack.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/hik/HikExceptionCallBack.java rename to web/src/main/java/com/leaper/web/lib/hik/HikExceptionCallBack.java index aec408c..4490b3a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikExceptionCallBack.java +++ b/web/src/main/java/com/leaper/web/lib/hik/HikExceptionCallBack.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.hik; +package com.leaper.web.lib.hik; import com.sun.jna.Pointer; -import com.zhehekeji.web.lib.CameraConnMap; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.CameraConnMap; +import com.leaper.web.lib.joyware.NetSDKLib; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java b/web/src/main/java/com/leaper/web/lib/hik/HikLoginModuleImpl.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java rename to web/src/main/java/com/leaper/web/lib/hik/HikLoginModuleImpl.java index 37f09a0..e3813cf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java +++ b/web/src/main/java/com/leaper/web/lib/hik/HikLoginModuleImpl.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.hik; +package com.leaper.web.lib.hik; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; -import com.zhehekeji.web.lib.CameraControlLoginModule; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.CameraControlLoginModule; import lombok.extern.slf4j.Slf4j; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java b/web/src/main/java/com/leaper/web/lib/joyware/CallBack.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java rename to web/src/main/java/com/leaper/web/lib/joyware/CallBack.java index 4e4aca3..215e407 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/CallBack.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; +import com.leaper.web.lib.CameraConnMap; import com.sun.jna.Pointer; -import com.zhehekeji.web.lib.CameraConnMap; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureCmdSerial.java b/web/src/main/java/com/leaper/web/lib/joyware/CaptureCmdSerial.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureCmdSerial.java rename to web/src/main/java/com/leaper/web/lib/joyware/CaptureCmdSerial.java index 60e479a..a70e38e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureCmdSerial.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/CaptureCmdSerial.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureReceiveCB.java b/web/src/main/java/com/leaper/web/lib/joyware/CaptureReceiveCB.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureReceiveCB.java rename to web/src/main/java/com/leaper/web/lib/joyware/CaptureReceiveCB.java index 2e0853a..12b4a1c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureReceiveCB.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/CaptureReceiveCB.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; import com.sun.jna.Pointer; -import com.zhehekeji.common.util.PathUtil; +import com.leaper.common.util.PathUtil; import lombok.extern.slf4j.Slf4j; import java.io.*; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java b/web/src/main/java/com/leaper/web/lib/joyware/JoywareCameraControlModuleImpl.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java rename to web/src/main/java/com/leaper/web/lib/joyware/JoywareCameraControlModuleImpl.java index 76c36c9..2a8e5d7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/JoywareCameraControlModuleImpl.java @@ -1,15 +1,15 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; +import com.leaper.web.lib.CameraConnMap; import com.sun.jna.ptr.IntByReference; -import com.zhehekeji.common.util.PathUtil; +import com.leaper.common.util.PathUtil; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.lib.CameraConnMap; -import com.zhehekeji.web.lib.CameraControlModule; +import com.leaper.web.lib.CameraControlModule; import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; -import static com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl.mp4ReceiveCB; +import static com.leaper.web.lib.joyware.JoywareLoginModuleImpl.mp4ReceiveCB; /** * 云台控制接口实现 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java b/web/src/main/java/com/leaper/web/lib/joyware/JoywareLoginModuleImpl.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java rename to web/src/main/java/com/leaper/web/lib/joyware/JoywareLoginModuleImpl.java index 1a201db..ec8db4c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/JoywareLoginModuleImpl.java @@ -1,15 +1,11 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; import com.sun.jna.CallbackThreadInitializer; import com.sun.jna.Memory; import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; -import com.zhehekeji.web.lib.CameraConnMap; -import com.zhehekeji.web.lib.CameraControlLoginModule; -import com.zhehekeji.web.lib.joyware.NetSDKLib.LLong; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY; +import com.leaper.web.lib.CameraControlLoginModule; import lombok.extern.slf4j.Slf4j; /** @@ -38,7 +34,7 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule { public static CallBack.Mp4ReceiveCB mp4ReceiveCB= new CallBack.Mp4ReceiveCB(); - public static Boolean connectStatus(LLong userId){ + public static Boolean connectStatus(NetSDKLib.LLong userId){ IntByReference retLen = new IntByReference(0); Pointer p = new Memory(Integer.SIZE); p.clear(Integer.SIZE); @@ -117,20 +113,20 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule { * 登录设备 * \endif */ - public LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { + public NetSDKLib.LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { //IntByReference nError = new IntByReference(0); //入参 init(disConnectCallBack,haveReConnect); - NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY pstInParam=new NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY(); + NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY pstInParam=new NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY(); pstInParam.nPort=m_nPort; pstInParam.szIP=m_strIp.getBytes(); pstInParam.szPassword=m_strPassword.getBytes(); pstInParam.szUserName=m_strUser.getBytes(); //出参 - NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY pstOutParam=new NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY(); + NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY pstOutParam=new NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY(); pstOutParam.stuDeviceInfo=m_stDeviceInfo; //m_hLoginHandle = netsdk.CLIENT_LoginEx2(m_strIp, m_nPort, m_strUser, m_strPassword, 0, null, m_stDeviceInfo, nError); - LLong m_hLoginHandle=netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam); + NetSDKLib.LLong m_hLoginHandle=netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam); int tryTimes = 0; while (m_hLoginHandle.longValue()==0 && tryTimes <= MAX_RECONNET_TIME){ log.error("joyware login error,ip:{},port:{},errorCode:{}",m_strIp,m_nPort,netsdk.CLIENT_GetLastError()); diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java b/web/src/main/java/com/leaper/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java rename to web/src/main/java/com/leaper/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java index 783f5f6..93a8063 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java b/web/src/main/java/com/leaper/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java rename to web/src/main/java/com/leaper/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java index 69440f1..56ca854 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; /** * @author 251823 * @description 订阅云台元数据接口输输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java b/web/src/main/java/com/leaper/web/lib/joyware/NetSDKLib.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java rename to web/src/main/java/com/leaper/web/lib/joyware/NetSDKLib.java index b05b9b1..e8b9d4b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/NetSDKLib.java @@ -1,6 +1,9 @@ -package com.zhehekeji.web.lib.joyware; -import com.zhehekeji.web.lib.joyware.enumeration.EM_FILTER_IMAGE_TYPE; -import com.zhehekeji.web.lib.joyware.structure.*; +package com.leaper.web.lib.joyware; +import com.leaper.web.lib.joyware.enumeration.EM_FILTER_IMAGE_TYPE; +import com.leaper.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.structure.NET_IN_PTZ_STATUS_PROC; +import com.leaper.web.lib.joyware.structure.NET_OUT_PTZ_STATUS_PROC; +import com.leaper.web.lib.joyware.structure.*; import com.sun.jna.*; import com.sun.jna.ptr.IntByReference; import java.lang.reflect.Field; @@ -2201,7 +2204,7 @@ public interface NetSDKLib extends Library { public NET_EULER_ANGLE stuFaceCaptureAngle; // 人脸在抓拍图片中的角度信息, nPitch:抬头低头的俯仰角, nYaw左右转头的偏航角, nRoll头在平面内左偏右偏的翻滚角 // 角度值取值范围[-90,90], 三个角度值都为999表示此角度信息无效 public int nFaceQuality; // 人脸抓拍质量分数 - public NET_FACEDETECT_IMAGE_INFO stuSceneImage; // 大图信息 + public NET_FACEDETECT_IMAGE_INFO stuSceneImage; // 大图信息 public NET_POINT stuFaceCenter; // 人脸型心(不是包围盒中心), 0-8191相对坐标, 相对于小图 public MEDIAFILE_FACE_DETECTION_INFO() { @@ -2341,7 +2344,7 @@ public interface NetSDKLib extends Library { public byte[] byReserved=new byte[4]; // 字节对齐 public int nPicIDHigh; // PictureID高四字节 public int nPicIDLow; // PictureID低四字节 - public NET_UPLOAD_CLIENT_INFO stuClient1; // 平台客户端1上传信息 + public NET_UPLOAD_CLIENT_INFO stuClient1; // 平台客户端1上传信息 public NET_UPLOAD_CLIENT_INFO stuClient2; // 平台客户端2上传信息 public PlateNumber[] szExtraPlateNumber=(PlateNumber[])new PlateNumber().toArray(3); // 三地车牌 public int nExtraPlateNumberNum; // 车牌个数 @@ -2801,7 +2804,7 @@ public interface NetSDKLib extends Library { public CANDIDATE_INFOEX[] stuCandidatesEx = (CANDIDATE_INFOEX[])new CANDIDATE_INFOEX().toArray(NET_MAX_CANDIDATE_NUM); // 当前人脸匹配到的候选对象信息, 实际返回个数同nCandidateNum public FACE_INFO_OBJECT stuFaceInfoObject; // 目标人脸信息 public NET_POINT stuFaceCenter; // 人脸型心(不是包围盒中心), 0-8191相对坐标, 相对于小图 - public NET_MEDIAFILE_GENERAL_INFO stuGeneralInfo; // 通用信息 + public NET_MEDIAFILE_GENERAL_INFO stuGeneralInfo; // 通用信息 public MEDIAFILE_FACERECOGNITION_INFO() { this.dwSize = this.size(); @@ -3285,7 +3288,7 @@ public interface NetSDKLib extends Library { // [3]-曾经建模成功，但因算法升级变得不可用的数量，重新建模就可用 public int emRegisterDbType; // 注册库类型，详见EM_REGISTER_DB_TYPE public byte[] byReserved1=new byte[4]; // 字节对齐 - public NET_PASSERBY_DB_CONFIG_INFO stuPasserbyDBConfig; // 路人库配置（选填） + public NET_PASSERBY_DB_CONFIG_INFO stuPasserbyDBConfig; // 路人库配置（选填） public NET_FACERECONGNITION_GROUP_INFO() { @@ -32160,8 +32163,8 @@ public interface NetSDKLib extends Library { /** * 设置二维码信息 * @param lLoginID 登录句柄 - * @param pInParam 入参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_IN_SET_2DCODE} - * @param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_SET_2DCODE} + * @param pInParam 入参,对应结构体{@link NET_IN_SET_2DCODE} + * @param pOutParam 出参,对应结构体{@link NET_OUT_SET_2DCODE} * @param nWaitTime 超时时间 * @return */ @@ -32170,9 +32173,9 @@ public interface NetSDKLib extends Library { /** * 订阅热度图数据,pInParam与pOutParam内存由用户申请释放 * @param lLoginID 登录句柄 - * @param pInParam 入参,对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_ATTACH_VIDEOSTAT_HEATMAP} - * @Param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_ATTACH_VIDEOSTAT_HEATMAP} - * 也可使用{@link com.zhehekeji.web.lib.joyware.structure.EmptyStructure} + * @param pInParam 入参,对应结构体 {@link NET_IN_ATTACH_VIDEOSTAT_HEATMAP} + * @Param pOutParam 出参,对应结构体{@link NET_OUT_ATTACH_VIDEOSTAT_HEATMAP} + * 也可使用{@link EmptyStructure} * @param nWaitTime 超时时间 * @return */ @@ -32181,8 +32184,8 @@ public interface NetSDKLib extends Library { /** * 获取热图数据,pInParam与pOutParam内存由用户申请释放 * @param lAttachHandle 热度图订阅句柄 - * @param pInParam 入参,对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_VIDEOSTAT_HEATMAP} - * @param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_VIDEOSTAT_HEATMAP} + * @param pInParam 入参,对应结构体 {@link NET_IN_GET_VIDEOSTAT_HEATMAP} + * @param pOutParam 出参,对应结构体{@link NET_OUT_GET_VIDEOSTAT_HEATMAP} * @param nWaitTime 超时时间 * @return */ @@ -32207,8 +32210,8 @@ public interface NetSDKLib extends Library { /** * 计算两张人脸图片的相似度faceRecognitionServer.matchTwoFace,pstInParam与pstOutParam内存由用户申请释放 * @param lLoginID 登录句柄 - * @param pstInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_MATCH_TWO_FACE_IN} - * @param pstOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_MATCH_TWO_FACE_OUT} + * @param pstInParam 入参 {@link NET_MATCH_TWO_FACE_IN} + * @param pstOutParam 出参{@link NET_MATCH_TWO_FACE_OUT} * @param nWaitTime 接口超时时间,默认超时时间为3000 * @return */ @@ -32219,8 +32222,8 @@ public interface NetSDKLib extends Library { /** * 设置相机参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_SET_CAMERA_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_SET_CAMERA_CFG} + * @param pInParam 入参 {@link NET_IN_SET_CAMERA_CFG} + * @param pOutParam 出参{@link NET_OUT_SET_CAMERA_CFG} * @param nWaitTime * @return */ @@ -32230,8 +32233,8 @@ public interface NetSDKLib extends Library { /** * 获取相机参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_CAMERA_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_CAMERA_CFG} + * @param pInParam 入参 {@link NET_IN_GET_CAMERA_CFG} + * @param pOutParam 出参{@link NET_OUT_GET_CAMERA_CFG} * @param nWaitTime * @return */ @@ -32241,8 +32244,8 @@ public interface NetSDKLib extends Library { /** * 设置通道参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_SET_CHANNEL_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_SET_CHANNEL_CFG} + * @param pInParam 入参 {@link NET_IN_SET_CHANNEL_CFG} + * @param pOutParam 出参{@link NET_OUT_SET_CHANNEL_CFG} * @param nWaitTime * @return */ @@ -32252,8 +32255,8 @@ public interface NetSDKLib extends Library { /** * 获取通道参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_CHANNEL_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_CHANNEL_CFG} + * @param pInParam 入参 {@link NET_IN_GET_CHANNEL_CFG} + * @param pOutParam 出参{@link NET_OUT_GET_CHANNEL_CFG} * @param nWaitTime * @return */ @@ -32263,8 +32266,8 @@ public interface NetSDKLib extends Library { /** * 交通灯信号检测-获取相机信息, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_CAMERA_INFO} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_CAMERA_INFO} + * @param pInParam 入参 {@link NET_IN_GET_CAMERA_INFO} + * @param pOutParam 出参{@link NET_OUT_GET_CAMERA_INFO} * @param nWaitTime * @return */ @@ -32276,8 +32279,8 @@ public interface NetSDKLib extends Library { /** * 主动获取每个热成像点的像素温度 * @param lLoginID 登录句柄 - * @param pstInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_HEATMAPS_INFO} - * @param pstOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_HEATMAPS_INFO} + * @param pstInParam 入参 {@link NET_IN_GET_HEATMAPS_INFO} + * @param pstOutParam 出参{@link NET_OUT_GET_HEATMAPS_INFO} * @param nWaitTime 接口超时时间,默认超时时间为 3000 * @return */ @@ -32382,8 +32385,8 @@ public interface NetSDKLib extends Library { /** * 获取IPC设备的存储信息 * @param lLoginID 登录句柄 - * @param pstInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_DEVICE_AII_INFO} - * @param pstOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_DEVICE_AII_INFO} + * @param pstInParam 入参 {@link NET_IN_GET_DEVICE_AII_INFO} + * @param pstOutParam 出参{@link NET_OUT_GET_DEVICE_AII_INFO} * @param nWaitTime * @return */ @@ -32397,8 +32400,8 @@ public interface NetSDKLib extends Library { /** * 订阅交通信号灯状态 , pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_ATTACH_TRAFFICLIGHT_INFO} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_ATTACH_TRAFFICLIGHT_INFO} + * @param pInParam 入参 {@link NET_IN_ATTACH_TRAFFICLIGHT_INFO} + * @param pOutParam 出参{@link NET_OUT_ATTACH_TRAFFICLIGHT_INFO} * @param nWaitTime * @return */ @@ -32414,8 +32417,8 @@ public interface NetSDKLib extends Library { /** * 订阅雷达的报警点信息 , pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_RADAR_ALARMPOINTINFO} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_RADAR_ALARMPOINTINFO} + * @param pInParam 入参 {@link NET_IN_RADAR_ALARMPOINTINFO} + * @param pOutParam 出参{@link NET_OUT_RADAR_ALARMPOINTINFO} * @param nWaitTime * @return */ @@ -32448,8 +32451,8 @@ public interface NetSDKLib extends Library { /** * 订阅云台元数据接口,pstuInPtzStatusProc与pstuOutPtzStatusProc内存由用户申请释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_PTZ_STATUS_PROC} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_PTZ_STATUS_PROC} + * @param pInParam 入参 {@link NET_IN_PTZ_STATUS_PROC} + * @param pOutParam 出参{@link NET_OUT_PTZ_STATUS_PROC} * @param nWaitTime * @return */ diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java b/web/src/main/java/com/leaper/web/lib/joyware/StopDownLoadThread.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java rename to web/src/main/java/com/leaper/web/lib/joyware/StopDownLoadThread.java index e190508..11451c1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/StopDownLoadThread.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java b/web/src/main/java/com/leaper/web/lib/joyware/ToolKits.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java rename to web/src/main/java/com/leaper/web/lib/joyware/ToolKits.java index 7a9339b..089fa6f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/ToolKits.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; -import com.zhehekeji.web.lib.joyware.NetSDKLib.LLong; +import com.leaper.web.lib.joyware.NetSDKLib.LLong; import com.sun.jna.Memory; import com.sun.jna.Pointer; import com.sun.jna.Structure; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java b/web/src/main/java/com/leaper/web/lib/joyware/Utils.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java rename to web/src/main/java/com/leaper/web/lib/joyware/Utils.java index 64eec4e..12316c5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/Utils.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware; +package com.leaper.web.lib.joyware; import com.sun.jna.Platform; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Base64.java b/web/src/main/java/com/leaper/web/lib/joyware/common/Base64.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/common/Base64.java rename to web/src/main/java/com/leaper/web/lib/joyware/common/Base64.java index ec433b8..fa0514c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Base64.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/common/Base64.java @@ -25,7 +25,7 @@ // Base64解码 使用1.8版本源码 鉴于1.8部分特性1.6版本使用不到 故只保留能使用到的代码 其余删除 -package com.zhehekeji.web.lib.joyware.common; +package com.leaper.web.lib.joyware.common; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Arrays; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/BorderEx.java b/web/src/main/java/com/leaper/web/lib/joyware/common/BorderEx.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/common/BorderEx.java rename to web/src/main/java/com/leaper/web/lib/joyware/common/BorderEx.java index e4d6e27..2e516a9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/BorderEx.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/common/BorderEx.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.common; +package com.leaper.web.lib.joyware.common; import javax.swing.*; import javax.swing.border.Border; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/CaseMenu.java b/web/src/main/java/com/leaper/web/lib/joyware/common/CaseMenu.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/common/CaseMenu.java rename to web/src/main/java/com/leaper/web/lib/joyware/common/CaseMenu.java index db40676..c4c06ad 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/CaseMenu.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/common/CaseMenu.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.common; +package com.leaper.web.lib.joyware.common; import java.lang.reflect.Method; import java.util.NoSuchElementException; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/ErrorCode.java b/web/src/main/java/com/leaper/web/lib/joyware/common/ErrorCode.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/common/ErrorCode.java rename to web/src/main/java/com/leaper/web/lib/joyware/common/ErrorCode.java index b8151b2..584a98a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/ErrorCode.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/common/ErrorCode.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.common; +package com.leaper.web.lib.joyware.common; /** * 登录设备设备错误状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskCommonQueue.java b/web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskCommonQueue.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskCommonQueue.java rename to web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskCommonQueue.java index 377e187..011ff26 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskCommonQueue.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskCommonQueue.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.common; +package com.leaper.web.lib.joyware.common; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskHandler.java b/web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskHandler.java similarity index 60% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskHandler.java rename to web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskHandler.java index fe25ba1..54d5d08 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskHandler.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskHandler.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.common; +package com.leaper.web.lib.joyware.common; public interface EventTaskHandler { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Res.java b/web/src/main/java/com/leaper/web/lib/joyware/common/Res.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/common/Res.java rename to web/src/main/java/com/leaper/web/lib/joyware/common/Res.java index 2e03a0e..59e45e8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Res.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/common/Res.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.common; +package com.leaper.web.lib.joyware.common; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.*; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.*; import java.util.Locale; import java.util.ResourceBundle; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDKStructureFieldLenth.java b/web/src/main/java/com/leaper/web/lib/joyware/constant/SDKStructureFieldLenth.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDKStructureFieldLenth.java rename to web/src/main/java/com/leaper/web/lib/joyware/constant/SDKStructureFieldLenth.java index 6c638de..19692ff 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDKStructureFieldLenth.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/constant/SDKStructureFieldLenth.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.constant; +package com.leaper.web.lib.joyware.constant; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java index 11d086a..10f4ddb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java @@ -1,5 +1,6 @@ -package com.zhehekeji.web.lib.joyware.constant; +package com.leaper.web.lib.joyware.constant; +import com.leaper.web.lib.joyware.structure.ALARM_NO_DISK_INFO; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; @@ -33,7 +34,7 @@ public class SDK_ALARM_Ex_TYPE { */ public static final int SDK_DISKERROR_ALARM_EX = 0x2107; /** - * 无硬盘报警,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.ALARM_NO_DISK_INFO} + * 无硬盘报警,对应结构体{@link 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/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java index b60cbb4..c3e8e49 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java index f2a2338..a2f1610 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java index 200bc29..092aae3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java index d4d0490..e4585c2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java index 82284d9..20c7163 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java index 8059121..cca900a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java index 1fc9ab8..6ca1846 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java index 366036b..d0ba372 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java index f270d4b..6907907 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 日志查询类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EMDeviceType.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EMDeviceType.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EMDeviceType.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EMDeviceType.java index f3faf5f..852da0d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EMDeviceType.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EMDeviceType.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java index 20364cd..b3545bf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 是否跨位 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java index 4edc4b5..0b5f741 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java index 0c1a245..161a17b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java index bd6c8b1..b6e01e0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java index c846d37..5e338a5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java index 99500c4..c45efbb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java index e39b54e..8d39e29 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_BATTERY_EXIST_STATE { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_BATTERY_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_BATTERY_STATE.java index 407830d..e4b855b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_BATTERY_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_BATTERY_STATE { EM_BATTERY_STATE_UNKNOWN(0, "电量未知"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java index ef8bf2c..54c0547 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java index 5e17cb5..a7cc69b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java index 1d93ab9..fa4bdef 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 拉流使能 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java index 759ef69..d2878f4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_CAPTURE_PROCESS_END_TYPE { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java index 79a96d5..06acdd2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 命令类型,对应QueryNewSystemInfo接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java index fed2f73..27c2126 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java index f1ae99b..d4c5c01 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLISION_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COLLISION_MODE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLISION_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COLLISION_MODE.java index e8dde45..26bb4a9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLISION_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COLLISION_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java index d8cc680..29e901e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 默认组合通道绑定模式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java index 4fbe69d..f9411be 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.structure.*; /** * 录播主机组合通道操作 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java index d026009..7d39a0f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.structure.*; /** * 录播主机录像信息操作 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java index 978801b..8333358 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 课程录像锁定类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java index 2ee458a..11bd0cf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 课程录像压缩类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java index 0c5aa0f..2f42d27 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 课程录像类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_STATE.java index a63f0af..2c11bee 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_COURSE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 课程状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java index ccf47cd..3df08e9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_CURRENT_STATE_TYPE { EM_CURRENT_STATE_UNKNOWN(0, "电流状态未知"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java index ff8535d..857dedf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java index dc76bf0..48d5f37 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java index 5bd137a..47491bd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * AccessControlCustomPassword记录集中密码的保存方式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java index 28cfda9..8457829 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java index 3ccb195..cbf0897 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java index 47b39ed..68057c3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 探测物体的传感器类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java index 36b0cd0..bacf316 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * className：EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java index c44db3c..4c15211 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISK_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DISK_STATE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISK_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DISK_STATE.java index 3aa6fe1..9160339 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISK_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DISK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java index 2fe7691..f605871 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java index 36723a6..48eb3e7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 下载数据类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java index 59928a3..4a1d166 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 下载文件方式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java index d7799fa..111aa2c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 下载时间类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java index 137f1ff..6c96186 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_DRIVING_DIRECTION { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java index ddd7b4c..53f8013 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java index 91e3a07..ec5d75f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java index aa51025..6dcdb8a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_IVS.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_IVS.java index 2234bd0..08b56b1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_IVS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 智能分析事件类型枚举类 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java index 00b8729..a34fa97 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java @@ -1,6 +1,9 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.structure.DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO; +import com.leaper.web.lib.joyware.structure.DEV_EVENT_SHOP_WINDOW_POST_INFO; +import com.leaper.web.lib.joyware.structure.DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Callback; import com.sun.jna.Pointer; @@ -356,7 +359,7 @@ public enum EM_EVENT_IVS_TYPE { */ EVENT_IVS_TRAFFIC_DRIVER_CALLING(0x0000013A, "驾驶员打电话事件"), /** - * {@link com.zhehekeji.web.lib.joyware.structure.DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO} + * {@link DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO} */ EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT(0x0000013B, "行人闯红灯事件"), /** @@ -653,13 +656,13 @@ public enum EM_EVENT_IVS_TYPE { EVENT_IVS_ANIMAL_DETECTION(0x00000286, "动物检测事件"), // ,(对应 DEV_EVENT_ANIMAL_DETECTION_INFO) /** - * {@link com.zhehekeji.web.lib.joyware.structure.DEV_EVENT_SHOP_WINDOW_POST_INFO} + * {@link DEV_EVENT_SHOP_WINDOW_POST_INFO} */ EVENT_IVS_SHOP_WINDOW_POST(0x00000287, "橱窗张贴事件"), /** * (对应 DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO) - * {@link com.zhehekeji.web.lib.joyware.structure.DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO} + * {@link DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO} */ EVENT_IVS_SHOP_SIGN_ABNORMAL(0x00000288, "店招异常事件"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_TYPE.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_TYPE.java index eea0852..78ca669 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_EVENT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * className：EM_EVENT_TYPE diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java index 792f0f4..57b3c77 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FILE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FILE_TYPE.java index 68afdeb..b02bbf7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FILE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java index d116a92..ea0564c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java index 9bb9dd1..4ced6fe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java index 0d4da39..3104e6d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 禁停状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_GATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_GATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_GATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_GATE_TYPE.java index fca4154..d23a6fc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_GATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_GATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java index 78b77e7..d8bc681 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IPC_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_IPC_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IPC_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_IPC_TYPE.java index 827371b..58917e6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IPC_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_IPC_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * IPC类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IS_RECORD.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_IS_RECORD.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IS_RECORD.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_IS_RECORD.java index 3e86ab8..b215840 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IS_RECORD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_IS_RECORD.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 录像使能 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java index 6f4bf89..e2d7d1e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java index 60f2965..6df73e3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_CONFIG.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_NEW_CONFIG.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_CONFIG.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_NEW_CONFIG.java index a3f0081..e37d5d6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_CONFIG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_NEW_CONFIG.java @@ -1,6 +1,10 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.structure.CFG_ACCESS_GENERAL_INFO; +import com.leaper.web.lib.joyware.structure.CFG_AUDIO_SPIRIT; +import com.leaper.web.lib.joyware.structure.CFG_DEVLOCATION_INFO; +import com.leaper.web.lib.joyware.structure.CFG_LOCATION_CALIBRATE_INFO; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.ptr.IntByReference; /** @@ -118,13 +122,13 @@ public enum EM_NEW_CONFIG { CFG_CMD_PICINPIC("PicInPic"), /** 空闲动作配置(CFG_IDLE_MOTION_INFO) */ CFG_CMD_IDLEMOTION_INFO("IdleMotion"), - /** 语音激励(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_AUDIO_SPIRIT}) */ + /** 语音激励(对应 {@link CFG_AUDIO_SPIRIT}) */ CFG_CMD_AUDIO_SPIRIT("AudioSpirit"), - /** 设备安装位置的GPS坐标信息(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_DEVLOCATION_INFO}) */ + /** 设备安装位置的GPS坐标信息(对应 {@link CFG_DEVLOCATION_INFO}) */ CFG_CMD_DEVLOCATION("DevLocation"), - /** 设备参数标定配置(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_LOCATION_CALIBRATE_INFO}) */ + /** 设备参数标定配置(对应 {@link CFG_LOCATION_CALIBRATE_INFO}) */ CFG_CMD_LOCATION_CALIBRATE("LocationCalibrate"), - /** // 门禁基本配置(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_ACCESS_GENERAL_INFO}) */ + /** // 门禁基本配置(对应 {@link CFG_ACCESS_GENERAL_INFO}) */ CFG_CMD_ACCESS_GENERAL("AccessControlGeneral"), /** * // 无线网络连接设置(对应 CFG_WIRELESS_INFO) diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java index dd43c25..6af82a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java @@ -1,11 +1,12 @@ -package com.zhehekeji.web.lib.joyware.enumeration;/** +package com.leaper.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.structure.CFG_PTZ_PROTOCOL_CAPS_INFO; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.ptr.IntByReference; /** @@ -130,7 +131,7 @@ public enum EM_NEW_QUERY_SYSTEM_INFO { CFG_CAP_CMD_BURN_MANAGER("BurnManager.getCaps"), /** * 获取云台能力集 - * 对应结构体{@link com.zhehekeji.web.lib.joyware.structure.CFG_PTZ_PROTOCOL_CAPS_INFO} + * 对应结构体{@link CFG_PTZ_PROTOCOL_CAPS_INFO} */ CFG_CAP_CMD_PTZ("ptz.getCurrentProtocolCaps"), /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java index 55c4e1a..081e5c4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java index 2392180..21811b3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 停车方向 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java index 333726b..853272d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 车位状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java index 82ad36f..8edec65 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 车位抓拍触发类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java index 4fc5a19..df5a815 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java index 47bb456..0de4c58 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java index e4c92be..6d73c3d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASS_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASS_MODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASS_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASS_MODE.java index b1acc9b..a7c07eb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASS_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PASS_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java index d049b14..e4f2de6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java index dd25a29..958268a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java index cac8002..8cc5619 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java index 3ae8b20..cd35747 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 * @description 云台不支持的转动方向 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java index 6860a3d..62d7fb8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QRCODE_STATE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QRCODE_STATE.java index 0ac8fe0..39f38ba 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QRCODE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java index d006a45..87ae8e7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java index cff14d3..12d49ca 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_RADAR_OBJECTTYPE { EM_RADAR_OBJECTTYPE_UNKNOWN(0,"未识别目标"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java index 90ec2e5..4b7f5e0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_RADAR_POINTTYPE { EM_RADAR_POINTTYPE_UNKNOWN(0,"未知"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERROR.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RAID_ERROR.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERROR.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RAID_ERROR.java index 672a6d3..6636367 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERROR.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RAID_ERROR.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_RAID_ERROR { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java index c737e61..a401c28 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_RAID_ERR_SUBDISK { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_REASON_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_REASON_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_REASON_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_REASON_TYPE.java index 39db815..4ef6f40 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_REASON_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_REASON_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java index e20493e..fe96b90 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SCENE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SCENE_TYPE.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SCENE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SCENE_TYPE.java index 9f744ab..55380a4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SCENE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SCENE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java index 6b9e385..5cba769 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 日志查询类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java index acecadc..07b3cbc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java index ce48ea2..915fc9c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java index 1f50f36..89b708c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_SEND_SEARCH_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java index b38858d..9e5c3af 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java index 36757e9..60b470e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java index cb67e05..f2d078f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STARTUP_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STARTUP_MODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STARTUP_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STARTUP_MODE.java index 6f64247..733a255 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STARTUP_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STARTUP_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java index 2201285..980fc4a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java index d4b8ac3..6550e68 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public class EM_STORAGE_DISK_POWERMODE { public static final int EM_STORAGE_DISK_POWERMODE_UNKNOWN = 0; // UNKnown状态（不是以下状态中的值） diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java index a3f79af..37455c8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public class EM_STORAGE_DISK_PREDISKCHECK { public static final int EM_STORAGE_DISK_PREDISKCHECK_UNKNOWN = 0; // UnKnown状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java index f6fbb6a..bee4071 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java index f2c4eca..e081489 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration;/** +package com.leaper.web.lib.joyware.enumeration;/** * @author 47081 * @description * @date 2021/2/20 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java index 739c12d..102288c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java index 08e37c7..927146f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java index 1929ae0..1f28953 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 是否支持指纹功能 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java index e51da05..04f9108 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java index a16f3dd..de22944 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_SUPPORT_FAST_CHECK_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java index 3d7c9c5..ef02020 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_SUPPORT_FAST_IMPORT_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java index 2400aa2..0af5a61 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration;/** +package com.leaper.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java index 27477f8..4eb9a41 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 音频编码压缩格式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java index e94b21d..308b89b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java index fd03065..d7d741e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java index 53a6dc4..72fbae3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 流量状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java index 175782e..956abb4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java index 896f0d8..60a2057 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java index 3a2fb09..155507b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java index 8321aae..2c60017 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java index b5d564c..e08f1f8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java index c9fee05..fe436d9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java index 34b4aa5..62a18f9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java index 4d5dc4c..feed470 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java index 6d1d97b..46ab00c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java index 5306013..d81b07c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java index ac5e0ff..e2cdd9a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 红绿灯触发源 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java index 0e1d148..bdd3c19 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 交通灯类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java index 8d0ceb5..ac5c2fd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java index 0c2511f..54cea12 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 制服样式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java index 6dead75..bab7141 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java index 3612656..8d486e1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 车辆类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java index be7bd82..5c38d65 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java index 4dd3227..95819fe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java index b94f76d..8dcf2f4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 服务类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java index 7ba5d82..4d91efe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java index 2d74479..80646cd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java index 88ced15..f96171c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 虚拟线圈占用状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java index 5ceada3..95e9ca4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum EM_VOLTAGE_STATE_TYPE { EM_VOLTAGE_STATE_UNKNOWN(1,"电压状态未知"), // 未知 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java index 802d32e..d43958f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/ENUMERROR.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/ENUMERROR.java index f21e82b..da689a7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/ENUMERROR.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java index e4e2018..8a3e1eb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java index c836c6b..823c8a1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java @@ -1,7 +1,8 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.structure.*; /** * {@link NetSDKLib#CLIENT_OperateCourseCompositeChannelMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java index a026818..9b3ab09 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java index 99a64b8..359dc05 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java @@ -1,9 +1,10 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; -import com.zhehekeji.web.lib.joyware.structure.NET_CFG_HEALTH_CODE_INFO; +import com.leaper.web.lib.joyware.structure.NET_CFG_HEALTH_CODE_INFO; /** * 枚举值, @@ -90,11 +91,11 @@ public class NET_EM_CFG_OPERATE_TYPE { public static final int NET_EM_CFG_ENCODE_PLAN = 1400; // 刻录光盘编码计划, 对应结构体 NET_ENCODE_PLAN_INFO public static final int NET_EM_CFG_COMPOSE_PLAN = 1403; // 合成通道的预案分割配置, 对应结构体 NET_COMPOSE_PLAN_INFO /** - * 合成通道配置, 对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_COMPOSE_CHANNEL_INFO} + * 合成通道配置, 对应结构体{@link NET_COMPOSE_CHANNEL_INFO} */ public static final int NET_EM_CFG_COMPOSE_CHANNEL = 1401; /** - * 司法刻录参数, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_BURN_PARAM_INFO} + * 司法刻录参数, 对应结构体 {@link NET_BURN_PARAM_INFO} */ public static final int NET_EM_CFG_BURN_PARAM = 1402; /**********报警网关相关配置**************************************************************************************/ @@ -164,7 +165,7 @@ public class NET_EM_CFG_OPERATE_TYPE { public static final int NET_EM_CFG_ACCESSCTL_BLACKLIST = 3900; // 门禁黑名单报警配置，对应结构体 NET_CFG_ACCESSCTL_BLACKLIST public static final int NET_EM_CFG_ACCESSCTL_BLACKLIST_LINK = 3901; // 门禁黑名单报警联动配置,对应结构体 NET_CFG_ALARM_MSG_HANDLE /** - * 门禁节假日组配置, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO} + * 门禁节假日组配置, 对应结构体 {@link NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO} */ public static final int NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP = 3902; /** @@ -177,11 +178,11 @@ public class NET_EM_CFG_OPERATE_TYPE { public static final int NET_EM_CFG_ACCESSCTL_AUTH_MODE = 3904; public static final int NET_EM_CFG_ACS_FACE_RECOGNITION_SCHEME = 3905; // 门禁人脸识别相关配置,对应结构体 NET_CFG_ACS_FACE_RECOGNITION_SCHEME /** - * 广告禁用时段配置, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_CFG_FORBIDDEN_ADVERT_PLAY}, 通道无关，通道号填-1 + * 广告禁用时段配置, 对应结构体 {@link NET_CFG_FORBIDDEN_ADVERT_PLAY}, 通道无关，通道号填-1 */ public static final int NET_EM_CFG_FORBIDDEN_ADVERT_PLAY = 3906; /** - * 门禁设备当前模式配置, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_CFG_BGY_CUSTOMERCFG}, 通道无关，通道号填-1 + * 门禁设备当前模式配置, 对应结构体 {@link NET_CFG_BGY_CUSTOMERCFG}, 通道无关，通道号填-1 */ public static final int NET_EM_CFG_BGY_CUSTOMERCFG = 3907; public static final int NET_EM_CFG_ACCESSCTL_KEYBINDINGINFOCFG = 3908; // 不同数字按钮对应的信息配置, 对应结构体 NET_CFG_ACCESSCTL_KEYBINDINGINFOCFG, 通道无关，通道号填-1 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java index 5c99af3..c34cb27 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 逻辑通道号 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java index e228639..a4f27c5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration;/** +package com.leaper.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java index dea8706..5550dab 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration;/** +package com.leaper.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java index 356c4cb..703de6b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java index fc6b916..b923f76 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 录像模式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java index c6aaff8..2ac254b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 景物形状 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java index f8daa4f..01ae89d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 输入媒体介质 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java index 03d6a29..67af395 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java @@ -1,7 +1,8 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.structure.*; +import com.leaper.web.lib.joyware.structure.*; /** * 电视墙操作类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java index 34f538a..56798ed 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public enum NET_RADIOMETRY_ALARMCONTION { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java index 929fb39..803b306 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 热成像测温点报警结果值类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java index c2774cc..b1c5092 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; /** * 信号灯指示状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java index 59738a7..9a17cdf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.enumeration; +package com.leaper.web.lib.joyware.enumeration; public class NET_VOLUME_TYPE { public static final int VOLUME_TYPE_ALL = 0; //所有卷 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java index 712a31f..8bb1896 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.*; +import static com.leaper.web.lib.joyware.NetSDKLib.*; /** * 普通报警事件 -> 人证比对事件 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java index a24c600..a207ae5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; /** * @author 251823 * @description 火警事件 (DH_ALARM_FIRE_DETECTION) * @date 2020/12/21 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class ALARM_FIRE_DETECTION_INFO extends NetSDKLib.SdkStructure{ diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java index 44dea2c..c94380d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_RADIOMETRY_ALARMCONTION; -import com.zhehekeji.web.lib.joyware.enumeration.NET_RADIOMETRY_RESULT; +import com.leaper.web.lib.joyware.enumeration.NET_RADIOMETRY_ALARMCONTION; +import com.leaper.web.lib.joyware.enumeration.NET_RADIOMETRY_RESULT; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 热成像测温点温度异常报警事件(对应结构体 {@link NetSDKLib#NET_ALARM_HEATIMG_TEMPER}) diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java index 64027d4..7be75bf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java index f1e68d1..83f39d0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_RAID_DEVICE_NAME; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_RAID_DEVICE_NAME; /** * className：ALARM_RAID_INFO_EX diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java index 40b8926..046c2c2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Callback; import com.sun.jna.Pointer; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java index f31c93a..3646751 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 事件类型 NET_ALARM_REGION_PARKING_TIMEOUT(区间车位停车超时) diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java index f76d6ab..c4c535d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_SOLARCELL_SYSTEM_FAULT_TYPE; -import com.zhehekeji.web.lib.joyware.constant.SDK_ALARM_Ex_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_SOLARCELL_SYSTEM_FAULT_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.constant.SDK_ALARM_Ex_TYPE; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java index d38cb41..8a84790 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java index 9807599..c45d6fd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_TRFAFFIC_LIGHT_SOURCE; +import com.leaper.web.lib.joyware.enumeration.EM_TRFAFFIC_LIGHT_SOURCE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * (交通灯事件)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java index f6f7c42..f97d3a2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java index 19e060d..9ab2d2e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java index 06fa85f..6707f78 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Auxs.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/Auxs.java similarity index 56% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Auxs.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/Auxs.java index d830c11..1e2183e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Auxs.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/Auxs.java @@ -1,13 +1,13 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java index 386b866..ba9c5f7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import java.util.Arrays; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ABLOCK_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ABLOCK_INFO.java index 05ba870..1f23815 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ABLOCK_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java index 549c1f9..ee03de1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java @@ -1,7 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.*; +import com.leaper.web.lib.joyware.enumeration.*; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.*; /** * @author 47081 @@ -10,7 +11,7 @@ import com.zhehekeji.web.lib.joyware.enumeration.*; * @date 2021/2/7 */ public class CFG_ACCESS_CONTROL_ASG extends NetSDKLib.SdkStructure { - /** 通行模式,{@link com.zhehekeji.web.lib.joyware.enumeration.EM_PASS_MODE} */ + /** 通行模式,{@link EM_PASS_MODE} */ public int emPassMode; /** 开门速度档位, 范围:0-7,对应1-8档 */ public int nOpenDoorSpeed; @@ -28,7 +29,7 @@ public class CFG_ACCESS_CONTROL_ASG extends NetSDKLib.SdkStructure { public int emCollisionMode; /** 设备音量等级共8档, 范围:0-7, 0级表示静音 */ public int nVolumeLevel; - /** 闸机断电以后门摆动放向,{@link com.zhehekeji.web.lib.joyware.enumeration.EM_DIRECTION_AFTER_POWER_OFF} */ + /** 闸机断电以后门摆动放向,{@link EM_DIRECTION_AFTER_POWER_OFF} */ public int emDirectionAfterPowerOff; /** 工作模式,{@link EM_ASG_WORK_MODE} */ public int emWorkMode; // 工作模式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java index a4f2548..7f7c6ec 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java @@ -1,11 +1,12 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.CFG_ACCESS_PROPERTY_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; import java.util.Arrays; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_ADDRESS_LEN; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_PASSWORD_LEN; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_ADDRESS_LEN; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_PASSWORD_LEN; /** * @author 47081 @@ -39,7 +40,7 @@ public class CFG_ACCESS_GENERAL_INFO extends NetSDKLib.SdkStructure { /** 工程密码 */ public byte[] szProjectPassword = new byte[MAX_PASSWORD_LEN]; - /** 门禁通道单双向配置,对应枚举{@link com.zhehekeji.web.lib.joyware.enumeration.CFG_ACCESS_PROPERTY_TYPE} */ + /** 门禁通道单双向配置,对应枚举{@link CFG_ACCESS_PROPERTY_TYPE} */ public int emAccessProperty; /** AB互锁信息 */ public CFG_ABLOCK_INFO stuABLockInfo; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_VOICE.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_VOICE.java index 708c11d..acc8349 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_VOICE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.CFG_EM_VOICE_ID; +import com.leaper.web.lib.joyware.enumeration.CFG_EM_VOICE_ID; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java index 61cee98..6a69c1f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.CFG_EM_ASG_VOICE_DIRECTION; -import com.zhehekeji.web.lib.joyware.enumeration.CFG_EM_VOICE_ID; +import com.leaper.web.lib.joyware.enumeration.CFG_EM_ASG_VOICE_DIRECTION; +import com.leaper.web.lib.joyware.enumeration.CFG_EM_VOICE_ID; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java index ac15a3c..b044c28 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java index 3fb1568..206e92c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java index 1ecf2ca..4460d77 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java index 1b2ca74..3d081de 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java index a2a183a..0b83136 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java index e3ae135..5f25dff 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_MAX_LOWER_MATRIX_OUTPUT; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_MAX_LOWER_MATRIX_OUTPUT; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java index 32b7af7..1c10bf9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java index 3d59ec9..ccc6abb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java index 74059d0..ad0f439 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java index a532806..b3564a5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java index cf945c3..f7f2eeb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 视频分析能力集 简化结构体,用于查询IPC是否有人脸识别能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java index 91c545b..e1acc4f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java index 507badf..c14abc3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_SCENE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_SCENE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_SCENE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_SCENE.java index 8f93190..9b12f52 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_SCENE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_CAP_SCENE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 场景能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java index 03fdbe4..0f70fad 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java index aed5af1..b122bcc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java index 866c891..a7f9106 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 设备安装位置的GPS坐标信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java index 19822ff..efe7acb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_NAME_LEN; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.*; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_NAME_LEN; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.*; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java index f0779a9..5308d8c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 联动业务大类选项 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java index 99b5807..cfd9bcc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java index 8a75804..121fd62 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java index 15f8d03..c684bcc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java index 6425306..510a148 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java index 299cb82..47eb16a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java index b25bca2..a76b19b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 人数统计大类场景 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java index 6b94c9c..5eb7880 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java index bf84d61..481fca7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java index 1ecbf42..0eaeae0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java index eca5f93..99cd274 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java index 4ae06c7..9d2ec12 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java @@ -1,13 +1,13 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java index 11e114e..aa272ae 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java index 7cbdbac..b7c9f4d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java index 8ca39b7..8b9fe38 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java index d553432..41c8961 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java index a5d4c8d..2d4ce4d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java @@ -1,14 +1,16 @@ -package com.zhehekeji.web.lib.joyware.structure;/** +package com.leaper.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.NET_EM_MASK_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_MOSAIC_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_MASKTYPE_COUNT; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_MOSAICTYPE_COUNT; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_MASKTYPE_COUNT; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_MOSAICTYPE_COUNT; /** * @author 47081 @@ -35,7 +37,7 @@ public class CFG_PTZ_PRIVACY_MASKING extends NetSDKLib.SdkStructure { public int nMaskTypeCount; /** * 支持的遮挡块形状，没有该项配置时默认支持矩形 - * 枚举参考{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_MASK_TYPE} + * 枚举参考{@link NET_EM_MASK_TYPE} */ public int[] emMaskType = new int[MAX_MASKTYPE_COUNT]; /** @@ -56,7 +58,7 @@ public class CFG_PTZ_PRIVACY_MASKING extends NetSDKLib.SdkStructure { public int nMosaicTypeCount; /** * 支持的马赛克类型(SetMosaicSupport为true时该能力有效，没有该项配置时默认支持24x24大小马赛克) - * 枚举值参考{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_MOSAIC_TYPE} + * 枚举值参考{@link NET_EM_MOSAIC_TYPE} */ public int[] emMosaicType = new int[MAX_MOSAICTYPE_COUNT]; } diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java index 423495d..b5f256b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java @@ -1,10 +1,11 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_SUPPORT_FOCUS_MODE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.CFG_COMMON_STRING_32; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_PROTOCOL_NAME_LEN; +import static com.leaper.web.lib.joyware.NetSDKLib.CFG_COMMON_STRING_32; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_PROTOCOL_NAME_LEN; /** * @author 47081 @@ -215,7 +216,7 @@ public class CFG_PTZ_PROTOCOL_CAPS_INFO extends NetSDKLib.SdkStructure { public int dwSupportViewRangeType; /** - * 支持的支持的焦距模式掩码,从低位到高位依次数,见{@link com.zhehekeji.web.lib.joyware.enumeration.EM_SUPPORT_FOCUS_MODE} + * 支持的支持的焦距模式掩码,从低位到高位依次数,见{@link EM_SUPPORT_FOCUS_MODE} */ public int dwSupportFocusMode; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java index 94ad598..4d6de61 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java index 7396f5e..ce8a92f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java index ab9e7eb..cde98d2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java index fd3b3f2..7f71ece 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 支持的规则 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_THERMO_GAIN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_THERMO_GAIN.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_THERMO_GAIN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_THERMO_GAIN.java index 29eb4a5..937fad3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_THERMO_GAIN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_THERMO_GAIN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java index 1980c0c..b8b35e8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java index f6db355..09c5066 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java index a3f5e1e..a073e06 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CROWD_CALIBRATION.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CROWD_CALIBRATION.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CROWD_CALIBRATION.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CROWD_CALIBRATION.java index 91b027a..2ac5aa7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CROWD_CALIBRATION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CROWD_CALIBRATION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java index 29ea43c..9e1b090 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.DH_MAX_PERSON_INFO_LEN; +import static com.leaper.web.lib.joyware.NetSDKLib.DH_MAX_PERSON_INFO_LEN; /** * className：CUSTOM_PERSON_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java index 57e395b..a7804f1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：DEV_DAHUA_RADAR_CONFIG diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java index f344c54..0055909 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_CAPTURE_PROCESS_END_TYPE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_TRIGGER_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_CAPTURE_PROCESS_END_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_TRIGGER_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java index 62c119b..1fb1c8e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_DRIVING_DIRECTION; +import com.leaper.web.lib.joyware.enumeration.EM_DRIVING_DIRECTION; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java index 0de2373..01835ed 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_CAPTURE_PROCESS_END_TYPE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_TRIGGER_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_CAPTURE_PROCESS_END_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_TRIGGER_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 事件类型 EVENT_IVS_CAR_DRIVING_OUT(车辆驶出事件)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java index f87ff52..ce2d1b2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.DH_MSG_OBJECT; -import com.zhehekeji.web.lib.joyware.NetSDKLib.DH_POINT; -import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_EVENT_FILE_INFO; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.DH_MSG_OBJECT; +import com.leaper.web.lib.joyware.NetSDKLib.DH_POINT; +import com.leaper.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.leaper.web.lib.joyware.NetSDKLib.NET_EVENT_FILE_INFO; /** * 事件类型EVENT_IVS_DENSITYDETECTION(人员密集度检测)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java index 3b84eca..1604fb4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @description: (倒地报警事件)对应数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java index 07f3ab9..96c18b6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java index 08e2e8d..37b1aba 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java index 0c4a0e1..cc4f375 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.leaper.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; +import com.leaper.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java index 1ca5fbe..6eeb223 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：DEV_EVENT_NONMOTOR_ENTRYING_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java index c4f5079..0c95445 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.leaper.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; +import com.leaper.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java index e23ec04..7c169b6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 事件 路侧停车位手动抓图 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java index b1a84dc..ebc39cc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 事件类型 EVENT_IVS_PARKING_LOT_STATUS_DETECTION(室外停车位状态检测)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java index 4d4e1b4..409f17c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java @@ -1,15 +1,16 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.DH_MAX_DETECT_REGION_NUM; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.HDBJ_MAX_OBJECTS_NUM; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.DH_MAX_DETECT_REGION_NUM; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.HDBJ_MAX_OBJECTS_NUM; /** * @author 47081 * @version 1.0 * @description 事件类型 - * {@link com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_SIGN_ABNORMAL}(店招异常事件)对应的数据块描述信息 + * {@link EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_SIGN_ABNORMAL}(店招异常事件)对应的数据块描述信息 * @date 2020/11/17 */ public class DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java index 8aae9bc..2565965 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java @@ -1,15 +1,16 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.HDBJ_MAX_OBJECTS_NUM; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.SDK_MAX_DETECT_REGION_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.HDBJ_MAX_OBJECTS_NUM; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.SDK_MAX_DETECT_REGION_NUM; /** * @author 47081 * @version 1.0 * @description 事件类型 - * {@link com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_WINDOW_POST}(橱窗张贴事件)对应的数据块描述信息 + * {@link 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/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java index aa2bbf2..7b6c464 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java index 928568a..751fd4c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.leaper.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; +import com.leaper.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java index fc0b4b1..9d38b7a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_EVENT_NAME_LEN; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_EVENT_NAME_LEN; /** * 事件类型 (车间距过小报警事件）对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java index 82f8eee..87c18c4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; import java.text.NumberFormat; @@ -8,7 +9,7 @@ import java.text.NumberFormat; * @author 47081 * @version 1.0 * @description 事件类型 - * {@link com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT} + * {@link EM_EVENT_IVS_TYPE#EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT} * (交通-行人闯红灯事件)对应的数据块描述信息 * @date 2020/10/14 */ diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java index 23b72a3..819944a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 事件类型(道路安全预警)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java index 4445477..19cc393 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import java.util.Arrays; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_RADAR_CONFIG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_RADAR_CONFIG.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_RADAR_CONFIG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_RADAR_CONFIG.java index 9f599a8..5a7a44d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_RADAR_CONFIG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DEV_RADAR_CONFIG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：DEV_RADAR_CONFIG diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DHDEVTIME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DHDEVTIME.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DHDEVTIME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DHDEVTIME.java index 33fe316..4a89742 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DHDEVTIME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DHDEVTIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 日志信息里的时间定义 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java index 3d89856..42d234b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryDeviceLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java index 3aed7b8..4fcdc9f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import java.nio.charset.Charset; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_LOG_ITEM.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DH_LOG_ITEM.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_LOG_ITEM.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DH_LOG_ITEM.java index f69b2a3..c9dd247 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_LOG_ITEM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DH_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DISKCTRL_PARAM.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/DISKCTRL_PARAM.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DISKCTRL_PARAM.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/DISKCTRL_PARAM.java index 42649ce..1e17960 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DISKCTRL_PARAM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/DISKCTRL_PARAM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java index 25234b3..32c533f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; public enum EM_CITIZENIDCARD_SEX_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java index 493eb1a..95a9396 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; /** * 健康码状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java index dd2bac6..0a61fb5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; /** * 身份证消息类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EmptyStructure.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/EmptyStructure.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EmptyStructure.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/EmptyStructure.java index 8786cbf..cccc4d7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EmptyStructure.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/EmptyStructure.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java index cb2e32a..8477d44 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java index aa06fd7..9ba6c27 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java index 535ffec..03623d8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.*; +import static com.leaper.web.lib.joyware.NetSDKLib.*; /** * className：FACERECOGNITION_PERSON_INFOEX diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java index 2784212..47075a5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 手动抓拍参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java index 426f3fb..3ded5e9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 测温查询候选人信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java index 1130c0a..2ffe2a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java index caefb6d..275942d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java index b55862f..33fb3b1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java index 7d0fc5b..55eb00f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java index 03c90b0..78e93f1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_TSCHE_DAY_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_TSCHE_DAY_NUM; /** * 电视墙预案时间表 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxNameByteArrInfo.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MaxNameByteArrInfo.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxNameByteArrInfo.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MaxNameByteArrInfo.java index bdaa459..072259d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxNameByteArrInfo.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MaxNameByteArrInfo.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java index 31bca40..6afe1c3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 场景子类型字符串字节数组对象 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java index 1aae93d..745c3fd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java index a679bb8..79240f6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java index 664fed5..a7f99ab 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java index ced0b3a..9db4ecb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_ALGORITHM_PARTITION_TYPE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_STORAGE_PACKET_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_ALGORITHM_PARTITION_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_STORAGE_PACKET_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java index 02fb162..aca53a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java index 0752214..cba3c62 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java index 2c65ee3..d146bac 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java index ec9d6ea..6158895 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java index e8fc3d7..aa0ec23 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java index d64e509..7662684 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BATTERY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_BATTERY_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BATTERY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_BATTERY_INFO.java index 36970b7..1460c42 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BATTERY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_BATTERY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_BATTERY_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java index b9ae2dc..2784830 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java @@ -1,12 +1,13 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 * @version 1.0 * @description 刻录参数配置 - * 对应枚举{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_BURN_PARAM} + * 对应枚举{@link 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/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java index 56aa163..9a6d0d7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java index 25f032a..dc77da8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_CAMERASTATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CB_CAMERASTATE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_CAMERASTATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CB_CAMERASTATE.java index 33c7172..935d49f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_CAMERASTATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CB_CAMERASTATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设备状态回调结果 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java similarity index 59% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java index 8b5bf85..5c31b34 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_HEATMAP_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -11,7 +12,7 @@ import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_CB_VIDEOSTAT_HEATMAP extends NetSDKLib.SdkStructure { public int nToken; /** - * 热度图类型,对应枚举类型{@link com.zhehekeji.web.lib.joyware.enumeration.EM_HEATMAP_TYPE} + * 热度图类型,对应枚举类型{@link EM_HEATMAP_TYPE} */ public int emHeatMapType; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java index 512b472..13bca02 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; import java.util.Arrays; @@ -8,7 +9,7 @@ import java.util.Arrays; * @author 47081 * @version 1.0 * @description 门禁假日计划配置 - * 对应枚举类型{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE} + * 对应枚举类型{@link 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 +23,7 @@ public class NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO extends NetSDKLib.SdkSt */ public boolean bSchdule; /** - * {@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} 配置的下标 + * {@link NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} 配置的下标 */ public int nGroupNo; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java index 2f7c102..5d6c276 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; import java.util.Arrays; @@ -8,7 +9,7 @@ import java.util.Arrays; * @author 47081 * @version 1.0 * @description 门禁假日组配置,对应枚举 - * {@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} + * {@link 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/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java index 57ad013..abea764 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java index 712e19f..19e8c9e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 音频属性 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java index 952ba4f..59dbe26 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.enumeration.EM_PLAY_WITH_MODE; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_PLAY_WITH_MODE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java similarity index 68% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java index 181d178..6291902 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * 校准框信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java index b29e39e..8c9cddb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 门禁能力集的结构体 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java index 11d8108..bf78c0f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 支持的音频格式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java index 06163fe..63c4f8f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java index c7affcb..3ed3bca 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_CAN_START_STREAM; -import com.zhehekeji.web.lib.joyware.enumeration.EM_COMPOSIT_CHANNEL_BIND_MODE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_IS_RECORD; +import com.leaper.web.lib.joyware.enumeration.EM_CAN_START_STREAM; +import com.leaper.web.lib.joyware.enumeration.EM_COMPOSIT_CHANNEL_BIND_MODE; +import com.leaper.web.lib.joyware.enumeration.EM_IS_RECORD; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java index b4d42f5..972b9dd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * 录像保存天数配置 (对应枚举 {@link NET_EM_CFG_FILE_HOLD_DAYS} ) diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java index 2dca097..153bdb2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java index 3485ae6..cc18fc6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java index 12a2d49..02bb848 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java similarity index 62% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java index 671793e..4c293f3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java @@ -1,12 +1,13 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 119178 * @version 1.0 * @description 配置二维码有效时间 - * 对应枚举{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_QR_CODE} + * 对应枚举{@link 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/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZE.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZE.java index f61272f..260aca7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * 物体尺寸 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java index 40b2b39..16b37c3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** 尺寸过滤器 */ public class NET_CFG_SIZEFILTER_INFO extends SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java index 7ee7e5b..b0b1346 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; import com.sun.jna.Union; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java index 7fef231..a79ad56 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO extends NetSDKLib.SdkStructure{ public int dwSize; // 结构体大小 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java index 694a08e..42c1143 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java index 309bff9..024d953 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_ENTRY_DIRECTION; -import com.zhehekeji.web.lib.joyware.enumeration.EM_ENTRY_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_ENTRY_DIRECTION; +import com.leaper.web.lib.joyware.enumeration.EM_ENTRY_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMM_PROP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMM_PROP.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMM_PROP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMM_PROP.java index 59e653d..7f86de8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMM_PROP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMM_PROP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_COMM_PROP diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java index 2762d94..bd0edea 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java index 442b917..03ad185 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java index f5130c6..d3c608f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * * @author 119178 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java index 654fb0c..4fb5f14 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_WINDOWS_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_WINDOWS_NUMBER; /** * 录播主机模式信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java index 6d78529..8cd15cb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 录播主机窗口信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java index 7dfbb36..1a00c0b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.*; +import static com.leaper.web.lib.joyware.NetSDKLib.*; /** * 组合通道信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE.java index 486735e..3421a74 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE.java @@ -1,12 +1,12 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_CAN_START_STREAM; -import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_STATE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_IS_RECORD; +import com.leaper.web.lib.joyware.enumeration.EM_CAN_START_STREAM; +import com.leaper.web.lib.joyware.enumeration.EM_COURSE_STATE; +import com.leaper.web.lib.joyware.enumeration.EM_IS_RECORD; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_64; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_64; /** * 课程信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java index 846cb35..297b38e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 录播主机添加模式返回信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java index 4d49d68..88152a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE_INFO.java similarity index 68% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE_INFO.java index e7ca957..c9899d1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_64; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_64; /** * 课程信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_RESULT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE_RESULT.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_RESULT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE_RESULT.java index 0a262aa..a8d3841 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_RESULT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_COURSE_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 课程信息和ID diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CPU_INFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CPU_INFO.java index 68c4e66..56d4623 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CPU_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_CPU_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CPU_STATUS.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CPU_STATUS.java index f1aa0ed..dbfac1e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CPU_STATUS.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_CPU_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_CPU_NUM; /** * className：NET_CPU_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java index faa34fd..557b53c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_VIDEOINPUTS_SERVICE_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_VIDEOINPUTS_SERVICE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 视频输入信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java index 6c3be0f..cb73080 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java index 4634929..355a863 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java index cc23b64..208604e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java index ec1114a..75b1672 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PATH; /** * CLIENT_DownLoadMultiFile 接口参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java index 399bb3a..543ff6c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 文件方式下载选项 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java index bffa63e..709bc42 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PATH; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java index cd21ebc..d28bc57 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 疫区经历信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java index f07c992..f06acfc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java index d571a80..6b74ed2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACE_PIC_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACE_PIC_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACE_PIC_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACE_PIC_INFO.java index 41d788c..19d7a3f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACE_PIC_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FACE_PIC_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FAN_INFO.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FAN_INFO.java index 7135e54..14cf00b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FAN_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; /** * className：NET_FAN_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FAN_STATUS.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FAN_STATUS.java index 8b8bf57..4fbce87 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FAN_STATUS.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_FAN_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_FAN_NUM; /** * className：NET_FAN_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java index ad0b8ed..b61ff1f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java index b7a6e32..3b5a6bd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java index 334d8e2..464ff5b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_EX.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FLOORS_EX.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_EX.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FLOORS_EX.java index 26c1f2f..4d25c1c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_EX.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FLOORS_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FLOORS_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FLOORS_INFO.java index 98bd28b..14de702 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FLOORS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java index a3a268e..194b3c5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 跟随车辆报警自定义信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java index 57a6b53..773ccbd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java index 2053bde..118e0d8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_HEALTH_CODE_INFO extends NetSDKLib.SdkStructure { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IDCARD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IDCARD_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IDCARD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IDCARD_INFO.java index 862dcd6..67eed7c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IDCARD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IDCARD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_IDCARD_INFO extends NetSDKLib.SdkStructure { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java index 1e19c36..f995106 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ADD_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ADD_COURSE.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ADD_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ADD_COURSE.java index 1bb54c2..32e15aa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ADD_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ADD_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 添加新的课程记录 入参指针 {@link NetSDKLib#CLIENT_AddCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java index cd72ce5..962cf4b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; -import com.zhehekeji.web.lib.joyware.enumeration.EM_CUSTOM_DEV_PROTOCOL_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_CUSTOM_DEV_PROTOCOL_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * CLIENT_AsyncAddCustomDevice 接口输入参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java index c52aae7..9ea6094 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_IN_ATTACH_TRAFFICLIGHT_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java index 00ab41a..5a7695a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java index 3423823..ea2c47d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_CAMERASTATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_CAMERASTATE.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_CAMERASTATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_CAMERASTATE.java index dfb8122..f23c066 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_CAMERASTATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_CAMERASTATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java index 877ec94..9c3b0dd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机添加模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java index 87d594c..dc574a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机删除模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java index 92be5f9..3df15be 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 录播主机获取模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java index 5736620..799fcb6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机修改模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java index 263ec54..1bb41a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取组合通道信息入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java index 9dc2a59..d43e498 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取锁定状态入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java index d78320b..709bebd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 锁定和解锁组合通道和逻辑通道入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java index 594b3d4..0f9288b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置组合通道信息入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java index 10b9b85..353fb5c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 组合通道信息更新到time入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java index c9b6bfd..8b1bfa9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取指定教室的录像信息入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java index cff82e8..5f1e32f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取当前课程已录制时间入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java index a568798..2a1c71c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; /** * 设置指定教室的录像信息入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java index d8795ad..a4345c1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 录像信息更新到time入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java index 64fa3a8..36d036a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 删除课程记录 入参指针 {@link NetSDKLib#CLIENT_DeleteCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java index 64cddbe..8958eaa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_IN_DELIVER_USER_PICTURE diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java index 1105266..f2939c9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_DOWNLOAD_FILE_TYPE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_SUBCLASSID_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_DOWNLOAD_FILE_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_SUBCLASSID_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java index a896cc6..0b222dd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java index 994b90a..297e778 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @version 1.0 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java index 7fabb85..fbb472d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java index 5973669..0899958 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java index 348c08d..875cf72 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机逻辑通道号入参，对应接口 {@link NetSDKLib#CLIENT_GetLogicChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java index af44fe4..0dee5df 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取录像模式入参，对应接口{@link NetSDKLib#CLIENT_GetCourseRecordMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java index 39d4540..022a9a2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取默认真实通道号入参，对应接口 {@link NetSDKLib#CLIENT_GetDefaultRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java index bf79740..d3f9416 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java index 9137a75..5d47754 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java index cc543cf..dfc386d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机通道输入媒体介质入参 ，对应接口{@link NetSDKLib#CLIENT_GetInputChannelMedia} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java index 9966c6f..9925470 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取真实预览通道号 入参 {@link NetSDKLib#CLIENT_GetRealPreviewChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java index 7701845..3874d68 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取录像状态 入参 {@link NetSDKLib#CLIENT_GetRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java index d813936..96327a1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_HEATMAP_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -26,7 +27,7 @@ public class NET_IN_GET_VIDEOSTAT_HEATMAP extends NetSDKLib.SdkStructure { */ public NET_TIME stuEndTime; /** - * Ai热度图类型,枚举值类型{@link com.zhehekeji.web.lib.joyware.enumeration.EM_HEATMAP_TYPE} + * Ai热度图类型,枚举值类型{@link EM_HEATMAP_TYPE} */ public int emHeatMapType; public NET_IN_GET_VIDEOSTAT_HEATMAP(){ diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java index 0a22f22..5cedb4f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 修改课程记录 入参指针 {@link NetSDKLib#CLIENT_ModifyCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java index ef8b2c3..7ef7c62 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 修改停车记录信息 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java index daee9b8..d45272d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; /** * 获取预案时间表 入参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java index f58e2ba..2d2bf7c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; /** * 电视墙获取使能 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java index 1c9d209..fcb6079 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; /** * 设置预案时间表 入参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java index 4a56367..2b3f044 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; /** * 电视墙设置使能 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java index 18bffc1..ae38334 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java index 37e87e5..1e9ae5d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @description: diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java index d331f47..a9c75fd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.fPTZStatusProcCallBack; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.fPTZStatusProcCallBack; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java index 5a09c07..4c1c40a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java index c495c42..4506e29 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 查询课程视频信息入参 {@link NetSDKLib#CLIENT_DoQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java index c8c0960..48a9d8c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 关闭课程视频查询入参 {@link NetSDKLib#CLIENT_CloseQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java index d9b2cbf..e0a53be 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_LOCK_TYPE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_RECORD_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_COURSE_LOCK_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_COURSE_RECORD_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; /** * 开始查询课程视频信息入参 {@link NetSDKLib#CLIENT_OpenQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java index 672dd31..77b0353 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 结束查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourseClose} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java index 6f4c39d..bb9d70a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 开始查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourseOpen} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java index 2dad68f..36bc997 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.fRadarAlarmPointInfoCallBack; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.fRadarAlarmPointInfoCallBack; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java index a6d0dfb..6c3ec82 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取景物点支持的能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java index 0fbddf4..a7a7912 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 分页获取 信息标注信息列表 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java index c1355d6..452055b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_SHAPE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_SHAPE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COMMON_STRING_64; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_POLYGON_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_COMMON_STRING_64; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_POLYGON_NUM; /** * 设置景物点，原编号的景物点将会被覆盖 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java index 577fdc5..eed7518 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 以景物标注点为中心，进行三维定位的输 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_2DCODE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_2DCODE.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_2DCODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_2DCODE.java index 93da704..51616c7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_2DCODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_2DCODE.java @@ -1,7 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth; +import com.leaper.web.lib.joyware.enumeration.NET_EM_2DCODE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth; import com.sun.jna.Pointer; /** @@ -17,7 +18,7 @@ public class NET_IN_SET_2DCODE extends NetSDKLib.SdkStructure { public int dwSize; /** * 二维码类型, - * 对应枚举类型{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_2DCODE_TYPE} + * 对应枚举类型{@link NET_EM_2DCODE_TYPE} */ public int em2DCodeType; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java index decbda5..5b1128b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 设置逻辑通道号和真实通道号的绑定关系入参 ，对应接口 {@link NetSDKLib#CLIENT_SetBlindRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java index 5b5f76e..456e843 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java index 69da076..baa7251 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java index 57c4a81..702d378 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_RECORD_MODE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_RECORD_MODE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置录像模式入参，对应接口{link NetSDKLib#CLIENT_SetCourseRecordMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java index 47cdccb..33424fe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 开启/关闭指定通道录像入参 {@link NetSDKLib#CLIENT_SetCourseRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java index cf253ab..d7f7d08 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_PARKINGSPACE_STATE; +import com.leaper.web.lib.joyware.enumeration.EM_PARKINGSPACE_STATE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置停车车位状态 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java index 162c64c..62d3708 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS; -import com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_EVENT_IVS; +import com.leaper.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 按照事件类型抓图 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java index 2019bb5..32c7149 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.fSearchDevicesCBEx; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.fSearchDevicesCBEx; import com.sun.jna.Pointer; public class NET_IN_STARTSERACH_DEVICE extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java index c420564..8e8105d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_VOLUME_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_VOLUME_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * NET_QUERY_DEV_STORAGE_NAMES 类型接口 输入参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java index 162802e..a91f349 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java index f7a8be5..0c87835 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java index 896ce41..ad7bfa4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ISCSI_TARGET.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ISCSI_TARGET.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ISCSI_TARGET.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ISCSI_TARGET.java index ea60db4..a11bdb6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ISCSI_TARGET.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_ISCSI_TARGET.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_ISCSI_TARGET extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java index 92d35f4..b473645 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** 事件类型 EVENT_IVS_LEFTDETECTION (物品遗留事件) 对应的规则配置 */ public class NET_LEFTDETECTION_RULE_INFO extends SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java index 34bcee4..53bdb3e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java index ebc2ead..7daefad 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_TRFAFFIC_LIGHT_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_TRFAFFIC_LIGHT_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 交通灯的持续时间，时间单位毫秒 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java index 4b20983..7886732 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_LOGIC_CHANNEL; +import com.leaper.web.lib.joyware.enumeration.NET_EM_LOGIC_CHANNEL; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 通道信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java index 9e4566e..01dc334 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 停车位的数据信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java index fb9dd11..0bc3789 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java index 390bee7..dcf04f7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java index 96a2d2e..8172d26 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PATH; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java index 6efd8db..588f290 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEMORY_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEMORY_INFO.java index 9f56f20..81cf86b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEMORY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_MEMORY_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEMORY_STATUS.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEMORY_STATUS.java index b36fdec..c48e693 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MEMORY_STATUS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_MEMORY_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java index 8d1a769..0256d4a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; /** * 电视墙预案名称 拆分自{@link NET_IN_MONITORWALL_GET_COLL_SCHD} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java index 93628f0..17142e1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; /** * 电视墙使能信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_NAME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_NAME.java similarity index 64% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_NAME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_NAME.java index 7bc08be..1f19152 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_NAME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITORWALL_NAME.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; /** * 电视墙名称 拆分自{@link NET_IN_MONITORWALL_GET_ENABLE} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java index 733a745..0eb2bfe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java index e56988c..433603a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java index 0b7ca24..510dab7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 添加新的课程记录 出参指针 {@link NetSDKLib#CLIENT_AddCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java index b25325a..5510341 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /*** * CLIENT_AsyncAddCustomDevice 接口输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java index 1f3d5b5..7ee783e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_OUT_ATTACH_TRAFFICLIGHT_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java index 045a13b..c5f45a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java index e882207..450e899 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java index ea8c469..d107bf3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * {@link NetSDKLib#CLIENT_AttachCameraState} 输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java index a4cb23e..dd45c33 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机添加模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java index d172303..a612070 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机删除模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java index b138ca4..9a1bd8e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机获取模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java index 088e292..6b7b67b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机修改模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java index c8dd98f..020b455 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取组合通道信息出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java index 292bf64..d0c66c6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取锁定状态出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java index 7ec3efa..5f0a41c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 锁定和解锁组合通道和逻辑通道出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java index 59a35a6..7ad9195 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置组合通道信息出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java index 51095cc..0c20d06 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 组合通道信息更新到time出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java index 7ab6075..88c5d55 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; /** * 获取指定教室的录像信息出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java index bf2de00..fb433f9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取当前课程已录制时间出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java index 4824c23..0dd7585 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置指定教室的录像信息出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java index 21df743..c7c0cd4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 录像信息更新到time出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java index fef6fd3..7a18f31 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 删除课程记录 出参指针 {@link NetSDKLib#CLIENT_DeleteCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java index 5c7de40..452c792 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_OUT_DELIVER_USER_PICTURE diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java index 9074ea8..57cf4a5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 批量下载文件 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java index 5091d7e..4f96b7b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java index d590900..c6d830c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @version 1.0 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java index be9022f..5f86873 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java index b95651f..d45f642 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java index ea8e7de..dfd43b4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机默认真实通道号出参，对应接口 {@link NetSDKLib#CLIENT_GetLogicChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java index 7ff88b5..c179e46 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_RECORD_MODE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_RECORD_MODE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取录像模式出参，对应接口{@link NetSDKLib#CLIENT_GetCourseRecordMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java index e44eac2..6952adc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取默认真实通道号出参，对应接口 {@link NetSDKLib#CLIENT_GetDefaultRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java index e10f75b..565b1c0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java index e140949..0037034 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java index 5a3ca9f..1c6d846 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_ENUM_INPUT_CHANNEL_MEDIA; +import com.leaper.web.lib.joyware.enumeration.NET_ENUM_INPUT_CHANNEL_MEDIA; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机通道输入媒体介质出参 ，对应接口{@link NetSDKLib#CLIENT_GetInputChannelMedia} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java index b173428..27a1f6e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取真实预览通道号 出参 {@link NetSDKLib#CLIENT_GetRealPreviewChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java index 781bfa3..f6dbf12 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取录像状态 出参 {@link NetSDKLib#CLIENT_GetRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java index 7ddefce..90a0925 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java index 1a74ec0..37551cb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 修改课程记录 出参指针 {@link NetSDKLib#CLIENT_ModifyCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java index 656ad36..747834e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 修改停车记录信息 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java index 491f987..453de52 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; /** * 获取预案时间表 出参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java index 8259bf6..c648d79 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; /** * 电视墙获取使能 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java index c730e2c..f45e98f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置预案时间表 出参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java index adb6de6..b619e21 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 电视墙设置使能 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java index 20955bd..be26b90 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.enumeration.EM_REASON_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -18,7 +19,7 @@ public class NET_OUT_PRE_UPLOAD_REMOTE_FILE extends NetSDKLib.SdkStructure { */ public boolean bContinue2Upload; /** - * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link com.zhehekeji.web.lib.joyware.enumeration.EM_REASON_TYPE} + * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link EM_REASON_TYPE} */ public int emType; public NET_OUT_PRE_UPLOAD_REMOTE_FILE(){ diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java index e10dd25..319e7dd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 订阅云台元数据接口输输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java index 6c19f36..0669d97 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java index 085e4e5..37ced26 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 查询课程视频信息出参 {@link NetSDKLib#CLIENT_DoQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java index 6d4835d..3c105a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 关闭课程视频查询出参 {@link NetSDKLib#CLIENT_CloseQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java index ef9ddc3..eeb9cd3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 开始查询课程视频信息出参 {@link NetSDKLib#CLIENT_OpenQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java index 6503236..7ef2616 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 结束查询课程 出参 {@link NetSDKLib#CLIENT_QueryCourseClose} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java index 1b73d3c..1968f14 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 开始查询课程 出参 {@link NetSDKLib#CLIENT_QueryCourseOpen} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java index 7ee0a87..9474395 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 订阅雷达的报警点信息出参(对应接口 CLIENT_AttachRadarAlarmPointInfo) diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java index b5eac5f..310237d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 获取景物点支持的能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java index 9b8f86d..330c6c1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_SCENICSPOT_POINTS_NUM; +import static com.leaper.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_SCENICSPOT_POINTS_NUM; /** * 分页获取 信息标注信息列表 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java index 74a0ea8..79611d2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置景物点，原编号的景物点将会被覆盖 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java index 5864552..0471ec2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 以景物标注点为中心，进行三维定位的 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java index 37c9ff3..3fbc234 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java index 7f9c040..4ad5cac 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置逻辑通道号和真实通道号的绑定关系出参 ，对应接口{@link NetSDKLib#CLIENT_SetBlindRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java index 178da22..47d614c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @version 1.0 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java index eed0953..85b93dd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java index da154fc..8ae5620 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置录像模式出参，对应接口{@link NetSDKLib#CLIENT_SetCourseRecordMode } diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java index 3c13b68..2904d97 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 开启/关闭指定通道录像出参 {@link NetSDKLib#CLIENT_SetCourseRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java index 1a393ec..94735cf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 设置停车车位状态 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java index 16c2297..732f93a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 按照事件类型抓图 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java index 7214596..6933fb5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_OUT_STARTSERACH_DEVICE extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java index fcb7a12..d2435a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_OUT_STORAGE_DEV_INFOS extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java index fe6dac8..4078476 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java index c9d21ab..f1608ae 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java index c74acea..d06951c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java index 9b940ff..3adfd32 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java index 1e2f516..97e2cdf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 停车位记录信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java index d10a27b..76a9566 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_PASSERBY_DB_OVERWRITE_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_PASSERBY_DB_OVERWRITE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java index cdea2cc..12be0dd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_PERSON_FEATURE_VALUE_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_POWER_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_POWER_INFO.java index 7f2bd8b..073fbd0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_POWER_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_POWER_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_POWER_STATUS.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_POWER_STATUS.java index 53feadf..4262326 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_POWER_STATUS.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_BATTERY_NUM; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_POWER_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_BATTERY_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_POWER_NUM; /** * className：NET_POWER_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java index 70dd296..bc762bc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 单个雷达报警点信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java index 5b4f00f..b432d41 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_RADAR_CARSPEED_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java index 74e563d..8d8900e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 上报的雷达报警点信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java index 7cf8bc1..54d1d09 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_RAID_ERR_DETAIL_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java index 428e05c..d1dc301 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_RAID_MEMBER_INFO extends NetSDKLib.SdkStructure { public NET_RAID_MEMBER_INFO() { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java index 0d0ab28..e2219a1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; public class NET_RECORDBACKUP_PROCESSTIME extends SdkStructure{ public NET_TIME_EX1 stuStartTime; // 开始时间 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORD_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORD_INFO.java index de9e977..181eb7e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORD_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_RECORD_COMPRESSION_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_COURSE_RECORD_COMPRESSION_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 录像文件信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java index f604b81..0bec319 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java index f3a634c..6764181 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java index 588c4d2..22e1d48 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java index c6425a1..9a5b058 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * 事件类型 EVENT_IVS_RIOTERDETECTION (人群聚集) 对应的规则配置 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java index 0e24950..d79ae93 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 景物信息记录能力集 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java index de1c7ee..1f02d71 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_SPECIAL_DAYS_SCHEDULE extends NetSDKLib.SdkStructure { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java index 4b446c4..b423bda 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_STJ77D5_RADAR_CONFIG diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_DEVICE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_DEVICE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_DEVICE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_DEVICE.java index 7908858..c76e2cd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_DEVICE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_DEVICE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_STORAGE_DEVICE extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_PARTITION.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_PARTITION.java index 64e9ad9..2b89ac3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_PARTITION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_STORAGE_PARTITION extends NetSDKLib.SdkStructure { public NET_STORAGE_PARTITION() { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java index ea614fe..7204b43 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_RAID.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_RAID.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_RAID.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_RAID.java index 6aaffad..ef4f177 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_RAID.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_RAID.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_STORAGE_RAID extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_TANK.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_TANK.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_TANK.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_TANK.java index 8c8fdcb..5a0ecd8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_TANK.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STORAGE_TANK.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; public class NET_STORAGE_TANK extends NetSDKLib.SdkStructure { public NET_STORAGE_TANK() { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_LOG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STU_LOG.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_LOG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STU_LOG.java index 3c086a8..67e6538 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_LOG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STU_LOG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 日志结构体 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_OLD_LOG.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STU_OLD_LOG.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_OLD_LOG.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STU_OLD_LOG.java index c90aa5a..33ecc46 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_OLD_LOG.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_STU_OLD_LOG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 旧的日志结构体,为了和新的对齐 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SYSTEM_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SYSTEM_STATUS.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SYSTEM_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SYSTEM_STATUS.java index 4e10a04..2b08d2a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SYSTEM_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_SYSTEM_STATUS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; public class NET_SYSTEM_STATUS extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java index 312811b..57558f1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; /** * className：NET_TEMPERATURE_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java index d2ea8fa..f1b2ac8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java index 6aace5e..0fe415d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_TEMPERATURE_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_TEMPERATURE_NUM; /** * className：NET_TEMPERATURE_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME.java index 066039c..596fc41 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import java.util.Date; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_EX.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_EX.java index 362ed0d..fb22fd0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX1.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_EX1.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX1.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_EX1.java index dad8a8d..dfc8af8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX1.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_EX1.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java index 176b433..610dffb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; public class NET_TIME_RECORDBACKUP_TASK extends SdkStructure{ public int nChannelCount; // 通道有效个数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java index dd290aa..b7afae7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_TRAFFICLIGHT_CHANNEL_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java index 480d7d3..c2f3a8b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_TRAFFICLIGHT_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java index 0556353..6a6659d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_DETECT_SENSOR_TYPE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_TRAFFIC_FLOW_STATUS; -import com.zhehekeji.web.lib.joyware.enumeration.EM_VIRTUAL_COIL_OCCUPANCY_STATUS; +import com.leaper.web.lib.joyware.enumeration.EM_DETECT_SENSOR_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_TRAFFIC_FLOW_STATUS; +import com.leaper.web.lib.joyware.enumeration.EM_VIRTUAL_COIL_OCCUPANCY_STATUS; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java index 4b830bb..260874e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_TRAFFIC_LIGHT_STATUS; +import com.leaper.web.lib.joyware.enumeration.NET_TRAFFIC_LIGHT_STATUS; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 信号灯指示灯状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TSECT_DAY.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TSECT_DAY.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TSECT_DAY.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TSECT_DAY.java index cfd98a8..50f74e9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TSECT_DAY.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_TSECT_DAY.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_TSCHE_SEC_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_TSCHE_SEC_NUM; /** * 拆分自{@link MONITORWALL_COLLECTION_SCHEDULE} diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java index b5c3902..6eca494 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_UPLOAD_FLAG; +import com.leaper.web.lib.joyware.enumeration.EM_UPLOAD_FLAG; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java index d001d7b..f853ce7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_USER_PICTURE_DATA diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java index 7c46a79..02be428 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_RECT; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.NET_RECT; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * 检测到的人信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java index 535ff90..08574c5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * NET_VEHICLE_OBJECT szDrivingDirection 的拆解字段 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java index 9b8effb..7f6e327 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_DETECT_SENSOR_TYPE; -import com.zhehekeji.web.lib.joyware.enumeration.EM_VEHICLEINOUT_CAR_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_DETECT_SENSOR_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_VEHICLEINOUT_CAR_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 车辆信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java index 39f7ae4..70bf156 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** * 事件类型EVENT_IVS_VIDEOABNORMALDETECTION(视频异常)对应的规则配置 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java index b6d57ca..5957348 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * className：NET_VIDEOIN_DEFOG_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java index af20fed..4bd1969 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java index 093e111..d47d6b5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_SOURCE_VIDEO_LOCATION; -import com.zhehekeji.web.lib.joyware.enumeration.EM_VIDEO_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_SOURCE_VIDEO_LOCATION; +import com.leaper.web.lib.joyware.enumeration.EM_VIDEO_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java index ec003a2..4305aa9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.leaper.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.leaper.web.lib.joyware.NetSDKLib.SdkStructure; /** 事件类型 EVENT_IVS_WANDERDETECTION( 徘徊事件)对应的规则配置 */ public class NET_WANDERDETECTION_RULE_INFO extends SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Net_PIC_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/Net_PIC_INFO.java similarity index 71% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Net_PIC_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/Net_PIC_INFO.java index 96960aa..69c2667 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Net_PIC_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/Net_PIC_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PATH; /** * className：Net_PIC_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectPath.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ObjectPath.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectPath.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ObjectPath.java index 878a740..2931dfb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectPath.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ObjectPath.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 图路径对象 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectUrl.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/ObjectUrl.java similarity index 53% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectUrl.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/ObjectUrl.java index a0eb086..2c7d147 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectUrl.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/ObjectUrl.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; +import com.leaper.web.lib.joyware.NetSDKLib; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_PATH; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java index ced3630..2cd61fc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE; +import com.leaper.web.lib.joyware.enumeration.EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTCOORDINATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/POINTCOORDINATE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTCOORDINATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/POINTCOORDINATE.java index 051d200..b46ef64 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTCOORDINATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/POINTCOORDINATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * PTZ景物坐标 8191x8191 坐标系 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTINFOS.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/POINTINFOS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTINFOS.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/POINTINFOS.java index 897455b..b9fe2da 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTINFOS.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/POINTINFOS.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_SHAPE_TYPE; +import com.leaper.web.lib.joyware.enumeration.NET_EM_SHAPE_TYPE; +import com.leaper.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COMMON_STRING_64; -import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_POLYGON_NUM; +import static com.leaper.web.lib.joyware.NetSDKLib.MAX_COMMON_STRING_64; +import static com.leaper.web.lib.joyware.NetSDKLib.NET_MAX_POLYGON_NUM; /** * PTZ景物点信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POSTION.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/POSTION.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POSTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/POSTION.java index d50b1fd..a5c0004 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POSTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/POSTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * PTZ 绝对坐标 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java index bb610e5..a5328b8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PlateNumber.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/PlateNumber.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PlateNumber.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/PlateNumber.java index 117f2ec..63bf5a0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PlateNumber.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/PlateNumber.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java index 9ceae48..822849a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 查询条件 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java index dae985c..420be67 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java index c5120b2..d83cd9c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryDeviceLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java index 9b9ba21..2865795 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; import java.nio.charset.Charset; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEV_TIME.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEV_TIME.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEV_TIME.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEV_TIME.java index 2317ab7..c7231f6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEV_TIME.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_DEV_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 日志信息里的时间定义 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_HARDDISK_STATE.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_HARDDISK_STATE.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_HARDDISK_STATE.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_HARDDISK_STATE.java index 2e9b699..6247edd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_HARDDISK_STATE.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_HARDDISK_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_LOG_ITEM.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_LOG_ITEM.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_LOG_ITEM.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_LOG_ITEM.java index 8d9ead5..318a405 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_LOG_ITEM.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_TSECT.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_TSECT.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_TSECT.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_TSECT.java index 306e64b..b04cf1b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_TSECT.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SDK_TSECT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java index 67e5f4b..ad4def3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java index 5842eb4..07cec06 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java index 83051db..9f8ad77 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java index 959bc27..097fa5c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @Author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/StringByteArrSixteen.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/StringByteArrSixteen.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/StringByteArrSixteen.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/StringByteArrSixteen.java index 6bd46b4..5ca1f9d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/StringByteArrSixteen.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/StringByteArrSixteen.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/USER_TIME_SECTION.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/USER_TIME_SECTION.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/USER_TIME_SECTION.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/USER_TIME_SECTION.java index aad3028..7891915 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/USER_TIME_SECTION.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/USER_TIME_SECTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_CAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/VA_CAPS_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_CAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/VA_CAPS_INFO.java index fa24625..815e083 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_CAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/VA_CAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 视频分析能力集 diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java b/web/src/main/java/com/leaper/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java rename to web/src/main/java/com/leaper/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java index 36b7be7..b1ba906 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java +++ b/web/src/main/java/com/leaper/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.joyware.structure; +package com.leaper.web.lib.joyware.structure; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.leaper.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/mapper/CameraIOConfigMapper.java b/web/src/main/java/com/leaper/web/mapper/CameraIOConfigMapper.java similarity index 71% rename from web/src/main/java/com/zhehekeji/web/mapper/CameraIOConfigMapper.java rename to web/src/main/java/com/leaper/web/mapper/CameraIOConfigMapper.java index 8ac7060..957209a 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/CameraIOConfigMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/CameraIOConfigMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.CameraIOConfig; +import com.leaper.web.entity.CameraIOConfig; import java.util.List; diff --git a/web/src/main/java/com/zhehekeji/web/mapper/CameraIOMapper.java b/web/src/main/java/com/leaper/web/mapper/CameraIOMapper.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/mapper/CameraIOMapper.java rename to web/src/main/java/com/leaper/web/mapper/CameraIOMapper.java index f992958..ee3e9ef 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/CameraIOMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/CameraIOMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.CameraIO; +import com.leaper.web.entity.CameraIO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/web/src/main/java/com/zhehekeji/web/mapper/CameraMapper.java b/web/src/main/java/com/leaper/web/mapper/CameraMapper.java similarity index 61% rename from web/src/main/java/com/zhehekeji/web/mapper/CameraMapper.java rename to web/src/main/java/com/leaper/web/mapper/CameraMapper.java index b2d8a2c..f701044 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/CameraMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/CameraMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.Camera; +import com.leaper.web.entity.Camera; public interface CameraMapper extends BaseMapper { } diff --git a/web/src/main/java/com/zhehekeji/web/mapper/CategoryMapper.java b/web/src/main/java/com/leaper/web/mapper/CategoryMapper.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/mapper/CategoryMapper.java rename to web/src/main/java/com/leaper/web/mapper/CategoryMapper.java index e8be1a9..5189abc 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/CategoryMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/CategoryMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.Category; +import com.leaper.web.entity.Category; import org.apache.ibatis.annotations.Select; public interface CategoryMapper extends BaseMapper { diff --git a/web/src/main/java/com/zhehekeji/web/mapper/CheckLogMapper.java b/web/src/main/java/com/leaper/web/mapper/CheckLogMapper.java similarity index 61% rename from web/src/main/java/com/zhehekeji/web/mapper/CheckLogMapper.java rename to web/src/main/java/com/leaper/web/mapper/CheckLogMapper.java index 985138c..f06189b 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/CheckLogMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/CheckLogMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.CheckLog; +import com.leaper.web.entity.CheckLog; public interface CheckLogMapper extends BaseMapper { } diff --git a/web/src/main/java/com/zhehekeji/web/mapper/LightSourceMapper.java b/web/src/main/java/com/leaper/web/mapper/LightSourceMapper.java similarity index 62% rename from web/src/main/java/com/zhehekeji/web/mapper/LightSourceMapper.java rename to web/src/main/java/com/leaper/web/mapper/LightSourceMapper.java index 7855b58..30b1336 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/LightSourceMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/LightSourceMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.LightSource; +import com.leaper.web.entity.LightSource; public interface LightSourceMapper extends BaseMapper { } diff --git a/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java b/web/src/main/java/com/leaper/web/mapper/OrderMapper.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java rename to web/src/main/java/com/leaper/web/mapper/OrderMapper.java index 22f6cc8..f5069c4 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/OrderMapper.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.Order; -import com.zhehekeji.web.pojo.OrderSearch; -import com.zhehekeji.web.pojo.OrderVO; +import com.leaper.web.entity.Order; +import com.leaper.web.pojo.OrderSearch; +import com.leaper.web.pojo.OrderVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/web/src/main/java/com/zhehekeji/web/mapper/RFIDMapper.java b/web/src/main/java/com/leaper/web/mapper/RFIDMapper.java similarity index 61% rename from web/src/main/java/com/zhehekeji/web/mapper/RFIDMapper.java rename to web/src/main/java/com/leaper/web/mapper/RFIDMapper.java index 91e8340..c8f5aba 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/RFIDMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/RFIDMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.RFID; +import com.leaper.web.entity.RFID; public interface RFIDMapper extends BaseMapper { } diff --git a/web/src/main/java/com/zhehekeji/web/mapper/SensorGunMapper.java b/web/src/main/java/com/leaper/web/mapper/SensorGunMapper.java similarity index 61% rename from web/src/main/java/com/zhehekeji/web/mapper/SensorGunMapper.java rename to web/src/main/java/com/leaper/web/mapper/SensorGunMapper.java index 3d22053..e6dcc94 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/SensorGunMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/SensorGunMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.SensorGun; +import com.leaper.web.entity.SensorGun; public interface SensorGunMapper extends BaseMapper { } diff --git a/web/src/main/java/com/zhehekeji/web/mapper/StockLogMapper.java b/web/src/main/java/com/leaper/web/mapper/StockLogMapper.java similarity index 61% rename from web/src/main/java/com/zhehekeji/web/mapper/StockLogMapper.java rename to web/src/main/java/com/leaper/web/mapper/StockLogMapper.java index 8563e92..5823074 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/StockLogMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/StockLogMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.StockLog; +import com.leaper.web.entity.StockLog; public interface StockLogMapper extends BaseMapper { } diff --git a/web/src/main/java/com/zhehekeji/web/mapper/StockMapper.java b/web/src/main/java/com/leaper/web/mapper/StockMapper.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/mapper/StockMapper.java rename to web/src/main/java/com/leaper/web/mapper/StockMapper.java index ed54dd1..2af9983 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/StockMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/StockMapper.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.Stock; +import com.leaper.web.entity.Stock; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/web/src/main/java/com/zhehekeji/web/mapper/StreetMapper.java b/web/src/main/java/com/leaper/web/mapper/StreetMapper.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/mapper/StreetMapper.java rename to web/src/main/java/com/leaper/web/mapper/StreetMapper.java index 786fb1a..126a438 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/StreetMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/StreetMapper.java @@ -1,9 +1,8 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.pojo.street.StreetSearch; -import com.zhehekeji.web.pojo.street.StreetVO; +import com.leaper.web.entity.Street; +import com.leaper.web.pojo.street.StreetVO; import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/web/src/main/java/com/zhehekeji/web/mapper/WarnMapper.java b/web/src/main/java/com/leaper/web/mapper/WarnMapper.java similarity index 60% rename from web/src/main/java/com/zhehekeji/web/mapper/WarnMapper.java rename to web/src/main/java/com/leaper/web/mapper/WarnMapper.java index 2f4c12d..5832142 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/WarnMapper.java +++ b/web/src/main/java/com/leaper/web/mapper/WarnMapper.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.mapper; +package com.leaper.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhehekeji.web.entity.Warn; -import com.zhehekeji.web.pojo.warn.WarnSearch; -import com.zhehekeji.web.pojo.warn.WarnVO; +import com.leaper.web.entity.Warn; +import com.leaper.web.pojo.warn.WarnSearch; +import com.leaper.web.pojo.warn.WarnVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/Cmd.java b/web/src/main/java/com/leaper/web/pojo/Cmd.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/pojo/Cmd.java rename to web/src/main/java/com/leaper/web/pojo/Cmd.java index acdeeea..9fbf169 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/Cmd.java +++ b/web/src/main/java/com/leaper/web/pojo/Cmd.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo; +package com.leaper.web.pojo; public enum Cmd { diff --git a/web/src/main/java/com/zhehekeji/web/pojo/IndexVO.java b/web/src/main/java/com/leaper/web/pojo/IndexVO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/pojo/IndexVO.java rename to web/src/main/java/com/leaper/web/pojo/IndexVO.java index 144666d..1c43e3e 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/IndexVO.java +++ b/web/src/main/java/com/leaper/web/pojo/IndexVO.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo; +package com.leaper.web.pojo; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/IpInfo.java b/web/src/main/java/com/leaper/web/pojo/IpInfo.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/pojo/IpInfo.java rename to web/src/main/java/com/leaper/web/pojo/IpInfo.java index e41735e..40fabd5 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/IpInfo.java +++ b/web/src/main/java/com/leaper/web/pojo/IpInfo.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo; +package com.leaper.web.pojo; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/OrderSaveReq.java b/web/src/main/java/com/leaper/web/pojo/OrderSaveReq.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/pojo/OrderSaveReq.java rename to web/src/main/java/com/leaper/web/pojo/OrderSaveReq.java index 3c9554e..7142e9c 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/OrderSaveReq.java +++ b/web/src/main/java/com/leaper/web/pojo/OrderSaveReq.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo; +package com.leaper.web.pojo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java b/web/src/main/java/com/leaper/web/pojo/OrderSearch.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java rename to web/src/main/java/com/leaper/web/pojo/OrderSearch.java index c70d7e3..4976440 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/OrderSearch.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo; +package com.leaper.web.pojo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/OrderVO.java b/web/src/main/java/com/leaper/web/pojo/OrderVO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/pojo/OrderVO.java rename to web/src/main/java/com/leaper/web/pojo/OrderVO.java index 5d5985f..ed5cade 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/OrderVO.java +++ b/web/src/main/java/com/leaper/web/pojo/OrderVO.java @@ -1,11 +1,9 @@ -package com.zhehekeji.web.pojo; +package com.leaper.web.pojo; -import com.zhehekeji.web.entity.Order; +import com.leaper.web.entity.Order; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - @Data public class OrderVO extends Order { diff --git a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraConfigSearchReq.java b/web/src/main/java/com/leaper/web/pojo/camera/CameraConfigSearchReq.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/pojo/camera/CameraConfigSearchReq.java rename to web/src/main/java/com/leaper/web/pojo/camera/CameraConfigSearchReq.java index 167d791..0bfd356 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraConfigSearchReq.java +++ b/web/src/main/java/com/leaper/web/pojo/camera/CameraConfigSearchReq.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.camera; +package com.leaper.web.pojo.camera; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraIOPtz.java b/web/src/main/java/com/leaper/web/pojo/camera/CameraIOPtz.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/pojo/camera/CameraIOPtz.java rename to web/src/main/java/com/leaper/web/pojo/camera/CameraIOPtz.java index 186e234..0788fe2 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraIOPtz.java +++ b/web/src/main/java/com/leaper/web/pojo/camera/CameraIOPtz.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.camera; +package com.leaper.web.pojo.camera; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraSearchReq.java b/web/src/main/java/com/leaper/web/pojo/camera/CameraSearchReq.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/pojo/camera/CameraSearchReq.java rename to web/src/main/java/com/leaper/web/pojo/camera/CameraSearchReq.java index cb327dc..58cbd07 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraSearchReq.java +++ b/web/src/main/java/com/leaper/web/pojo/camera/CameraSearchReq.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.camera; +package com.leaper.web.pojo.camera; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/camera/IOImport.java b/web/src/main/java/com/leaper/web/pojo/camera/IOImport.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/pojo/camera/IOImport.java rename to web/src/main/java/com/leaper/web/pojo/camera/IOImport.java index 67494ef..ae24b2e 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/camera/IOImport.java +++ b/web/src/main/java/com/leaper/web/pojo/camera/IOImport.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.camera; +package com.leaper.web.pojo.camera; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/category/CategoryExcel.java b/web/src/main/java/com/leaper/web/pojo/category/CategoryExcel.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/pojo/category/CategoryExcel.java rename to web/src/main/java/com/leaper/web/pojo/category/CategoryExcel.java index a77ed7d..475f1b7 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/category/CategoryExcel.java +++ b/web/src/main/java/com/leaper/web/pojo/category/CategoryExcel.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.category; +package com.leaper.web.pojo.category; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/category/CategoryModel.java b/web/src/main/java/com/leaper/web/pojo/category/CategoryModel.java similarity index 62% rename from web/src/main/java/com/zhehekeji/web/pojo/category/CategoryModel.java rename to web/src/main/java/com/leaper/web/pojo/category/CategoryModel.java index bb09ebc..3912057 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/category/CategoryModel.java +++ b/web/src/main/java/com/leaper/web/pojo/category/CategoryModel.java @@ -1,9 +1,8 @@ -package com.zhehekeji.web.pojo.category; +package com.leaper.web.pojo.category; -import com.zhehekeji.web.entity.Category; +import com.leaper.web.entity.Category; import lombok.Data; -import java.util.List; import java.util.Map; @Data diff --git a/web/src/main/java/com/zhehekeji/web/pojo/category/PageSearch.java b/web/src/main/java/com/leaper/web/pojo/category/PageSearch.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/pojo/category/PageSearch.java rename to web/src/main/java/com/leaper/web/pojo/category/PageSearch.java index d4d23ac..37e8386 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/category/PageSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/category/PageSearch.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.category; +package com.leaper.web.pojo.category; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/realTime/RealTime.java b/web/src/main/java/com/leaper/web/pojo/realTime/RealTime.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/pojo/realTime/RealTime.java rename to web/src/main/java/com/leaper/web/pojo/realTime/RealTime.java index 6062b29..9506319 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/realTime/RealTime.java +++ b/web/src/main/java/com/leaper/web/pojo/realTime/RealTime.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.pojo.realTime; +package com.leaper.web.pojo.realTime; -import com.zhehekeji.web.entity.Camera; +import com.leaper.web.entity.Camera; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckByMan.java b/web/src/main/java/com/leaper/web/pojo/stock/CheckByMan.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/CheckByMan.java rename to web/src/main/java/com/leaper/web/pojo/stock/CheckByMan.java index 54e50e8..dcf7143 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckByMan.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/CheckByMan.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java b/web/src/main/java/com/leaper/web/pojo/stock/CheckLogSearch.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java rename to web/src/main/java/com/leaper/web/pojo/stock/CheckLogSearch.java index 356c0e7..62be418 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/CheckLogSearch.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckStatus.java b/web/src/main/java/com/leaper/web/pojo/stock/CheckStatus.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/CheckStatus.java rename to web/src/main/java/com/leaper/web/pojo/stock/CheckStatus.java index c5f1266..0922d3d 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckStatus.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/CheckStatus.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; -import com.zhehekeji.web.entity.Stock; +import com.leaper.web.entity.Stock; import lombok.Data; import java.util.List; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/LocalDateTimeConvert.java b/web/src/main/java/com/leaper/web/pojo/stock/LocalDateTimeConvert.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/LocalDateTimeConvert.java rename to web/src/main/java/com/leaper/web/pojo/stock/LocalDateTimeConvert.java index f41d858..8c2049c 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/LocalDateTimeConvert.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/LocalDateTimeConvert.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/RowColumnStatus.java b/web/src/main/java/com/leaper/web/pojo/stock/RowColumnStatus.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/RowColumnStatus.java rename to web/src/main/java/com/leaper/web/pojo/stock/RowColumnStatus.java index ba575f4..b2a5860 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/RowColumnStatus.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/RowColumnStatus.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import lombok.Data; import lombok.NonNull; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java b/web/src/main/java/com/leaper/web/pojo/stock/StockCheck.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java rename to web/src/main/java/com/leaper/web/pojo/stock/StockCheck.java index 2f1fc0b..ab829be 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/StockCheck.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java b/web/src/main/java/com/leaper/web/pojo/stock/StockCheckSearch.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java rename to web/src/main/java/com/leaper/web/pojo/stock/StockCheckSearch.java index 9c39a74..c43b028 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/StockCheckSearch.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExcel.java b/web/src/main/java/com/leaper/web/pojo/stock/StockExcel.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/StockExcel.java rename to web/src/main/java/com/leaper/web/pojo/stock/StockExcel.java index 267ca59..4c40f08 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExcel.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/StockExcel.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java b/web/src/main/java/com/leaper/web/pojo/stock/StockExportExcel.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java rename to web/src/main/java/com/leaper/web/pojo/stock/StockExportExcel.java index b91a43f..903f2ee 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/StockExportExcel.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockLogSearch.java b/web/src/main/java/com/leaper/web/pojo/stock/StockLogSearch.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/StockLogSearch.java rename to web/src/main/java/com/leaper/web/pojo/stock/StockLogSearch.java index 539799f..e6f402f 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockLogSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/StockLogSearch.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java b/web/src/main/java/com/leaper/web/pojo/stock/StockStatus.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java rename to web/src/main/java/com/leaper/web/pojo/stock/StockStatus.java index 7bd5197..3344c7b 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/StockStatus.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatusConvert.java b/web/src/main/java/com/leaper/web/pojo/stock/StockStatusConvert.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatusConvert.java rename to web/src/main/java/com/leaper/web/pojo/stock/StockStatusConvert.java index aff4508..d7b15da 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatusConvert.java +++ b/web/src/main/java/com/leaper/web/pojo/stock/StockStatusConvert.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.stock; +package com.leaper.web.pojo.stock; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/street/StreetSearch.java b/web/src/main/java/com/leaper/web/pojo/street/StreetSearch.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/pojo/street/StreetSearch.java rename to web/src/main/java/com/leaper/web/pojo/street/StreetSearch.java index 949659e..a5ea113 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/street/StreetSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/street/StreetSearch.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.street; +package com.leaper.web.pojo.street; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/street/StreetType.java b/web/src/main/java/com/leaper/web/pojo/street/StreetType.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/pojo/street/StreetType.java rename to web/src/main/java/com/leaper/web/pojo/street/StreetType.java index 6553aeb..f5f31c3 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/street/StreetType.java +++ b/web/src/main/java/com/leaper/web/pojo/street/StreetType.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.street; +package com.leaper.web.pojo.street; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/street/StreetVO.java b/web/src/main/java/com/leaper/web/pojo/street/StreetVO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/pojo/street/StreetVO.java rename to web/src/main/java/com/leaper/web/pojo/street/StreetVO.java index 06146e6..7541636 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/street/StreetVO.java +++ b/web/src/main/java/com/leaper/web/pojo/street/StreetVO.java @@ -1,9 +1,7 @@ -package com.zhehekeji.web.pojo.street; +package com.leaper.web.pojo.street; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import com.zhehekeji.web.entity.Street; -import io.swagger.annotations.ApiModelProperty; +import com.leaper.web.entity.Street; import lombok.Data; @Data diff --git a/web/src/main/java/com/zhehekeji/web/pojo/warn/WarnSearch.java b/web/src/main/java/com/leaper/web/pojo/warn/WarnSearch.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/pojo/warn/WarnSearch.java rename to web/src/main/java/com/leaper/web/pojo/warn/WarnSearch.java index 34df2ae..de15a99 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/warn/WarnSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/warn/WarnSearch.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.pojo.warn; +package com.leaper.web.pojo.warn; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/pojo/warn/WarnVO.java b/web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/pojo/warn/WarnVO.java rename to web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java index 8cd254c..b65caff 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/warn/WarnVO.java +++ b/web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.pojo.warn; +package com.leaper.web.pojo.warn; -import com.zhehekeji.web.entity.Warn; +import com.leaper.web.entity.Warn; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/leaper/web/service/CameraService.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/CameraService.java rename to web/src/main/java/com/leaper/web/service/CameraService.java index 982e811..a78f8aa 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/leaper/web/service/CameraService.java @@ -1,27 +1,26 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.alibaba.excel.EasyExcel; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.Camera; -import com.zhehekeji.web.entity.CameraIO; -import com.zhehekeji.web.entity.CameraIOConfig; -import com.zhehekeji.web.lib.CameraConnMap; -import com.zhehekeji.web.lib.CameraControlLoginModule; -import com.zhehekeji.web.lib.CameraControlModule; -import com.zhehekeji.web.lib.hik.HikLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.mapper.CameraIOConfigMapper; -import com.zhehekeji.web.mapper.CameraIOMapper; -import com.zhehekeji.web.mapper.CameraMapper; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.pojo.camera.CameraConfigSearchReq; -import com.zhehekeji.web.pojo.camera.IOImport; -import com.zhehekeji.web.pojo.street.StreetSearch; -import io.swagger.models.auth.In; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Camera; +import com.leaper.web.entity.CameraIO; +import com.leaper.web.entity.CameraIOConfig; +import com.leaper.web.lib.CameraConnMap; +import com.leaper.web.lib.CameraControlLoginModule; +import com.leaper.web.lib.CameraControlModule; +import com.leaper.web.lib.hik.HikLoginModuleImpl; +import com.leaper.web.lib.joyware.JoywareLoginModuleImpl; +import com.leaper.web.lib.joyware.NetSDKLib; +import com.leaper.web.mapper.CameraIOConfigMapper; +import com.leaper.web.mapper.CameraIOMapper; +import com.leaper.web.mapper.CameraMapper; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.pojo.camera.CameraConfigSearchReq; +import com.leaper.web.pojo.camera.IOImport; +import com.leaper.web.pojo.street.StreetSearch; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/web/src/main/java/com/zhehekeji/web/service/CategoryImportListener.java b/web/src/main/java/com/leaper/web/service/CategoryImportListener.java similarity index 71% rename from web/src/main/java/com/zhehekeji/web/service/CategoryImportListener.java rename to web/src/main/java/com/leaper/web/service/CategoryImportListener.java index 56c3b2b..861282c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CategoryImportListener.java +++ b/web/src/main/java/com/leaper/web/service/CategoryImportListener.java @@ -1,19 +1,12 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.zhehekeji.web.entity.CameraIOConfig; -import com.zhehekeji.web.entity.Category; -import com.zhehekeji.web.mapper.CameraIOConfigMapper; -import com.zhehekeji.web.mapper.CategoryMapper; -import com.zhehekeji.web.pojo.camera.IOImport; +import com.leaper.web.entity.Category; +import com.leaper.web.mapper.CategoryMapper; import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.stream.Collectors; /** * IO表导入 diff --git a/web/src/main/java/com/zhehekeji/web/service/CategoryService.java b/web/src/main/java/com/leaper/web/service/CategoryService.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/service/CategoryService.java rename to web/src/main/java/com/leaper/web/service/CategoryService.java index 4c3b61b..4997e5b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CategoryService.java +++ b/web/src/main/java/com/leaper/web/service/CategoryService.java @@ -1,44 +1,27 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.read.builder.ExcelReaderBuilder; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.entity.Category; -import com.zhehekeji.web.mapper.CategoryMapper; -import com.zhehekeji.web.pojo.camera.IOImport; -import com.zhehekeji.web.pojo.category.CategoryExcel; -import com.zhehekeji.web.pojo.category.CategoryModel; -import com.zhehekeji.web.pojo.category.PageSearch; -import com.zhehekeji.web.pojo.stock.StockExcel; +import com.leaper.web.entity.Category; +import com.leaper.web.mapper.CategoryMapper; +import com.leaper.web.pojo.category.PageSearch; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.beans.BeanUtils; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.IOException; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Service @Slf4j diff --git a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java b/web/src/main/java/com/leaper/web/service/CheckLogService.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/CheckLogService.java rename to web/src/main/java/com/leaper/web/service/CheckLogService.java index 2cc32a0..d1bbd4e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java +++ b/web/src/main/java/com/leaper/web/service/CheckLogService.java @@ -1,12 +1,12 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.web.entity.CheckLog; -import com.zhehekeji.web.mapper.CheckLogMapper; -import com.zhehekeji.web.pojo.stock.CheckLogSearch; -import com.zhehekeji.web.pojo.street.StreetVO; +import com.leaper.web.pojo.stock.CheckLogSearch; +import com.leaper.web.entity.CheckLog; +import com.leaper.web.mapper.CheckLogMapper; +import com.leaper.web.pojo.street.StreetVO; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/web/src/main/java/com/zhehekeji/web/service/CronTab.java b/web/src/main/java/com/leaper/web/service/CronTab.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/service/CronTab.java rename to web/src/main/java/com/leaper/web/service/CronTab.java index 200cf10..3c6c4ae 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CronTab.java +++ b/web/src/main/java/com/leaper/web/service/CronTab.java @@ -1,15 +1,13 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.LightSource; -import com.zhehekeji.web.mapper.LightSourceMapper; -import com.zhehekeji.web.service.damLightSource.JYDAMEquip; -import com.zhehekeji.web.service.damLightSource.JYDamHelper; -import com.zhehekeji.web.service.hikLightSource.HikControlSocket; -import io.swagger.models.auth.In; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.LightSource; +import com.leaper.web.mapper.LightSourceMapper; +import com.leaper.web.service.damLightSource.JYDAMEquip; +import com.leaper.web.service.damLightSource.JYDamHelper; +import com.leaper.web.service.hikLightSource.HikControlSocket; import lombok.extern.slf4j.Slf4j; -import net.sf.cglib.core.Local; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -26,9 +24,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; @Component @EnableScheduling diff --git a/web/src/main/java/com/zhehekeji/web/service/GoodsActionTimes.java b/web/src/main/java/com/leaper/web/service/GoodsActionTimes.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/GoodsActionTimes.java rename to web/src/main/java/com/leaper/web/service/GoodsActionTimes.java index bb61dbb..0ec23d0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/GoodsActionTimes.java +++ b/web/src/main/java/com/leaper/web/service/GoodsActionTimes.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/service/IOImportListener.java b/web/src/main/java/com/leaper/web/service/IOImportListener.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/IOImportListener.java rename to web/src/main/java/com/leaper/web/service/IOImportListener.java index 6ec5bfb..3752d6c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/IOImportListener.java +++ b/web/src/main/java/com/leaper/web/service/IOImportListener.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.zhehekeji.web.entity.CameraIOConfig; -import com.zhehekeji.web.mapper.CameraIOConfigMapper; -import com.zhehekeji.web.pojo.camera.IOImport; +import com.leaper.web.entity.CameraIOConfig; +import com.leaper.web.mapper.CameraIOConfigMapper; +import com.leaper.web.pojo.camera.IOImport; import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; diff --git a/web/src/main/java/com/zhehekeji/web/service/InitService.java b/web/src/main/java/com/leaper/web/service/InitService.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/service/InitService.java rename to web/src/main/java/com/leaper/web/service/InitService.java index 31a61d3..1a1dd00 100644 --- a/web/src/main/java/com/zhehekeji/web/service/InitService.java +++ b/web/src/main/java/com/leaper/web/service/InitService.java @@ -1,20 +1,20 @@ -package com.zhehekeji.web.service; - -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.Camera; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.lib.*; -import com.zhehekeji.web.lib.hik.HikCameraControlModuleImpl; -import com.zhehekeji.web.lib.hik.HikLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.JoywareCameraControlModuleImpl; -import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.NetSDKLib; -import com.zhehekeji.web.mapper.CameraMapper; -import com.zhehekeji.web.mapper.SensorGunMapper; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.service.ksec.KsecNettyClient; -import com.zhehekeji.web.service.robotic.NettyClient; -import com.zhehekeji.web.service.sick.SickNettyClient; +package com.leaper.web.service; + +import com.leaper.web.lib.CameraControlLoginModule; +import com.leaper.web.lib.CameraControlModule; +import com.leaper.web.lib.TaskDelayExecutor; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Camera; +import com.leaper.web.entity.Street; +import com.leaper.web.lib.*; +import com.leaper.web.lib.hik.HikCameraControlModuleImpl; +import com.leaper.web.lib.hik.HikLoginModuleImpl; +import com.leaper.web.lib.joyware.JoywareCameraControlModuleImpl; +import com.leaper.web.lib.joyware.JoywareLoginModuleImpl; +import com.leaper.web.mapper.CameraMapper; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.service.ksec.KsecNettyClient; +import com.leaper.web.service.robotic.NettyClient; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java b/web/src/main/java/com/leaper/web/service/LightSourceService.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/LightSourceService.java rename to web/src/main/java/com/leaper/web/service/LightSourceService.java index 3f60d19..50961f4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java +++ b/web/src/main/java/com/leaper/web/service/LightSourceService.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zhehekeji.web.entity.LightSource; -import com.zhehekeji.web.mapper.LightSourceMapper; +import com.leaper.web.entity.LightSource; +import com.leaper.web.mapper.LightSourceMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/web/src/main/java/com/zhehekeji/web/service/OrderService.java b/web/src/main/java/com/leaper/web/service/OrderService.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/OrderService.java rename to web/src/main/java/com/leaper/web/service/OrderService.java index 9d4c336..e3f2cc4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/OrderService.java +++ b/web/src/main/java/com/leaper/web/service/OrderService.java @@ -1,15 +1,15 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.Order; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.mapper.OrderMapper; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.pojo.OrderSaveReq; -import com.zhehekeji.web.pojo.OrderSearch; -import com.zhehekeji.web.pojo.OrderVO; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Order; +import com.leaper.web.entity.Street; +import com.leaper.web.mapper.OrderMapper; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.pojo.OrderSaveReq; +import com.leaper.web.pojo.OrderSearch; +import com.leaper.web.pojo.OrderVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java b/web/src/main/java/com/leaper/web/service/PlcCmdInfo.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java rename to web/src/main/java/com/leaper/web/service/PlcCmdInfo.java index 051893f..d4ce165 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcCmdInfo.java +++ b/web/src/main/java/com/leaper/web/service/PlcCmdInfo.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/leaper/web/service/PlcService.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/PlcService.java rename to web/src/main/java/com/leaper/web/service/PlcService.java index ba75d92..351ec94 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/leaper/web/service/PlcService.java @@ -1,18 +1,21 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; -import codeDetector.BarcodeDetector; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zhehekeji.common.util.PathUtil; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.*; -import com.zhehekeji.web.lib.*; -import com.zhehekeji.web.mapper.*; -import com.zhehekeji.web.pojo.OrderVO; -import com.zhehekeji.web.service.RFID.RFIDMap; -import com.zhehekeji.web.service.RFID.RFIDSocket; -import com.zhehekeji.web.service.hikLightSource.HikControlSocket; -import com.zhehekeji.web.service.ksec.KsecNettyClient; -import com.zhehekeji.web.service.sick.SickSocket; +import com.leaper.web.entity.*; +import com.leaper.web.lib.CameraControlModule; +import com.leaper.web.lib.OrderInfo; +import com.leaper.web.lib.OrderRealtime; +import com.leaper.web.lib.TaskDelayExecutor; +import com.leaper.web.mapper.*; +import com.leaper.web.service.RFID.RFIDSocket; +import com.leaper.common.util.PathUtil; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.*; +import com.leaper.web.lib.*; +import com.leaper.web.mapper.*; +import com.leaper.web.pojo.OrderVO; +import com.leaper.web.service.RFID.RFIDMap; +import com.leaper.web.service.hikLightSource.HikControlSocket; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -21,11 +24,9 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.time.Duration; import java.time.LocalDateTime; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingDeque; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; diff --git a/web/src/main/java/com/zhehekeji/web/service/RFID/CMD.java b/web/src/main/java/com/leaper/web/service/RFID/CMD.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/RFID/CMD.java rename to web/src/main/java/com/leaper/web/service/RFID/CMD.java index b766f44..81d47d5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RFID/CMD.java +++ b/web/src/main/java/com/leaper/web/service/RFID/CMD.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.RFID; +package com.leaper.web.service.RFID; /** * Regarding UHF return code and description, please refer to Serial_Protocol_User's_Guide_V2.38_en diff --git a/web/src/main/java/com/zhehekeji/web/service/RFID/ERROR.java b/web/src/main/java/com/leaper/web/service/RFID/ERROR.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/RFID/ERROR.java rename to web/src/main/java/com/leaper/web/service/RFID/ERROR.java index f955291..7ba623f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RFID/ERROR.java +++ b/web/src/main/java/com/leaper/web/service/RFID/ERROR.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.RFID; +package com.leaper.web.service.RFID; /** * Regarding UHF error code and description, please refer to Serial_Protocol_User's_Guide_V2.38_en diff --git a/web/src/main/java/com/zhehekeji/web/service/RFID/HEAD.java b/web/src/main/java/com/leaper/web/service/RFID/HEAD.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/service/RFID/HEAD.java rename to web/src/main/java/com/leaper/web/service/RFID/HEAD.java index c98f33c..3ac148e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RFID/HEAD.java +++ b/web/src/main/java/com/leaper/web/service/RFID/HEAD.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.RFID; +package com.leaper.web.service.RFID; public class HEAD { /**UHF mark to indicate the head of data package */ diff --git a/web/src/main/java/com/zhehekeji/web/service/RFID/MessageTran.java b/web/src/main/java/com/leaper/web/service/RFID/MessageTran.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/RFID/MessageTran.java rename to web/src/main/java/com/leaper/web/service/RFID/MessageTran.java index 90631f6..bf6d8da 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RFID/MessageTran.java +++ b/web/src/main/java/com/leaper/web/service/RFID/MessageTran.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.RFID; +package com.leaper.web.service.RFID; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDMap.java b/web/src/main/java/com/leaper/web/service/RFID/RFIDMap.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/RFID/RFIDMap.java rename to web/src/main/java/com/leaper/web/service/RFID/RFIDMap.java index dd50d5e..6cfdc10 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDMap.java +++ b/web/src/main/java/com/leaper/web/service/RFID/RFIDMap.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.RFID; +package com.leaper.web.service.RFID; import java.util.HashMap; import java.util.Map; diff --git a/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java b/web/src/main/java/com/leaper/web/service/RFID/RFIDSocket.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java rename to web/src/main/java/com/leaper/web/service/RFID/RFIDSocket.java index 8e33031..08b01a5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java +++ b/web/src/main/java/com/leaper/web/service/RFID/RFIDSocket.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.RFID; +package com.leaper.web.service.RFID; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/service/RFIDService.java b/web/src/main/java/com/leaper/web/service/RFIDService.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/service/RFIDService.java rename to web/src/main/java/com/leaper/web/service/RFIDService.java index c5d60ff..31d40ec 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RFIDService.java +++ b/web/src/main/java/com/leaper/web/service/RFIDService.java @@ -1,10 +1,8 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zhehekeji.web.entity.RFID; -import com.zhehekeji.web.entity.SensorGun; -import com.zhehekeji.web.mapper.RFIDMapper; -import com.zhehekeji.web.mapper.SensorGunMapper; +import com.leaper.web.entity.RFID; +import com.leaper.web.mapper.RFIDMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java b/web/src/main/java/com/leaper/web/service/RealTimeService.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/RealTimeService.java rename to web/src/main/java/com/leaper/web/service/RealTimeService.java index a1d09fd..2d01868 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java +++ b/web/src/main/java/com/leaper/web/service/RealTimeService.java @@ -1,15 +1,13 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.Camera; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.mapper.CameraMapper; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.pojo.realTime.RealTime; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.Camera; +import com.leaper.web.entity.Street; +import com.leaper.web.mapper.CameraMapper; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.pojo.realTime.RealTime; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.util.ArrayList; diff --git a/web/src/main/java/com/zhehekeji/web/service/SensorService.java b/web/src/main/java/com/leaper/web/service/SensorService.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/service/SensorService.java rename to web/src/main/java/com/leaper/web/service/SensorService.java index aa7de1b..bf422c3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/SensorService.java +++ b/web/src/main/java/com/leaper/web/service/SensorService.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zhehekeji.web.entity.SensorGun; -import com.zhehekeji.web.mapper.SensorGunMapper; +import com.leaper.web.entity.SensorGun; +import com.leaper.web.mapper.SensorGunMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -15,7 +15,7 @@ public class SensorService { private SensorGunMapper sensorGunMapper; - public SensorGun getSensorByPlc(Integer streetId,Integer direction){ + public SensorGun getSensorByPlc(Integer streetId, Integer direction){ List list = sensorGunMapper.selectList(new QueryWrapper().eq("street_id",streetId).eq("direction",direction)); if(list.size() > 0){ return list.get(0); diff --git a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java b/web/src/main/java/com/leaper/web/service/StockCheckRunnable.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java rename to web/src/main/java/com/leaper/web/service/StockCheckRunnable.java index b588608..3be7bf8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java +++ b/web/src/main/java/com/leaper/web/service/StockCheckRunnable.java @@ -1,15 +1,14 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import codeDetector.BarcodeDetector; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.CheckLog; -import com.zhehekeji.web.entity.SensorGun; -import com.zhehekeji.web.entity.Stock; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.lib.OrderInfo; -import com.zhehekeji.web.mapper.CheckLogMapper; -import com.zhehekeji.web.mapper.StockMapper; -import com.zhehekeji.web.service.sick.SickSocket; +import com.leaper.web.entity.SensorGun; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.CheckLog; +import com.leaper.web.entity.Stock; +import com.leaper.web.entity.Street; +import com.leaper.web.lib.OrderInfo; +import com.leaper.web.mapper.CheckLogMapper; +import com.leaper.web.mapper.StockMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; diff --git a/web/src/main/java/com/zhehekeji/web/service/StockImport.java b/web/src/main/java/com/leaper/web/service/StockImport.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/service/StockImport.java rename to web/src/main/java/com/leaper/web/service/StockImport.java index 351c470..74d9d56 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockImport.java +++ b/web/src/main/java/com/leaper/web/service/StockImport.java @@ -1,18 +1,13 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.zhehekeji.web.entity.Stock; -import com.zhehekeji.web.mapper.StockMapper; -import com.zhehekeji.web.pojo.stock.StockExcel; +import com.leaper.web.entity.Stock; +import com.leaper.web.mapper.StockMapper; +import com.leaper.web.pojo.stock.StockExcel; import org.springframework.beans.BeanUtils; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; public class StockImport extends AnalysisEventListener { diff --git a/web/src/main/java/com/zhehekeji/web/service/StockLogService.java b/web/src/main/java/com/leaper/web/service/StockLogService.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/service/StockLogService.java rename to web/src/main/java/com/leaper/web/service/StockLogService.java index cad552a..b9a5712 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockLogService.java +++ b/web/src/main/java/com/leaper/web/service/StockLogService.java @@ -1,12 +1,11 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.web.entity.Stock; -import com.zhehekeji.web.entity.StockLog; -import com.zhehekeji.web.mapper.StockLogMapper; -import com.zhehekeji.web.pojo.stock.StockLogSearch; +import com.leaper.web.entity.StockLog; +import com.leaper.web.mapper.StockLogMapper; +import com.leaper.web.pojo.stock.StockLogSearch; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/leaper/web/service/StockService.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/StockService.java rename to web/src/main/java/com/leaper/web/service/StockService.java index f3a81c7..46a78ea 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/leaper/web/service/StockService.java @@ -1,33 +1,28 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; -import com.alibaba.excel.EasyExcel; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.leaper.web.entity.StockLog; +import com.leaper.web.mapper.StockLogMapper; +import com.leaper.web.pojo.stock.*; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.entity.Stock; -import com.zhehekeji.web.entity.CheckLog; -import com.zhehekeji.web.entity.StockLog; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.mapper.CheckLogMapper; -import com.zhehekeji.web.mapper.StockLogMapper; -import com.zhehekeji.web.mapper.StockMapper; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.pojo.category.PageSearch; -import com.zhehekeji.web.pojo.stock.*; -import io.swagger.models.auth.In; +import com.leaper.web.entity.Stock; +import com.leaper.web.entity.CheckLog; +import com.leaper.web.entity.Street; +import com.leaper.web.mapper.CheckLogMapper; +import com.leaper.web.mapper.StockMapper; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.pojo.category.PageSearch; +import com.leaper.web.pojo.stock.*; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.*; -import java.util.stream.Collectors; @Service @Slf4j diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetConn.java b/web/src/main/java/com/leaper/web/service/StreetConn.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/StreetConn.java rename to web/src/main/java/com/leaper/web/service/StreetConn.java index 5e8dec3..7831625 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StreetConn.java +++ b/web/src/main/java/com/leaper/web/service/StreetConn.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/leaper/web/service/StreetService.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/StreetService.java rename to web/src/main/java/com/leaper/web/service/StreetService.java index f1c4259..e2cbdd7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java +++ b/web/src/main/java/com/leaper/web/service/StreetService.java @@ -1,22 +1,22 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.leaper.web.entity.LightSource; +import com.leaper.web.entity.SensorGun; +import com.leaper.web.mapper.LightSourceMapper; +import com.leaper.web.mapper.SensorGunMapper; import com.zhehekeji.core.util.Assert; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.entity.LightSource; -import com.zhehekeji.web.entity.RFID; -import com.zhehekeji.web.entity.SensorGun; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.mapper.LightSourceMapper; -import com.zhehekeji.web.mapper.RFIDMapper; -import com.zhehekeji.web.mapper.SensorGunMapper; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.pojo.street.StreetSearch; -import com.zhehekeji.web.pojo.street.StreetVO; -import com.zhehekeji.web.service.robotic.NettyClient; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.entity.RFID; +import com.leaper.web.entity.Street; +import com.leaper.web.mapper.RFIDMapper; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.pojo.street.StreetSearch; +import com.leaper.web.pojo.street.StreetVO; +import com.leaper.web.service.robotic.NettyClient; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; @@ -30,7 +30,6 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/web/src/main/java/com/zhehekeji/web/service/TestService.java b/web/src/main/java/com/leaper/web/service/TestService.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/TestService.java rename to web/src/main/java/com/leaper/web/service/TestService.java index b6cadc3..98d2d3c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/TestService.java +++ b/web/src/main/java/com/leaper/web/service/TestService.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; -import com.zhehekeji.web.entity.Street; +import com.leaper.web.entity.Street; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/web/src/main/java/com/zhehekeji/web/service/WarnService.java b/web/src/main/java/com/leaper/web/service/WarnService.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/service/WarnService.java rename to web/src/main/java/com/leaper/web/service/WarnService.java index ed215c8..52357e0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/WarnService.java +++ b/web/src/main/java/com/leaper/web/service/WarnService.java @@ -1,14 +1,12 @@ -package com.zhehekeji.web.service; +package com.leaper.web.service; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.mapper.WarnMapper; -import com.zhehekeji.web.pojo.warn.WarnSearch; -import com.zhehekeji.web.pojo.warn.WarnVO; -import org.springframework.beans.factory.annotation.Value; +import com.leaper.web.config.ConfigProperties; +import com.leaper.web.mapper.WarnMapper; +import com.leaper.web.pojo.warn.WarnSearch; +import com.leaper.web.pojo.warn.WarnVO; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.time.Duration; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDAMEquip.java b/web/src/main/java/com/leaper/web/service/damLightSource/JYDAMEquip.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDAMEquip.java rename to web/src/main/java/com/leaper/web/service/damLightSource/JYDAMEquip.java index 3646709..6da6a93 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDAMEquip.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/JYDAMEquip.java @@ -1,12 +1,13 @@ -package com.zhehekeji.web.service.damLightSource; +package com.leaper.web.service.damLightSource; import java.net.InetAddress; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusRTUTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.RTUTCPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusRTUTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.net.RTUTCPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.InputRegister; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java b/web/src/main/java/com/leaper/web/service/damLightSource/JYDamHelper.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java rename to web/src/main/java/com/leaper/web/service/damLightSource/JYDamHelper.java index 355da82..181b2a5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/JYDamHelper.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/JYDamHelper.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.service.damLightSource; +package com.leaper.web.service.damLightSource; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/Modbus.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/Modbus.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/Modbus.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/Modbus.java index f8ff42d..26d4a72 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/Modbus.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/Modbus.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus; +package com.leaper.web.service.damLightSource.lib.modbus; /** * Interface defining all constants related to the diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusCoupler.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusCoupler.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusCoupler.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusCoupler.java index 8889fab..2d65058 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusCoupler.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusCoupler.java @@ -14,11 +14,11 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus; +package com.leaper.web.service.damLightSource.lib.modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DefaultProcessImageFactory; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.DefaultProcessImageFactory; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; /** * Class implemented following a Singleton pattern, diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusException.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusException.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusException.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusException.java index 1f3ecfe..127d767 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusException.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusException.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus; +package com.leaper.web.service.damLightSource.lib.modbus; /** * Superclass of all specialised exceptions in diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusIOException.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusIOException.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusIOException.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusIOException.java index fe1ebee..7470e01 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusIOException.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusIOException.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus; +package com.leaper.web.service.damLightSource.lib.modbus; /** * Class that implements a ModbusIOException. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusSlaveException.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusSlaveException.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusSlaveException.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusSlaveException.java index c082288..25ace4a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/ModbusSlaveException.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/ModbusSlaveException.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus; +package com.leaper.web.service.damLightSource.lib.modbus; /** * Class that implements a ModbusSlaveException. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java index 530e6a1..2682a40 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AIAOTest.java @@ -14,17 +14,17 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.SimpleRegister; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.SimpleRegister; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AITest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AITest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AITest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AITest.java index e503c08..973d8f0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AITest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AITest.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AOTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AOTest.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AOTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AOTest.java index f66d742..f3b3256 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/AOTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/AOTest.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.SimpleRegister; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.WriteSingleRegisterRequest; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.SimpleRegister; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java index c7587cd..3e607d5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DIDOTest.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; +import com.leaper.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DITest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DITest.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DITest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DITest.java index 0051c34..63ddb0a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DITest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DITest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DOTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DOTest.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DOTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DOTest.java index 9c5faaf..6661923 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/DOTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/DOTest.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java index 8a3955d..c4b0156 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialAITest.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputRegistersResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.SerialConnection; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; /** * Class that implements a simple commandline diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java index 2fedd64..c1c0a1d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialDITest.java @@ -14,16 +14,16 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.SerialConnection; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; /** * Class that implements a simple commandline diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java index a2d9685..dcb71c6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialFacadeTest.java @@ -36,16 +36,16 @@ // ////////////////////////////////////////////////////////////////////////// -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.facade.ModbusSerialMaster; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.facade.ModbusSerialMaster; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.InputRegister; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; public class SerialFacadeTest { diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java index 553ded0..1a97873 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/SerialSlaveTest.java @@ -14,13 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.ModbusSerialListener; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.*; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.net.ModbusSerialListener; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.*; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.*; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java index 317ac0c..de650aa 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/TCPSlaveTest.java @@ -14,12 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.ModbusTCPListener; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.*; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.net.ModbusTCPListener; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.*; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.*; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java index e04a105..1de6908 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPDITest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ReadInputDiscretesResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java index 55104f1..dbe4ae3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPDOTest.java @@ -14,12 +14,12 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.msg.WriteCoilRequest; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java index c168ae3..1dfdc85 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/UDPSlaveTest.java @@ -14,12 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.cmd; +package com.leaper.web.service.damLightSource.lib.modbus.cmd; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.ModbusUDPListener; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.*; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.*; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.net.ModbusUDPListener; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.*; /** * Class implementing a simple Modbus/UDP slave. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/cmd/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/cmd/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java index 23dcd87..003a7f2 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusSerialMaster.java @@ -14,17 +14,18 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.facade; +package com.leaper.web.service.damLightSource.lib.modbus.facade; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.net.SerialConnection; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusSerialTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.InputRegister; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; /** * Modbus/Serial Master facade. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java index eb2107f..0ea0373 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusTCPMaster.java @@ -14,15 +14,16 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.facade; +package com.leaper.web.service.damLightSource.lib.modbus.facade; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.InputRegister; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java index 855523c..c16f5cf 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/ModbusUDPMaster.java @@ -14,15 +14,16 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.facade; +package com.leaper.web.service.damLightSource.lib.modbus.facade; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.*; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusUDPTransaction; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.msg.*; +import com.leaper.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.InputRegister; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/facade/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/facade/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java index 754cb80..8fda443 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ASCIIInputStream.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.FilterInputStream; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java index 9c0afd7..03bc972 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ASCIIOutputStream.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINInputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BINInputStream.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINInputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BINInputStream.java index 981cc5f..62a5b6d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINInputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BINInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.FilterInputStream; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINOutputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BINOutputStream.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINOutputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BINOutputStream.java index 143d86e..1f53f42 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BINOutputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BINOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesInputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BytesInputStream.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesInputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BytesInputStream.java index 59828d6..cd4616d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesInputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BytesInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.DataInput; import java.io.DataInputStream; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java index 1a44e5c..0f45cb6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/BytesOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.DataOutput; import java.io.DataOutputStream; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java index d18edac..c5818df 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/FastByteArrayInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.IOException; import java.io.InputStream; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java index 1e935ad..557225a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/FastByteArrayOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java index cee5592..92c7dd8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusASCIITransport.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +package com.leaper.web.service.damLightSource.lib.modbus.io; + +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.io.DataInputStream; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java index 40f34f4..84d5f1a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusBINTransport.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +package com.leaper.web.service.damLightSource.lib.modbus.io; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.io.DataInputStream; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java index e271c73..457d875 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransaction.java @@ -1,18 +1,18 @@ /** * */ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.RTUTCPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusSlaveException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.RTUTCPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.util.AtomicCounter; +import com.leaper.web.service.damLightSource.lib.modbus.util.Mutex; /** * @author bonino diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java index 83dda5e..bc482ab 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTCPTransport.java @@ -1,14 +1,14 @@ /** * */ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java index 6a2d03a..ac3bad8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusRTUTransport.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.io.IOException; import java.io.InputStream; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java index 4a20986..5ffbcf8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusSerialTransaction.java @@ -14,18 +14,18 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.SerialConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex; +package com.leaper.web.service.damLightSource.lib.modbus.io; + +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusSlaveException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.SerialConnection; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; +import com.leaper.web.service.damLightSource.lib.modbus.util.AtomicCounter; +import com.leaper.web.service.damLightSource.lib.modbus.util.Mutex; /** * Class implementing the ModbusTransaction diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java index 2d22795..5c7e5a9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusSerialTransport.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import gnu.io.CommPort; import gnu.io.UnsupportedCommOperationException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java index b8a51b2..d09f7bb 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTCPTransaction.java @@ -14,18 +14,18 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex; +package com.leaper.web.service.damLightSource.lib.modbus.io; + +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusSlaveException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.TCPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.util.AtomicCounter; +import com.leaper.web.service.damLightSource.lib.modbus.util.Mutex; /** * Class implementing the ModbusTransaction diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java index 0e75c25..3898539 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTCPTransport.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +package com.leaper.web.service.damLightSource.lib.modbus.io; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.io.*; import java.net.Socket; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java index 54b2057..86cbf25 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTransaction.java @@ -14,11 +14,11 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; /** * Interface defining a ModbusTransaction. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTransport.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTransport.java index 654c838..178e331 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusTransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusTransport.java @@ -14,12 +14,12 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java index cbe0457..5401197 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusUDPTransaction.java @@ -14,19 +14,19 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusSlaveException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPTerminal; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.AtomicCounter; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Mutex; +package com.leaper.web.service.damLightSource.lib.modbus.io; + +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusSlaveException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ExceptionResponse; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.UDPMasterConnection; +import com.leaper.web.service.damLightSource.lib.modbus.net.UDPTerminal; +import com.leaper.web.service.damLightSource.lib.modbus.util.AtomicCounter; +import com.leaper.web.service.damLightSource.lib.modbus.util.Mutex; /** * Class implementing the ModbusTransaction diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java index a649a00..b921c87 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/ModbusUDPTransport.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.net.UDPTerminal; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.net.UDPTerminal; import java.io.DataOutput; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java index 8f89fcd..747732c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/NonWordDataHandler.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.DataInput; import java.io.EOFException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/Transportable.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/Transportable.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/Transportable.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/Transportable.java index 04e20e7..448f6ad 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/Transportable.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/Transportable.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.damLightSource.lib.modbus.io; +package com.leaper.web.service.damLightSource.lib.modbus.io; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/io/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/io/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java index 77cfcf1..0fc8778 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ExceptionResponse.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java index 53e05d1..f01b105 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/IllegalFunctionRequest.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java index 3490315..7112815 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusMessage.java @@ -14,10 +14,10 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.Transportable; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.Transportable; /** * Interface defining a Modbus Message. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java index bc10226..3882d4f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusMessageImpl.java @@ -14,10 +14,10 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java index 2807a9a..390caa6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusRequest.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; /** * Abstract class implementing a ModbusRequest. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java index 1bfbbd0..c92b332 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ModbusResponse.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java index a361543..8c49cb9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadCoilsRequest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalOut; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.DigitalOut; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java index 404f7d0..24a0acd 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadCoilsResponse.java @@ -14,10 +14,10 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java index 89d3db3..71d7b3c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesRequest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalIn; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.DigitalIn; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java index b2b3759..6387fa5 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputDiscretesResponse.java @@ -14,10 +14,10 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java index a250fb8..cd722d8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersRequest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.InputRegister; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java index a991f1c..be042ef 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadInputRegistersResponse.java @@ -14,12 +14,12 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.InputRegister; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.InputRegister; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java index f4fa088..c54690e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersRequest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java index 495557a..97daa44 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/ReadMultipleRegistersResponse.java @@ -14,12 +14,12 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java index 745ebdb..b997226 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteCoilRequest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalOut; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.DigitalOut; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java index b7bb783..c13b57e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteCoilResponse.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java index 4671dd3..a86040b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsRequest.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.DigitalOut; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.BitVector; +package com.leaper.web.service.damLightSource.lib.modbus.msg; + +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.DigitalOut; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.util.BitVector; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java index 393120c..cc9d2d4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleCoilsResponse.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java index 2b5aa9d..fc602fd 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersRequest.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.NonWordDataHandler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.io.NonWordDataHandler; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImageFactory; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java index 552cdf8..893d2e1 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteMultipleRegistersResponse.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java index aa0afaf..0aed974 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterRequest.java @@ -14,13 +14,13 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.ProcessImage; -import com.zhehekeji.web.service.damLightSource.lib.modbus.procimg.Register; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.IllegalAddressException; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.ProcessImage; +import com.leaper.web.service.damLightSource.lib.modbus.procimg.Register; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java index efa07f4..975fe98 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/WriteSingleRegisterResponse.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.msg; +package com.leaper.web.service.damLightSource.lib.modbus.msg; import java.io.DataInput; import java.io.DataOutput; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/msg/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/msg/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/MasterConnection.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/MasterConnection.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/MasterConnection.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/MasterConnection.java index cae9966..e912d12 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/MasterConnection.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/MasterConnection.java @@ -1,7 +1,7 @@ /** * */ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; /** * A common interface for master connections (not strictly covering serial connections) diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java index 7bf13b0..34d4011 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusSerialListener.java @@ -14,15 +14,15 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; /** * Class that implements a ModbusTCPListener.
diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java index 6031e89..bb78c04 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusTCPListener.java @@ -14,10 +14,10 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ThreadPool; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.util.ThreadPool; import java.io.IOException; import java.net.*; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java index cb69bbd..318f192 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/ModbusUDPListener.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; - -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +package com.leaper.web.service.damLightSource.lib.modbus.net; + +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java index 45fec47..6be9714 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/RTUTCPMasterConnection.java @@ -1,11 +1,11 @@ /** * */ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusRTUTCPTransport; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusRTUTCPTransport; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.IOException; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialConnection.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/SerialConnection.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialConnection.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/SerialConnection.java index 7eda732..537998c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialConnection.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/SerialConnection.java @@ -14,11 +14,12 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.*; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +import com.leaper.web.service.damLightSource.lib.modbus.io.*; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.*; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; import gnu.io.*; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java index fb9257b..42529a8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/SerialMasterConnection.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.SerialParameters; +import com.leaper.web.service.damLightSource.lib.modbus.util.SerialParameters; /** * diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java index 480197a..fb02cfe 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPConnectionHandler.java @@ -14,14 +14,14 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusCoupler; -import com.zhehekeji.web.service.damLightSource.lib.modbus.ModbusIOException; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusRequest; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusResponse; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusCoupler; +import com.leaper.web.service.damLightSource.lib.modbus.ModbusIOException; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusRequest; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusResponse; /** * Class implementing a handler for incoming Modbus/TCP requests. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java index d7dfa56..61f25df 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPMasterConnection.java @@ -14,11 +14,11 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransport; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransport; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.io.IOException; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java index 1054a03..28ad770 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/TCPSlaveConnection.java @@ -14,11 +14,11 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTCPTransport; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTCPTransport; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransport; import java.io.IOException; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java index 2d401c4..b20fa9b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPMasterConnection.java @@ -14,10 +14,10 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusTransport; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java index bc051e6..fce84c2 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPMasterTerminal.java @@ -14,10 +14,10 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; import java.net.DatagramPacket; import java.net.DatagramSocket; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java index 9679dfb..b951e7e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPSlaveTerminal.java @@ -14,12 +14,12 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.LinkedQueue; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.ModbusUtil; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.util.LinkedQueue; +import com.leaper.web.service.damLightSource.lib.modbus.util.ModbusUtil; import java.net.DatagramPacket; import java.net.DatagramSocket; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPTerminal.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPTerminal.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPTerminal.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPTerminal.java index 1011f13..e528c81 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/UDPTerminal.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/UDPTerminal.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.net; +package com.leaper.web.service.damLightSource.lib.modbus.net; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; +import com.leaper.web.service.damLightSource.lib.modbus.io.ModbusUDPTransport; import java.net.InetAddress; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/net/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/net/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java index ba17baf..945d0ea 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/AbstractRegister.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Abstract class for a register. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java index bbfc030..ca909ef 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DefaultProcessImageFactory.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * The default ProcessImageFactory. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java index fb5a502..07185c1 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DigitalIn.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Interface defining a digital input. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java index 6bd5726..2f0f9fa 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/DigitalOut.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Interface defining a digital output. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java index aff1fc7..9edf3df 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/IllegalAddressException.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Class implementing an IllegalAddressException. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/InputRegister.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/InputRegister.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/InputRegister.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/InputRegister.java index b14422e..ff2d9f0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/InputRegister.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/InputRegister.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Interface defining an input register. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java index 11ba2ff..f16f679 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ObservableDigitalOut.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Observable; +import com.leaper.web.service.damLightSource.lib.modbus.util.Observable; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java index ebc88dc..699fcd9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ObservableRegister.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; -import com.zhehekeji.web.service.damLightSource.lib.modbus.util.Observable; +import com.leaper.web.service.damLightSource.lib.modbus.util.Observable; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java index f9b2841..23cfe16 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImage.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Interface defining a process image diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java index d98e695..ab53878 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImageFactory.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Interface defining the factory methods for diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java index 493877c..e66741b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/ProcessImageImplementation.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Interface defining implementation specific diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/Register.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/Register.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/Register.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/Register.java index e8ef3cf..5966491 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/Register.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/Register.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Interface defining a register. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java index 174c17e..a86ad36 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalIn.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Class implementing a simple DigitalIn. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java index c90ed3e..ecdc3eb 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleDigitalOut.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Class implementing a simple DigitalOut. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java index b83c5db..6e466e4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleInputRegister.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Class implementing a simple InputRegister. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java index 20ec9a7..3233596 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleProcessImage.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; import java.util.Vector; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java index f9be956..8c26a04 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SimpleRegister.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Class implementing a simple Register. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java index ca39ff5..7d1bc32 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/SynchronizedAbstractRegister.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.procimg; +package com.leaper.web.service.damLightSource.lib.modbus.procimg; /** * Abstract class with synchronized diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/procimg/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/procimg/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/AtomicCounter.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/AtomicCounter.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/AtomicCounter.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/AtomicCounter.java index bef7cbc..0c5d4b7 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/AtomicCounter.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/AtomicCounter.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; /** * Provides an atomic integer. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/BitVector.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/BitVector.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/BitVector.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/BitVector.java index 340a9c7..27266ca 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/BitVector.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/BitVector.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; /** diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedNode.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/LinkedNode.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedNode.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/LinkedNode.java index dff22cb..a79ad6d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedNode.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/LinkedNode.java @@ -19,7 +19,7 @@ * Lea, Doug: "Concurrent Programming in Java: Design Principles and Patterns", * Second Edition, Addison-Wesley, ISBN 0-201-31009-0, November 1999 ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; /** * Class defining a linked node element. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedQueue.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/LinkedQueue.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedQueue.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/LinkedQueue.java index 481ddc3..0209e7b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/LinkedQueue.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/LinkedQueue.java @@ -19,7 +19,7 @@ * Lea, Doug: "Concurrent Programming in Java: Design Principles and Patterns", * Second Edition, Addison-Wesley, ISBN 0-201-31009-0, November 1999 ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; public class LinkedQueue { diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ModbusUtil.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/ModbusUtil.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ModbusUtil.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/ModbusUtil.java index 16bbd6d..d574ed6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ModbusUtil.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/ModbusUtil.java @@ -14,11 +14,11 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; -import com.zhehekeji.web.service.damLightSource.lib.modbus.io.BytesOutputStream; -import com.zhehekeji.web.service.damLightSource.lib.modbus.msg.ModbusMessage; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.io.BytesOutputStream; +import com.leaper.web.service.damLightSource.lib.modbus.msg.ModbusMessage; import java.io.IOException; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Mutex.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Mutex.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Mutex.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Mutex.java index 58e8fa2..bc20f8b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Mutex.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Mutex.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; /** * A simple non-reentrant mutual exclusion lock. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observable.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Observable.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observable.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Observable.java index 4431291..bbfc8e6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observable.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Observable.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; import java.util.Vector; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observer.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Observer.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observer.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Observer.java index 96674fb..7f43a3c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/Observer.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/Observer.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; /** * A cleanroom implementation of the Observer interface diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/SerialParameters.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/SerialParameters.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/SerialParameters.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/SerialParameters.java index 92c184c..aadcce4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/SerialParameters.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/SerialParameters.java @@ -14,9 +14,9 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; -import com.zhehekeji.web.service.damLightSource.lib.modbus.Modbus; +import com.leaper.web.service.damLightSource.lib.modbus.Modbus; import gnu.io.SerialPort; import java.util.Properties; diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ThreadPool.java b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/ThreadPool.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ThreadPool.java rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/ThreadPool.java index 312abff..46bc0b9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/ThreadPool.java +++ b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/ThreadPool.java @@ -14,7 +14,7 @@ * limitations under the License. ***/ -package com.zhehekeji.web.service.damLightSource.lib.modbus.util; +package com.leaper.web.service.damLightSource.lib.modbus.util; /** * Class implementing a simple thread pool. diff --git a/web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/package.html b/web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/package.html similarity index 100% rename from web/src/main/java/com/zhehekeji/web/service/damLightSource/lib/modbus/util/package.html rename to web/src/main/java/com/leaper/web/service/damLightSource/lib/modbus/util/package.html diff --git a/web/src/main/java/com/zhehekeji/web/service/hikLightSource/HikControlSocket.java b/web/src/main/java/com/leaper/web/service/hikLightSource/HikControlSocket.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/hikLightSource/HikControlSocket.java rename to web/src/main/java/com/leaper/web/service/hikLightSource/HikControlSocket.java index 17c3313..ca7166b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/hikLightSource/HikControlSocket.java +++ b/web/src/main/java/com/leaper/web/service/hikLightSource/HikControlSocket.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.hikLightSource; +package com.leaper.web.service.hikLightSource; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java b/web/src/main/java/com/leaper/web/service/ksec/KescEncoder.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java rename to web/src/main/java/com/leaper/web/service/ksec/KescEncoder.java index 44d121d..52ca2c4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java +++ b/web/src/main/java/com/leaper/web/service/ksec/KescEncoder.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.ksec; +package com.leaper.web.service.ksec; import com.alibaba.fastjson.JSONObject; import io.netty.buffer.ByteBuf; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KescFilter.java b/web/src/main/java/com/leaper/web/service/ksec/KescFilter.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/service/ksec/KescFilter.java rename to web/src/main/java/com/leaper/web/service/ksec/KescFilter.java index 57a8aca..8008921 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KescFilter.java +++ b/web/src/main/java/com/leaper/web/service/ksec/KescFilter.java @@ -1,6 +1,7 @@ -package com.zhehekeji.web.service.ksec; +package com.leaper.web.service.ksec; -import com.zhehekeji.web.service.*; +import com.leaper.web.service.PlcService; +import com.leaper.web.service.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelInitializer; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KescNettyHandler.java b/web/src/main/java/com/leaper/web/service/ksec/KescNettyHandler.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/ksec/KescNettyHandler.java rename to web/src/main/java/com/leaper/web/service/ksec/KescNettyHandler.java index 100ce53..cfe9d30 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KescNettyHandler.java +++ b/web/src/main/java/com/leaper/web/service/ksec/KescNettyHandler.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.service.ksec; +package com.leaper.web.service.ksec; -import com.zhehekeji.web.service.StreetConn; +import com.leaper.web.service.StreetConn; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.timeout.IdleStateEvent; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java b/web/src/main/java/com/leaper/web/service/ksec/KsecDataInfo.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java rename to web/src/main/java/com/leaper/web/service/ksec/KsecDataInfo.java index 90ac787..5b8b0ad 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDataInfo.java +++ b/web/src/main/java/com/leaper/web/service/ksec/KsecDataInfo.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.ksec; +package com.leaper.web.service.ksec; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/leaper/web/service/ksec/KsecDecoder.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java rename to web/src/main/java/com/leaper/web/service/ksec/KsecDecoder.java index b607823..a0726aa 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java +++ b/web/src/main/java/com/leaper/web/service/ksec/KsecDecoder.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.service.ksec; +package com.leaper.web.service.ksec; import com.alibaba.fastjson.JSONObject; -import com.zhehekeji.common.util.FileUtil; -import com.zhehekeji.web.pojo.Cmd; -import com.zhehekeji.web.service.GoodsActionTimes; -import com.zhehekeji.web.service.PlcCmdInfo; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.pojo.Cmd; +import com.leaper.web.service.PlcService; +import com.leaper.common.util.FileUtil; +import com.leaper.web.service.GoodsActionTimes; +import com.leaper.web.service.PlcCmdInfo; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.DelimiterBasedFrameDecoder; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecInfo.java b/web/src/main/java/com/leaper/web/service/ksec/KsecInfo.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/service/ksec/KsecInfo.java rename to web/src/main/java/com/leaper/web/service/ksec/KsecInfo.java index df70245..d472626 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecInfo.java +++ b/web/src/main/java/com/leaper/web/service/ksec/KsecInfo.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.ksec; +package com.leaper.web.service.ksec; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/leaper/web/service/ksec/KsecNettyClient.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java rename to web/src/main/java/com/leaper/web/service/ksec/KsecNettyClient.java index e5e3b25..b635757 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java +++ b/web/src/main/java/com/leaper/web/service/ksec/KsecNettyClient.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.service.ksec; +package com.leaper.web.service.ksec; -import com.zhehekeji.common.util.FileUtil; -import com.zhehekeji.web.config.ConfigProperties; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.service.PlcService; +import com.leaper.common.util.FileUtil; +import com.leaper.web.config.ConfigProperties; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.EventLoopGroup; diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientFilter.java b/web/src/main/java/com/leaper/web/service/robotic/HeartNettyClientFilter.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientFilter.java rename to web/src/main/java/com/leaper/web/service/robotic/HeartNettyClientFilter.java index c45b3f9..f74534e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientFilter.java +++ b/web/src/main/java/com/leaper/web/service/robotic/HeartNettyClientFilter.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.service.robotic; +package com.leaper.web.service.robotic; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.service.PlcService; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientHandler.java b/web/src/main/java/com/leaper/web/service/robotic/HeartNettyClientHandler.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientHandler.java rename to web/src/main/java/com/leaper/web/service/robotic/HeartNettyClientHandler.java index 8c24a02..0432e77 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientHandler.java +++ b/web/src/main/java/com/leaper/web/service/robotic/HeartNettyClientHandler.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.service.robotic; +package com.leaper.web.service.robotic; -import com.zhehekeji.web.service.StreetConn; +import com.leaper.web.service.StreetConn; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.timeout.IdleStateEvent; diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/NettyClient.java b/web/src/main/java/com/leaper/web/service/robotic/NettyClient.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/robotic/NettyClient.java rename to web/src/main/java/com/leaper/web/service/robotic/NettyClient.java index fe32e18..a0f4b75 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/NettyClient.java +++ b/web/src/main/java/com/leaper/web/service/robotic/NettyClient.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.service.robotic; +package com.leaper.web.service.robotic; -import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.entity.Street; +import com.leaper.web.mapper.StreetMapper; +import com.leaper.web.service.PlcService; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java b/web/src/main/java/com/leaper/web/service/robotic/ProtocolDecoder.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java rename to web/src/main/java/com/leaper/web/service/robotic/ProtocolDecoder.java index 46b416c..115e26d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java +++ b/web/src/main/java/com/leaper/web/service/robotic/ProtocolDecoder.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.service.robotic; +package com.leaper.web.service.robotic; -import com.zhehekeji.web.service.GoodsActionTimes; -import com.zhehekeji.web.service.PlcCmdInfo; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.service.PlcService; +import com.leaper.web.service.GoodsActionTimes; +import com.leaper.web.service.PlcCmdInfo; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.FixedLengthFrameDecoder; diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolEncoder.java b/web/src/main/java/com/leaper/web/service/robotic/ProtocolEncoder.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolEncoder.java rename to web/src/main/java/com/leaper/web/service/robotic/ProtocolEncoder.java index 8e06e4d..ac155ce 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolEncoder.java +++ b/web/src/main/java/com/leaper/web/service/robotic/ProtocolEncoder.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.robotic; +package com.leaper.web.service.robotic; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/web/src/main/java/com/zhehekeji/web/service/robotic/SendHeart.java b/web/src/main/java/com/leaper/web/service/robotic/SendHeart.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/robotic/SendHeart.java rename to web/src/main/java/com/leaper/web/service/robotic/SendHeart.java index 7c845c1..a3faa12 100644 --- a/web/src/main/java/com/zhehekeji/web/service/robotic/SendHeart.java +++ b/web/src/main/java/com/leaper/web/service/robotic/SendHeart.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.robotic; +package com.leaper.web.service.robotic; import lombok.Data; diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickClientHandler.java b/web/src/main/java/com/leaper/web/service/sick/SickClientHandler.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/sick/SickClientHandler.java rename to web/src/main/java/com/leaper/web/service/sick/SickClientHandler.java index 1a86379..61faf12 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickClientHandler.java +++ b/web/src/main/java/com/leaper/web/service/sick/SickClientHandler.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.sick; +package com.leaper.web.service.sick; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickConnMap.java b/web/src/main/java/com/leaper/web/service/sick/SickConnMap.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/sick/SickConnMap.java rename to web/src/main/java/com/leaper/web/service/sick/SickConnMap.java index 194dd93..bbe97a2 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickConnMap.java +++ b/web/src/main/java/com/leaper/web/service/sick/SickConnMap.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.sick; +package com.leaper.web.service.sick; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickDecoder.java b/web/src/main/java/com/leaper/web/service/sick/SickDecoder.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/sick/SickDecoder.java rename to web/src/main/java/com/leaper/web/service/sick/SickDecoder.java index b148279..d8afd7a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickDecoder.java +++ b/web/src/main/java/com/leaper/web/service/sick/SickDecoder.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.service.sick; +package com.leaper.web.service.sick; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.service.PlcService; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.LineBasedFrameDecoder; diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickEncoder.java b/web/src/main/java/com/leaper/web/service/sick/SickEncoder.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/service/sick/SickEncoder.java rename to web/src/main/java/com/leaper/web/service/sick/SickEncoder.java index 55f3f21..85ca046 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickEncoder.java +++ b/web/src/main/java/com/leaper/web/service/sick/SickEncoder.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.sick; +package com.leaper.web.service.sick; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickNettyClient.java b/web/src/main/java/com/leaper/web/service/sick/SickNettyClient.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/sick/SickNettyClient.java rename to web/src/main/java/com/leaper/web/service/sick/SickNettyClient.java index f67efe7..cf06f5c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickNettyClient.java +++ b/web/src/main/java/com/leaper/web/service/sick/SickNettyClient.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.service.sick; +package com.leaper.web.service.sick; -import com.zhehekeji.web.entity.SensorGun; -import com.zhehekeji.web.mapper.SensorGunMapper; -import com.zhehekeji.web.service.PlcService; +import com.leaper.web.entity.SensorGun; +import com.leaper.web.mapper.SensorGunMapper; +import com.leaper.web.service.PlcService; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickNettyClientFilter.java b/web/src/main/java/com/leaper/web/service/sick/SickNettyClientFilter.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/service/sick/SickNettyClientFilter.java rename to web/src/main/java/com/leaper/web/service/sick/SickNettyClientFilter.java index ab775b1..f112fd4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickNettyClientFilter.java +++ b/web/src/main/java/com/leaper/web/service/sick/SickNettyClientFilter.java @@ -1,13 +1,10 @@ -package com.zhehekeji.web.service.sick; +package com.leaper.web.service.sick; -import com.zhehekeji.web.service.PlcService; -import com.zhehekeji.web.service.robotic.*; +import com.leaper.web.service.PlcService; +import com.leaper.web.service.robotic.*; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; -import io.netty.handler.timeout.IdleStateHandler; - -import java.util.concurrent.TimeUnit; /** * 客户端过滤器，编解码和心跳的设置 diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java b/web/src/main/java/com/leaper/web/service/sick/SickSocket.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java rename to web/src/main/java/com/leaper/web/service/sick/SickSocket.java index 93d5cdb..8020116 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java +++ b/web/src/main/java/com/leaper/web/service/sick/SickSocket.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service.sick; +package com.leaper.web.service.sick; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; diff --git a/web/src/main/resources/mapper/CameraIOConfigMapper.xml b/web/src/main/resources/mapper/CameraIOConfigMapper.xml index 4d40c45..febd6cf 100644 --- a/web/src/main/resources/mapper/CameraIOConfigMapper.xml +++ b/web/src/main/resources/mapper/CameraIOConfigMapper.xml @@ -1,6 +1,6 @@ - + insert into camera_io_config( diff --git a/web/src/main/resources/mapper/CameraIOMapper.xml b/web/src/main/resources/mapper/CameraIOMapper.xml index b629857..b5c469d 100644 --- a/web/src/main/resources/mapper/CameraIOMapper.xml +++ b/web/src/main/resources/mapper/CameraIOMapper.xml @@ -1,6 +1,6 @@ - + insert into camera_io( diff --git a/web/src/main/resources/mapper/OrderMapper.xml b/web/src/main/resources/mapper/OrderMapper.xml index bd556c7..ae18c88 100644 --- a/web/src/main/resources/mapper/OrderMapper.xml +++ b/web/src/main/resources/mapper/OrderMapper.xml @@ -1,8 +1,8 @@ - + - select t.* from `order` t diff --git a/web/src/main/resources/mapper/StockMapper.xml b/web/src/main/resources/mapper/StockMapper.xml index 451aa92..6c18fb6 100644 --- a/web/src/main/resources/mapper/StockMapper.xml +++ b/web/src/main/resources/mapper/StockMapper.xml @@ -1,6 +1,6 @@ - + insert into stock( diff --git a/web/src/main/resources/mapper/StreetMapper.xml b/web/src/main/resources/mapper/StreetMapper.xml index 8c73b87..ed0d208 100644 --- a/web/src/main/resources/mapper/StreetMapper.xml +++ b/web/src/main/resources/mapper/StreetMapper.xml @@ -1,8 +1,8 @@ - + - select t.*,c1.name as camera1Name,c2.name as camera2Name,l.ip as lightSourceIp,l.port as lightSourcePort, s1.ip as leftSensorGunIp ,s1.port as leftSensorGunPort, s2.ip as rightSensorGunIp ,s2.port as rightSensorGunPort, diff --git a/web/src/main/resources/mapper/WarnMapper.xml b/web/src/main/resources/mapper/WarnMapper.xml index abd6e0e..9d48f47 100644 --- a/web/src/main/resources/mapper/WarnMapper.xml +++ b/web/src/main/resources/mapper/WarnMapper.xml @@ -1,8 +1,8 @@ - + - select t.*,s.name as streetName from warn t left join street s on s.id = t.street_id