diff --git a/三亚中心渔港监控站/CameraManage/Configuration.json b/三亚中心渔港监控站/CameraManage/Configuration.json index 128e601..1ee9cca 100644 --- a/三亚中心渔港监控站/CameraManage/Configuration.json +++ b/三亚中心渔港监控站/CameraManage/Configuration.json @@ -1,8 +1,8 @@ { "CameraManage": { - "save_camera_favorite_url": "http://172.20.15.53:9940/yunen/camera/save_camera_favorite", - "delete_camera_favorite_url": "http://172.20.15.53:9940/yunen/camera/delete_favorite", + "save_camera_favorite_url": "http://172.20.15.54:9940/yunen/camera/save_camera_favorite", + "delete_camera_favorite_url": "http://172.20.15.54:9940/yunen/camera/delete_favorite", "use_tree_cameragroup-comment": "true显示相机树形结构（按组织分组显示）， false 显示二级分组", "use_tree_cameragroup": false } diff --git a/三亚中心渔港监控站/EvidenceChain/Configuration.json b/三亚中心渔港监控站/EvidenceChain/Configuration.json index 7711b0d..f2ba571 100644 --- a/三亚中心渔港监控站/EvidenceChain/Configuration.json +++ b/三亚中心渔港监控站/EvidenceChain/Configuration.json @@ -18,9 +18,9 @@ "ar_splitline_border" : 3, "ar_view_xy_comment" : "所在画面中相对位置，如(3，3)，则为画面尺寸（x/4*3,y/4*3)", "ar_view_xy": "3,3", - "HistoryTrackMapurl":"http://172.20.15.53:9940/pages/smartship/shiptarget/history/historyTrackMap.html", - "save_ship_favorite": "http://172.20.15.53:9940/yunen/ship_target/save_ship_favorite", - "delete_favorite": "http://172.20.15.53:9940/yunen/ship_target/delete_favorite", + "HistoryTrackMapurl": "http://172.20.15.54:9940/pages/smartship/shiptarget/history/historyTrackMap.html", + "save_ship_favorite": "http://172.20.15.54:9940/yunen/ship_target/save_ship_favorite", + "delete_favorite": "http://172.20.15.54:9940/yunen/ship_target/delete_favorite", "sub_view_list-comment": "设置监管界面子窗口位置[0,3][0,3]", "sub_view_list": [ [3, 3], diff --git a/三亚中心渔港监控站/SmartShipManage/WebConfig.xml b/三亚中心渔港监控站/SmartShipManage/WebConfig.xml index fd9cfc7..8f79b71 100644 --- a/三亚中心渔港监控站/SmartShipManage/WebConfig.xml +++ b/三亚中心渔港监控站/SmartShipManage/WebConfig.xml @@ -9,10 +9,10 @@ --> - History Ship List +History Ship List - Current Ship Statistics - History Ship Statistics +Current Ship Statistics +History Ship Statistics diff --git a/三亚中心渔港监控站/SmartShipSupervision/ShipEvent.xml b/三亚中心渔港监控站/SmartShipSupervision/ShipEvent.xml index 59d43d8..125aeff 100644 --- a/三亚中心渔港监控站/SmartShipSupervision/ShipEvent.xml +++ b/三亚中心渔港监控站/SmartShipSupervision/ShipEvent.xml @@ -1,18 +1,18 @@  - + - + - + diff --git a/三亚中心渔港监控站/SmartShipSupervision/WebConfig.xml b/三亚中心渔港监控站/SmartShipSupervision/WebConfig.xml index cb10f02..62d77a9 100644 --- a/三亚中心渔港监控站/SmartShipSupervision/WebConfig.xml +++ b/三亚中心渔港监控站/SmartShipSupervision/WebConfig.xml @@ -9,6 +9,6 @@ --> - laneDetail +laneDetail diff --git a/三亚中心渔港监控站/SystemConfig/WebConfig.xml b/三亚中心渔港监控站/SystemConfig/WebConfig.xml index 3a6c75c..b41161e 100644 --- a/三亚中心渔港监控站/SystemConfig/WebConfig.xml +++ b/三亚中心渔港监控站/SystemConfig/WebConfig.xml @@ -10,41 +10,41 @@ --> - Real Map - SmartShip Manage - Key Area - Position Manage - Camera Inspection Area - Ais Store Area - Server Manage - Network Switch +Real Map +SmartShip Manage +Key Area +Position Manage +Camera Inspection Area +Ais Store Area +Server Manage +Network Switch - Stream Media Server Manage - Camera Group Manage - Camera Manage +Stream Media Server Manage +Camera Group Manage +Camera Manage - + - User Statistics - User Manage - Permission Manage - Role Manage - Organization Manage +User Statistics +User Manage +Permission Manage +Role Manage +Organization Manage diff --git a/三亚中心渔港监控站/WarningEventManage/EmergencyCommand.xml b/三亚中心渔港监控站/WarningEventManage/EmergencyCommand.xml index 534c39e..96da70b 100644 --- a/三亚中心渔港监控站/WarningEventManage/EmergencyCommand.xml +++ b/三亚中心渔港监控站/WarningEventManage/EmergencyCommand.xml @@ -1,7 +1,7 @@  - + diff --git a/三亚中心渔港监控站/WarningEventManage/WarningEvent.xml b/三亚中心渔港监控站/WarningEventManage/WarningEvent.xml index 37c57ba..7285dc8 100644 --- a/三亚中心渔港监控站/WarningEventManage/WarningEvent.xml +++ b/三亚中心渔港监控站/WarningEventManage/WarningEvent.xml @@ -1,27 +1,27 @@  - + - + - Untreated Warnings - Treated Warnings - Warnings Configuration - Alarm Summary Event +Untreated Warnings +Treated Warnings +Warnings Configuration +Alarm Summary Event - + diff --git a/三亚中心渔港监控站/WebConfig.xml b/三亚中心渔港监控站/WebConfig.xml index 6593a1d..4eacf0f 100644 --- a/三亚中心渔港监控站/WebConfig.xml +++ b/三亚中心渔港监控站/WebConfig.xml @@ -9,64 +9,64 @@ --> - History Ship List +History Ship List - Current Ship Statistics - History Ship Statistics +Current Ship Statistics +History Ship Statistics - Real Map - SmartShip Manage - Key Area - Position Manage - Camera Inspection Area - Ais Store Area - Server Manage - Network Switch +Real Map +SmartShip Manage +Key Area +Position Manage +Camera Inspection Area +Ais Store Area +Server Manage +Network Switch - Stream Media Server Manage - Camera Group Manage - Camera Manage +Stream Media Server Manage +Camera Group Manage +Camera Manage - + - User Statistics - User Manage - Permission Manage - Role Manage - Organization Manage +User Statistics +User Manage +Permission Manage +Role Manage +Organization Manage - Untreated Warnings - Treated Warnings - Warnings Configuration - Alarm Summary Event +Untreated Warnings +Treated Warnings +Warnings Configuration +Alarm Summary Event - + - laneDetail +laneDetail diff --git a/三亚中心渔港监控站/WebServer.json b/三亚中心渔港监控站/WebServer.json index c0b5bea..5b18324 100644 --- a/三亚中心渔港监控站/WebServer.json +++ b/三亚中心渔港监控站/WebServer.json @@ -1,22 +1,22 @@ { - "IP": "172.20.15.53", + "IP": "172.20.15.54", "Describe": "江门崖门卡口外网配置", "RegisterManager": { - "regurl_list": "http://172.20.15.53:9940/yunen/register/code/list", - "regurl_save": "http://172.20.15.53:9940/yunen/register/code/save", - "regurl_status": "http://172.20.15.53:9940/yunen/register/code/reported", + "regurl_list": "http://172.20.15.54:9940/yunen/register/code/list", + "regurl_save": "http://172.20.15.54:9940/yunen/register/code/save", + "regurl_status": "http://172.20.15.54:9940/yunen/register/code/reported", "plugin": "Core" }, "UserManagerServer": { - "server_url": "http://172.20.15.53:9940", - "curr_userinfo_url": "http://172.20.15.53:9940/users/current", - "user_role_url": "http://172.20.15.53:9940/roles", - "modify_password_page": "http://172.20.15.53:9940/pages/user/changePassword.html", - "keep_alive_url": "http://172.20.15.53:9940/users/heartbeat", - "login_html": "http://172.20.15.53:9940/client_login.html", + "server_url": "http://172.20.15.54:9940", + "curr_userinfo_url": "http://172.20.15.54:9940/users/current", + "user_role_url": "http://172.20.15.54:9940/roles", + "modify_password_page": "http://172.20.15.54:9940/pages/user/changePassword.html", + "keep_alive_url": "http://172.20.15.54:9940/users/heartbeat", + "login_html": "http://172.20.15.54:9940/client_login.html", "in_or_out_comment": "内外网配置", - "get_permission": "http://172.20.15.53:9940/permissions/get_permission", + "get_permission": "http://172.20.15.54:9940/permissions/get_permission", "plugin": "Core" }, "Update": { @@ -24,135 +24,135 @@ "plugin": "Core" }, "Help": { - "help_doc_url": "http://172.20.15.53:9920/smartship/help_doc/help_doc.html", + "help_doc_url": "http://172.20.15.54:9920/smartship/help_doc/help_doc.html", "plugin": "Core" }, "SysServerLog": { - "create_url": "http://172.20.15.53:9940/yunen/logs/create", + "create_url": "http://172.20.15.54:9940/yunen/logs/create", "plugin": "Core" }, "ClientLogin": { - "url": "http://172.20.15.53:9940/client_login.html", + "url": "http://172.20.15.54:9940/client_login.html", "plugin": "Core" }, "CameraServer": { - "camera_query": "http://172.20.15.53:9940/yunen/camera/find", - "camera_group_query": "http://172.20.15.53:9940/yunen/camera_group/find", - "camera_grouptree_query": "http://172.20.15.53:9940/yunen/camera_group/organ_camera_list", - "preset_query": "http://172.20.15.53:9940/yunen/camera_pre_set/find", - "preset_control": "http://172.20.15.53:9940/yunen/camera_control/ptz_pre_set", - "camera_control": "http://172.20.15.53:9940/yunen/camera_control/ptz_control", - "preset_add": "http://172.20.15.53:9940/yunen/camera_pre_set/create", - "preset_modify": "http://172.20.15.53:9940/yunen/camera_pre_set/update", - "preset_delete": "http://172.20.15.53:9940/yunen/camera_pre_set/delete", - "streamingserver_query": "http://172.20.15.53:9940/yunen/camera_stream_server/find", - "3DPosition": "http://172.20.15.53:9940/yunen/camera_control/net_dvr_ptzselzoomin_ex", - "get_ptz": "http://172.20.15.53:9940/yunen/camera_control/get_camera_ptz", - "set_ptz": "http://172.20.15.53:9940/yunen/camera_control/set_camera_ptz", - "one_push_focus": "http://172.20.15.53:9940/yunen/camera_control/focusOnePush", - "set_focus_mode": "http://172.20.15.53:9940/yunen/camera_control/setFocusMode", - "ship_pos": "http://172.20.15.53:9940/yunen/ship_target_track/start_photo_track", - "stop_ship_pos": "http://172.20.15.53:9940/yunen/ship_target_track/stop_photo_track", - "emergency_command": "http://172.20.15.53:9940/yunen/monitor/single_config", + "camera_query": "http://172.20.15.54:9940/yunen/camera/find", + "camera_group_query": "http://172.20.15.54:9940/yunen/camera_group/find", + "camera_grouptree_query": "http://172.20.15.54:9940/yunen/camera_group/organ_camera_list", + "preset_query": "http://172.20.15.54:9940/yunen/camera_pre_set/find", + "preset_control": "http://172.20.15.54:9940/yunen/camera_control/ptz_pre_set", + "camera_control": "http://172.20.15.54:9940/yunen/camera_control/ptz_control", + "preset_add": "http://172.20.15.54:9940/yunen/camera_pre_set/create", + "preset_modify": "http://172.20.15.54:9940/yunen/camera_pre_set/update", + "preset_delete": "http://172.20.15.54:9940/yunen/camera_pre_set/delete", + "streamingserver_query": "http://172.20.15.54:9940/yunen/camera_stream_server/find", + "3DPosition": "http://172.20.15.54:9940/yunen/camera_control/net_dvr_ptzselzoomin_ex", + "get_ptz": "http://172.20.15.54:9940/yunen/camera_control/get_camera_ptz", + "set_ptz": "http://172.20.15.54:9940/yunen/camera_control/set_camera_ptz", + "one_push_focus": "http://172.20.15.54:9940/yunen/camera_control/focusOnePush", + "set_focus_mode": "http://172.20.15.54:9940/yunen/camera_control/setFocusMode", + "ship_pos": "http://172.20.15.54:9940/yunen/ship_target_track/start_photo_track", + "stop_ship_pos": "http://172.20.15.54:9940/yunen/ship_target_track/stop_photo_track", + "emergency_command": "http://172.20.15.54:9940/yunen/monitor/single_config", "plugin": "CameraManager", "config_mode-comment": "设置卡口模式", - "config_mode": "http://172.20.15.53:9940/yunen/checkpoint/config_mode", + "config_mode": "http://172.20.15.54:9940/yunen/checkpoint/config_mode", "recover_mode-comment": "恢复卡口模式", - "recover_mode": "http://172.20.15.53:9940/yunen/checkpoint/recover_mode" + "recover_mode": "http://172.20.15.54:9940/yunen/checkpoint/recover_mode" }, "CameraStatus": { - "camera_status_url": "tcp://172.20.15.53:9912", + "camera_status_url": "tcp://172.20.15.54:9912", "camera_status_topic": "camera_status_list", "plugin": "CameraManager" }, "EvidenceChain": { "desc": "兼容老版本", "ais_track_url_comment": "查询AIS轨迹信息", - "ais_track_url": "http://172.20.15.53:9940/yunen/ais/get_tracks", + "ais_track_url": "http://172.20.15.54:9940/yunen/ais/get_tracks", "ship_target_url_comment": "船舶目标列表查询", - "ship_target_url": "http://172.20.15.53:9940/yunen/ship_target/list", + "ship_target_url": "http://172.20.15.54:9940/yunen/ship_target/list", "shiptargetid_url-comment": "通过 shipTargetId 查询目标信息", - "shiptargetid_url": "http://172.20.15.53:9940/yunen/ship_target/get_ship_target", + "shiptargetid_url": "http://172.20.15.54:9940/yunen/ship_target/get_ship_target", "info_AIS_url_comment": "船舶目标AIS信息查询", - "info_AIS_url": "http://172.20.15.53:9940/yunen/ais/get_ship_info", + "info_AIS_url": "http://172.20.15.54:9940/yunen/ais/get_ship_info", "ship_target_url2_comment": "船舶目标列表查询", - "ship_target_url2": "http://172.20.15.53:9940/yunen/ship_target/get_ship_target_by_targetId", + "ship_target_url2": "http://172.20.15.54:9940/yunen/ship_target/get_ship_target_by_targetId", "plugin": "SmartShipCore" }, "SmartShipCore": { "ais_track_url_comment": "查询AIS轨迹信息", - "ais_track_url": "http://172.20.15.53:9940/yunen/ais/get_tracks", + "ais_track_url": "http://172.20.15.54:9940/yunen/ais/get_tracks", "ship_target_url_comment": "船舶目标列表查询", - "ship_target_url": "http://172.20.15.53:9940/yunen/ship_target/list", + "ship_target_url": "http://172.20.15.54:9940/yunen/ship_target/list", "shiptargetid_url-comment": "通过 shipTargetId 查询目标信息", - "shiptargetid_url": "http://172.20.15.53:9940/yunen/ship_target/get_ship_target", + "shiptargetid_url": "http://172.20.15.54:9940/yunen/ship_target/get_ship_target", "info_AIS_url_comment": "船舶目标AIS信息查询", - "info_AIS_url": "http://172.20.15.53:9940/yunen/ais/get_ship_info", + "info_AIS_url": "http://172.20.15.54:9940/yunen/ais/get_ship_info", "ship_target_url2_comment": "船舶目标列表查询", - "ship_target_url2": "http://172.20.15.53:9940/yunen/ship_target/get_ship_target_by_targetId", + "ship_target_url2": "http://172.20.15.54:9940/yunen/ship_target/get_ship_target_by_targetId", "plugin": "SmartShipCore", "checkpoint_mode_list_comment": "获取卡口运行状态列表", - "checkpoint_mode_list": "http://172.20.15.53:9940/yunen/checkpoint/checkpoint_mode_list", + "checkpoint_mode_list": "http://172.20.15.54:9940/yunen/checkpoint/checkpoint_mode_list", "buoypatrolstatus_url-comment": "获取航标巡逻状态", - "buoypatrolstatus_url": "http://172.20.15.53:9940/yunen/patrol/get_patrol_status" + "buoypatrolstatus_url": "http://172.20.15.54:9940/yunen/patrol/get_patrol_status" }, "Map": { - "MapRenderServer": "http://172.20.15.53:9921/map/", - "DataServer": "http://172.20.15.53:9940", + "MapRenderServer": "http://172.20.15.54:9921/map/", + "DataServer": "http://172.20.15.54:9940", "plugin": "Map" }, "SmartShipEventWorker": { - "url": "tcp://172.20.15.53:9912", + "url": "tcp://172.20.15.54:9912", "topics": "analyzer.boat", "plugin": "SmartShipCore" }, "SmartShipHttpServer": { "checkpoint_query_comment": "卡口信息请求url", - "checkpoint_query": "http://172.20.15.53:9940/yunen/checkpoint/list", + "checkpoint_query": "http://172.20.15.54:9940/yunen/checkpoint/list", "request_time_comment": "请求间隔min", "request_time": 10, "plugin": "SmartShipCore", "ship_target_simple_url_comment": "船舶目标简单列表查询", - "ship_target_simple_url": "http://172.20.15.53:9940/yunen/ship_target/simple_list", + "ship_target_simple_url": "http://172.20.15.54:9940/yunen/ship_target/simple_list", "warningtypelist_url-comment": "获取警示类型列表，主要是警示类型图标资源", - "warningtypelist_url": "http://172.20.15.53:9940/yunen/alarm_type_config/list" + "warningtypelist_url": "http://172.20.15.54:9940/yunen/alarm_type_config/list" }, "ShipTarget": { - "ship_target_url": "tcp://172.20.15.53:9912", + "ship_target_url": "tcp://172.20.15.54:9912", "ship_target_topic": "ship_target", "plugin": "SmartShipCore", - "ship_target_video_info": "http://172.20.15.53:9940/yunen/ship_target/get_ship_videoinfo" + "ship_target_video_info": "http://172.20.15.54:9940/yunen/ship_target/get_ship_videoinfo" }, "VideoAnalyzer": { - "video_analyzer_url": "tcp://172.20.15.53:9912", + "video_analyzer_url": "tcp://172.20.15.54:9912", "video_analyzer_topic": "analyzer.smartship", "plugin": "SmartShipCore" }, "SmartShipSupervision": { "weather_url_comment": "当前天气查询", - "weather_url": "http://172.20.15.53:9940/yunen/weather/now", + "weather_url": "http://172.20.15.54:9940/yunen/weather/now", "plugin": "SmartShipSupervision", - "supervision_statistics": "http://172.20.15.53:9940/yunen/statistics/supervision_statistics" + "supervision_statistics": "http://172.20.15.54:9940/yunen/statistics/supervision_statistics" }, "WarningEventManage": { "warning_url_comment": "订阅警示消息", - "warning_url": "tcp://172.20.15.53:9912", + "warning_url": "tcp://172.20.15.54:9912", "warning_topic": "alarm_event", "analyzer_control_topic": "analyzercontrol", "plugin": "WarningEventManage" }, "HttpUrl": { "warning_query_count_comment": "卡口历史警示总数查询接口", - "warning_query_count": "http://172.20.15.53:9940/yunen/alarm_event/count", + "warning_query_count": "http://172.20.15.54:9940/yunen/alarm_event/count", "warning_simple_list_comment": "卡口历史警示简单列表查询接口", - "warning_simple_list": "http://172.20.15.53:9940/yunen/alarm_event/alarm_list", + "warning_simple_list": "http://172.20.15.54:9940/yunen/alarm_event/alarm_list", "warning_list_url_comment": "卡口历史警示列表查询接口", - "warning_list_url": "http://172.20.15.53:9940/yunen/alarm_event/list", + "warning_list_url": "http://172.20.15.54:9940/yunen/alarm_event/list", "monitor_config_List_url_comment": "应急指挥状态列表查询接口", - "monitor_config_List_url": "http://172.20.15.53:9940/yunen/monitor/configList", + "monitor_config_List_url": "http://172.20.15.54:9940/yunen/monitor/configList", "plugin": "WarningEventManage" }, "WebResource": { - "resource_url": "http://172.20.15.53:9920/" + "resource_url": "http://172.20.15.54:9920/" } } \ No newline at end of file diff --git a/东方八所海事局监控站/CameraManage/Configuration.json b/东方八所海事局监控站/CameraManage/Configuration.json index 04834cb..bd129b9 100644 --- a/东方八所海事局监控站/CameraManage/Configuration.json +++ b/东方八所海事局监控站/CameraManage/Configuration.json @@ -1,8 +1,8 @@ { "CameraManage": { - "save_camera_favorite_url": "http://172.20.1.53:9940/yunen/camera/save_camera_favorite", - "delete_camera_favorite_url": "http://172.20.1.53:9940/yunen/camera/delete_favorite", + "save_camera_favorite_url": "http://172.20.1.54:9940/yunen/camera/save_camera_favorite", + "delete_camera_favorite_url": "http://172.20.1.54:9940/yunen/camera/delete_favorite", "use_tree_cameragroup-comment": "true显示相机树形结构（按组织分组显示）， false 显示二级分组", "use_tree_cameragroup": false } diff --git a/东方八所海事局监控站/EvidenceChain/Configuration.json b/东方八所海事局监控站/EvidenceChain/Configuration.json index b96afe2..80a9f65 100644 --- a/东方八所海事局监控站/EvidenceChain/Configuration.json +++ b/东方八所海事局监控站/EvidenceChain/Configuration.json @@ -18,9 +18,9 @@ "ar_splitline_border" : 3, "ar_view_xy_comment" : "所在画面中相对位置，如(3，3)，则为画面尺寸（x/4*3,y/4*3)", "ar_view_xy": "3,3", - "HistoryTrackMapurl":"http://172.20.1.53:9940/pages/smartship/shiptarget/history/historyTrackMap.html", - "save_ship_favorite": "http://172.20.1.53:9940/yunen/ship_target/save_ship_favorite", - "delete_favorite": "http://172.20.1.53:9940/yunen/ship_target/delete_favorite", + "HistoryTrackMapurl": "http://172.20.1.54:9940/pages/smartship/shiptarget/history/historyTrackMap.html", + "save_ship_favorite": "http://172.20.1.54:9940/yunen/ship_target/save_ship_favorite", + "delete_favorite": "http://172.20.1.54:9940/yunen/ship_target/delete_favorite", "sub_view_list-comment": "设置监管界面子窗口位置[0,3][0,3]", "sub_view_list": [ [3, 3], diff --git a/东方八所海事局监控站/SmartShipManage/WebConfig.xml b/东方八所海事局监控站/SmartShipManage/WebConfig.xml index 8d530b9..d3631c7 100644 --- a/东方八所海事局监控站/SmartShipManage/WebConfig.xml +++ b/东方八所海事局监控站/SmartShipManage/WebConfig.xml @@ -9,10 +9,10 @@ --> - History Ship List +History Ship List - Current Ship Statistics - History Ship Statistics +Current Ship Statistics +History Ship Statistics diff --git a/东方八所海事局监控站/SmartShipSupervision/ShipEvent.xml b/东方八所海事局监控站/SmartShipSupervision/ShipEvent.xml index a375e5f..d42f177 100644 --- a/东方八所海事局监控站/SmartShipSupervision/ShipEvent.xml +++ b/东方八所海事局监控站/SmartShipSupervision/ShipEvent.xml @@ -1,18 +1,18 @@  - + - + - + diff --git a/东方八所海事局监控站/SmartShipSupervision/WebConfig.xml b/东方八所海事局监控站/SmartShipSupervision/WebConfig.xml index 5b32cdd..792faad 100644 --- a/东方八所海事局监控站/SmartShipSupervision/WebConfig.xml +++ b/东方八所海事局监控站/SmartShipSupervision/WebConfig.xml @@ -9,6 +9,6 @@ --> - laneDetail +laneDetail diff --git a/东方八所海事局监控站/SystemConfig/WebConfig.xml b/东方八所海事局监控站/SystemConfig/WebConfig.xml index 3ca3147..9b30ccb 100644 --- a/东方八所海事局监控站/SystemConfig/WebConfig.xml +++ b/东方八所海事局监控站/SystemConfig/WebConfig.xml @@ -10,41 +10,41 @@ --> - Real Map - SmartShip Manage - Key Area - Position Manage - Camera Inspection Area - Ais Store Area - Server Manage - Network Switch +Real Map +SmartShip Manage +Key Area +Position Manage +Camera Inspection Area +Ais Store Area +Server Manage +Network Switch - Stream Media Server Manage - Camera Group Manage - Camera Manage +Stream Media Server Manage +Camera Group Manage +Camera Manage - + - User Statistics - User Manage - Permission Manage - Role Manage - Organization Manage +User Statistics +User Manage +Permission Manage +Role Manage +Organization Manage diff --git a/东方八所海事局监控站/WarningEventManage/EmergencyCommand.xml b/东方八所海事局监控站/WarningEventManage/EmergencyCommand.xml index 0757621..d277cde 100644 --- a/东方八所海事局监控站/WarningEventManage/EmergencyCommand.xml +++ b/东方八所海事局监控站/WarningEventManage/EmergencyCommand.xml @@ -1,7 +1,7 @@  - + diff --git a/东方八所海事局监控站/WarningEventManage/WarningEvent.xml b/东方八所海事局监控站/WarningEventManage/WarningEvent.xml index a845232..069d593 100644 --- a/东方八所海事局监控站/WarningEventManage/WarningEvent.xml +++ b/东方八所海事局监控站/WarningEventManage/WarningEvent.xml @@ -1,27 +1,27 @@  - + - + - Untreated Warnings - Treated Warnings - Warnings Configuration - Alarm Summary Event +Untreated Warnings +Treated Warnings +Warnings Configuration +Alarm Summary Event - + diff --git a/东方八所海事局监控站/WebConfig.xml b/东方八所海事局监控站/WebConfig.xml index e1f5a28..597e04e 100644 --- a/东方八所海事局监控站/WebConfig.xml +++ b/东方八所海事局监控站/WebConfig.xml @@ -9,64 +9,64 @@ --> - History Ship List +History Ship List - Current Ship Statistics - History Ship Statistics +Current Ship Statistics +History Ship Statistics - Real Map - SmartShip Manage - Key Area - Position Manage - Camera Inspection Area - Ais Store Area - Server Manage - Network Switch +Real Map +SmartShip Manage +Key Area +Position Manage +Camera Inspection Area +Ais Store Area +Server Manage +Network Switch - Stream Media Server Manage - Camera Group Manage - Camera Manage +Stream Media Server Manage +Camera Group Manage +Camera Manage - + - User Statistics - User Manage - Permission Manage - Role Manage - Organization Manage +User Statistics +User Manage +Permission Manage +Role Manage +Organization Manage - Untreated Warnings - Treated Warnings - Warnings Configuration - Alarm Summary Event +Untreated Warnings +Treated Warnings +Warnings Configuration +Alarm Summary Event - + - laneDetail +laneDetail diff --git a/东方八所海事局监控站/WebServer.json b/东方八所海事局监控站/WebServer.json index 1171bb2..ff52db0 100644 --- a/东方八所海事局监控站/WebServer.json +++ b/东方八所海事局监控站/WebServer.json @@ -1,22 +1,21 @@ { - "IP": "172.20.1.53", + "IP": "172.20.1.54", "Describe": "江门崖门卡口外网配置", "RegisterManager": { - "regurl_list": "http://172.20.1.53:9940/yunen/register/code/list", - "regurl_save": "http://172.20.1.53:9940/yunen/register/code/save", - "regurl_status": "http://172.20.1.53:9940/yunen/register/code/reported", + "regurl_list": "http://172.20.1.54:9940/yunen/register/code/list", + "regurl_save": "http://172.20.1.54:9940/yunen/register/code/save", + "regurl_status": "http://172.20.1.54:9940/yunen/register/code/reported", "plugin": "Core" }, "UserManagerServer": { - "server_url": "http://172.20.1.53:9940", - "curr_userinfo_url": "http://172.20.1.53:9940/users/current", - "user_role_url": "http://172.20.1.53:9940/roles", - "modify_password_page": "http://172.20.1.53:9940/pages/user/changePassword.html", - "keep_alive_url": "http://172.20.1.53:9940/users/heartbeat", - "login_html": "http://172.20.1.53:9940/client_login.html", + "server_url": "http://172.20.1.54:9940", + "curr_userinfo_url": "http://172.20.1.54:9940/users/current", + "user_role_url": "http://172.20.1.54:9940/roles", + "modify_password_page": "http://172.20.1.54:9940/pages/user/changePassword.html", + "keep_alive_url": "http://172.20.1.54:9940/users/heartbeat", + "login_html": "http://172.20.1.54:9940/client_login.html", "in_or_out_comment": "内外网配置", - - "get_permission": "http://172.20.1.53:9940/permissions/get_permission", + "get_permission": "http://172.20.1.54:9940/permissions/get_permission", "plugin": "Core" }, "Update": { @@ -24,135 +23,135 @@ "plugin": "Core" }, "Help": { - "help_doc_url": "http://172.20.1.53:9920/smartship/help_doc/help_doc.html", + "help_doc_url": "http://172.20.1.54:9920/smartship/help_doc/help_doc.html", "plugin": "Core" }, "SysServerLog": { - "create_url": "http://172.20.1.53:9940/yunen/logs/create", + "create_url": "http://172.20.1.54:9940/yunen/logs/create", "plugin": "Core" }, "ClientLogin": { - "url": "http://172.20.1.53:9940/client_login.html", + "url": "http://172.20.1.54:9940/client_login.html", "plugin": "Core" }, "CameraServer": { - "camera_query": "http://172.20.1.53:9940/yunen/camera/find", - "camera_group_query": "http://172.20.1.53:9940/yunen/camera_group/find", - "camera_grouptree_query": "http://172.20.1.53:9940/yunen/camera_group/organ_camera_list", - "preset_query": "http://172.20.1.53:9940/yunen/camera_pre_set/find", - "preset_control": "http://172.20.1.53:9940/yunen/camera_control/ptz_pre_set", - "camera_control": "http://172.20.1.53:9940/yunen/camera_control/ptz_control", - "preset_add": "http://172.20.1.53:9940/yunen/camera_pre_set/create", - "preset_modify": "http://172.20.1.53:9940/yunen/camera_pre_set/update", - "preset_delete": "http://172.20.1.53:9940/yunen/camera_pre_set/delete", - "streamingserver_query": "http://172.20.1.53:9940/yunen/camera_stream_server/find", - "3DPosition": "http://172.20.1.53:9940/yunen/camera_control/net_dvr_ptzselzoomin_ex", - "get_ptz": "http://172.20.1.53:9940/yunen/camera_control/get_camera_ptz", - "set_ptz": "http://172.20.1.53:9940/yunen/camera_control/set_camera_ptz", - "one_push_focus": "http://172.20.1.53:9940/yunen/camera_control/focusOnePush", - "set_focus_mode": "http://172.20.1.53:9940/yunen/camera_control/setFocusMode", - "ship_pos": "http://172.20.1.53:9940/yunen/ship_target_track/start_photo_track", - "stop_ship_pos": "http://172.20.1.53:9940/yunen/ship_target_track/stop_photo_track", - "emergency_command": "http://172.20.1.53:9940/yunen/monitor/single_config", + "camera_query": "http://172.20.1.54:9940/yunen/camera/find", + "camera_group_query": "http://172.20.1.54:9940/yunen/camera_group/find", + "camera_grouptree_query": "http://172.20.1.54:9940/yunen/camera_group/organ_camera_list", + "preset_query": "http://172.20.1.54:9940/yunen/camera_pre_set/find", + "preset_control": "http://172.20.1.54:9940/yunen/camera_control/ptz_pre_set", + "camera_control": "http://172.20.1.54:9940/yunen/camera_control/ptz_control", + "preset_add": "http://172.20.1.54:9940/yunen/camera_pre_set/create", + "preset_modify": "http://172.20.1.54:9940/yunen/camera_pre_set/update", + "preset_delete": "http://172.20.1.54:9940/yunen/camera_pre_set/delete", + "streamingserver_query": "http://172.20.1.54:9940/yunen/camera_stream_server/find", + "3DPosition": "http://172.20.1.54:9940/yunen/camera_control/net_dvr_ptzselzoomin_ex", + "get_ptz": "http://172.20.1.54:9940/yunen/camera_control/get_camera_ptz", + "set_ptz": "http://172.20.1.54:9940/yunen/camera_control/set_camera_ptz", + "one_push_focus": "http://172.20.1.54:9940/yunen/camera_control/focusOnePush", + "set_focus_mode": "http://172.20.1.54:9940/yunen/camera_control/setFocusMode", + "ship_pos": "http://172.20.1.54:9940/yunen/ship_target_track/start_photo_track", + "stop_ship_pos": "http://172.20.1.54:9940/yunen/ship_target_track/stop_photo_track", + "emergency_command": "http://172.20.1.54:9940/yunen/monitor/single_config", "plugin": "CameraManager", "config_mode-comment": "设置卡口模式", - "config_mode": "http://172.20.1.53:9940/yunen/checkpoint/config_mode", + "config_mode": "http://172.20.1.54:9940/yunen/checkpoint/config_mode", "recover_mode-comment": "恢复卡口模式", - "recover_mode": "http://172.20.1.53:9940/yunen/checkpoint/recover_mode" + "recover_mode": "http://172.20.1.54:9940/yunen/checkpoint/recover_mode" }, "CameraStatus": { - "camera_status_url": "tcp://172.20.1.53:9912", + "camera_status_url": "tcp://172.20.1.54:9912", "camera_status_topic": "camera_status_list", "plugin": "CameraManager" }, "EvidenceChain": { "desc": "兼容老版本", "ais_track_url_comment": "查询AIS轨迹信息", - "ais_track_url": "http://172.20.1.53:9940/yunen/ais/get_tracks", + "ais_track_url": "http://172.20.1.54:9940/yunen/ais/get_tracks", "ship_target_url_comment": "船舶目标列表查询", - "ship_target_url": "http://172.20.1.53:9940/yunen/ship_target/list", + "ship_target_url": "http://172.20.1.54:9940/yunen/ship_target/list", "shiptargetid_url-comment": "通过 shipTargetId 查询目标信息", - "shiptargetid_url": "http://172.20.1.53:9940/yunen/ship_target/get_ship_target", + "shiptargetid_url": "http://172.20.1.54:9940/yunen/ship_target/get_ship_target", "info_AIS_url_comment": "船舶目标AIS信息查询", - "info_AIS_url": "http://172.20.1.53:9940/yunen/ais/get_ship_info", + "info_AIS_url": "http://172.20.1.54:9940/yunen/ais/get_ship_info", "ship_target_url2_comment": "船舶目标列表查询", - "ship_target_url2": "http://172.20.1.53:9940/yunen/ship_target/get_ship_target_by_targetId", + "ship_target_url2": "http://172.20.1.54:9940/yunen/ship_target/get_ship_target_by_targetId", "plugin": "SmartShipCore" }, "SmartShipCore": { "ais_track_url_comment": "查询AIS轨迹信息", - "ais_track_url": "http://172.20.1.53:9940/yunen/ais/get_tracks", + "ais_track_url": "http://172.20.1.54:9940/yunen/ais/get_tracks", "ship_target_url_comment": "船舶目标列表查询", - "ship_target_url": "http://172.20.1.53:9940/yunen/ship_target/list", + "ship_target_url": "http://172.20.1.54:9940/yunen/ship_target/list", "shiptargetid_url-comment": "通过 shipTargetId 查询目标信息", - "shiptargetid_url": "http://172.20.1.53:9940/yunen/ship_target/get_ship_target", + "shiptargetid_url": "http://172.20.1.54:9940/yunen/ship_target/get_ship_target", "info_AIS_url_comment": "船舶目标AIS信息查询", - "info_AIS_url": "http://172.20.1.53:9940/yunen/ais/get_ship_info", + "info_AIS_url": "http://172.20.1.54:9940/yunen/ais/get_ship_info", "ship_target_url2_comment": "船舶目标列表查询", - "ship_target_url2": "http://172.20.1.53:9940/yunen/ship_target/get_ship_target_by_targetId", + "ship_target_url2": "http://172.20.1.54:9940/yunen/ship_target/get_ship_target_by_targetId", "plugin": "SmartShipCore", "checkpoint_mode_list_comment": "获取卡口运行状态列表", - "checkpoint_mode_list": "http://172.20.1.53:9940/yunen/checkpoint/checkpoint_mode_list", + "checkpoint_mode_list": "http://172.20.1.54:9940/yunen/checkpoint/checkpoint_mode_list", "buoypatrolstatus_url-comment": "获取航标巡逻状态", - "buoypatrolstatus_url": "http://172.20.1.53:9940/yunen/patrol/get_patrol_status" + "buoypatrolstatus_url": "http://172.20.1.54:9940/yunen/patrol/get_patrol_status" }, "Map": { - "MapRenderServer": "http://172.20.1.53:9921/map/", - "DataServer": "http://172.20.1.53:9940", + "MapRenderServer": "http://172.20.1.54:9921/map/", + "DataServer": "http://172.20.1.54:9940", "plugin": "Map" }, "SmartShipEventWorker": { - "url": "tcp://172.20.1.53:9912", + "url": "tcp://172.20.1.54:9912", "topics": "analyzer.boat", "plugin": "SmartShipCore" }, "SmartShipHttpServer": { "checkpoint_query_comment": "卡口信息请求url", - "checkpoint_query": "http://172.20.1.53:9940/yunen/checkpoint/list", + "checkpoint_query": "http://172.20.1.54:9940/yunen/checkpoint/list", "request_time_comment": "请求间隔min", "request_time": 10, "plugin": "SmartShipCore", "ship_target_simple_url_comment": "船舶目标简单列表查询", - "ship_target_simple_url": "http://172.20.1.53:9940/yunen/ship_target/simple_list", + "ship_target_simple_url": "http://172.20.1.54:9940/yunen/ship_target/simple_list", "warningtypelist_url-comment": "获取警示类型列表，主要是警示类型图标资源", - "warningtypelist_url": "http://172.20.1.53:9940/yunen/alarm_type_config/list" + "warningtypelist_url": "http://172.20.1.54:9940/yunen/alarm_type_config/list" }, "ShipTarget": { - "ship_target_url": "tcp://172.20.1.53:9912", + "ship_target_url": "tcp://172.20.1.54:9912", "ship_target_topic": "ship_target", "plugin": "SmartShipCore", - "ship_target_video_info": "http://172.20.1.53:9940/yunen/ship_target/get_ship_videoinfo" + "ship_target_video_info": "http://172.20.1.54:9940/yunen/ship_target/get_ship_videoinfo" }, "VideoAnalyzer": { - "video_analyzer_url": "tcp://172.20.1.53:9912", + "video_analyzer_url": "tcp://172.20.1.54:9912", "video_analyzer_topic": "analyzer.smartship", "plugin": "SmartShipCore" }, "SmartShipSupervision": { "weather_url_comment": "当前天气查询", - "weather_url": "http://172.20.1.53:9940/yunen/weather/now", + "weather_url": "http://172.20.1.54:9940/yunen/weather/now", "plugin": "SmartShipSupervision", - "supervision_statistics": "http://172.20.1.53:9940/yunen/statistics/supervision_statistics" + "supervision_statistics": "http://172.20.1.54:9940/yunen/statistics/supervision_statistics" }, "WarningEventManage": { "warning_url_comment": "订阅警示消息", - "warning_url": "tcp://172.20.1.53:9912", + "warning_url": "tcp://172.20.1.54:9912", "warning_topic": "alarm_event", "analyzer_control_topic": "analyzercontrol", "plugin": "WarningEventManage" }, "HttpUrl": { "warning_query_count_comment": "卡口历史警示总数查询接口", - "warning_query_count": "http://172.20.1.53:9940/yunen/alarm_event/count", + "warning_query_count": "http://172.20.1.54:9940/yunen/alarm_event/count", "warning_simple_list_comment": "卡口历史警示简单列表查询接口", - "warning_simple_list": "http://172.20.1.53:9940/yunen/alarm_event/alarm_list", + "warning_simple_list": "http://172.20.1.54:9940/yunen/alarm_event/alarm_list", "warning_list_url_comment": "卡口历史警示列表查询接口", - "warning_list_url": "http://172.20.1.53:9940/yunen/alarm_event/list", + "warning_list_url": "http://172.20.1.54:9940/yunen/alarm_event/list", "monitor_config_List_url_comment": "应急指挥状态列表查询接口", - "monitor_config_List_url": "http://172.20.1.53:9940/yunen/monitor/configList", + "monitor_config_List_url": "http://172.20.1.54:9940/yunen/monitor/configList", "plugin": "WarningEventManage" }, "WebResource": { - "resource_url": "http://172.20.1.53:9920/" + "resource_url": "http://172.20.1.54:9920/" } } \ No newline at end of file