From 03bab7e7f1c86cc27ffa984d61c7bd2d9bd3a373 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 10:07:45 +0800
Subject: [PATCH] 修改bug和增加多线程处理逻辑

---
 guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/videoGateway/VideoGateway.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/videoGateway/VideoGateway.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/videoGateway/VideoGateway.java
index 198ae88..0ac6279 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/videoGateway/VideoGateway.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/videoGateway/VideoGateway.java
@@ -286,6 +286,7 @@
 		HttpRequest post = HttpUtil.createPost("https://zhyn.cg.gz.gov.cn/map/web/vehicleCtrl/" + terminalId + "/cameraShot");
 		post.header("operate-terminal", "4");
 		post.header("token", accountLogin.getToken());
+		log.info("【2018年协议发送拍摄指令接口】请求地址:" + post.getUrl());
 		Map<String, Object> body = new HashMap<>();
 		body.put("channelId", channelId);
 		log.info("【2018年协议发送拍摄指令接口】请求参数:" + JSON.toJSONString(body));
@@ -328,7 +329,6 @@
 		HttpRequest get = HttpUtil.createGet("https://zhyn.cg.gz.gov.cn/api/cws-business/biz-device-send-records/v1/cameraShot?vehicleId=" + vehicleId + "&vehicleType=" + vehicleType + "&terminalId=" + terminalId + "&channelId=" + channelId);
 		get.header("operate-terminal", "4");
 		get.header("token", accountLogin.getToken());
-		Map<String, Object> body = new HashMap<>();
 		log.info("【2023年协议发送拍摄指令接口】请求参数:" + get.getUrl());
 		HttpResponse execute = get.execute();
 		if(401 == execute.getStatus()){
@@ -390,6 +390,7 @@
 		if(null == data){
 			return null;
 		}
+		data = data.replaceAll(";", "");
 		return "https://zhyn-pic.cg.gz.gov.cn" + data;
 	}
 	
@@ -430,6 +431,7 @@
 		if(null == data){
 			return null;
 		}
+		data = data.replaceAll(";", "");
 		return "https://zhyn-pic.cg.gz.gov.cn" + data;
 	}
 	
@@ -491,12 +493,16 @@
 //		String decryptStr = sm4.decryptStr("357b94ca60ce8140f3d22eceaaa5d71b0d25d6cd20c8218d9a3ddcd30881126d", CharsetUtil.CHARSET_UTF_8);
 //		System.err.println(decryptStr);
 
-		accountLogin();
-		System.err.println(accountLogin);
+//		accountLogin();
+//		System.err.println(accountLogin);
 //		getVehicleList(null, null, null);
 //		getShipList(null, null, null);
 //		queryRuntimeInfoByCache();
-		locationRealTimeInfoCache(0);
+//		locationRealTimeInfoCache(0);
+		
+		
+		List<VehicleOnline> vehicleOnlines = queryRuntimeInfoByCache(0);
+		System.err.println(vehicleOnlines);
 	}
 	
 //	public static void main(String[] args) {

--
Gitblit v1.7.1