From 2af5f043b60c1f7ac38ecccc8f5bf44743134325 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 12 十二月 2025 18:08:00 +0800
Subject: [PATCH] test

---
 api/request.js |  133 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 102 insertions(+), 31 deletions(-)

diff --git a/api/request.js b/api/request.js
index dd77289..7f74ded 100644
--- a/api/request.js
+++ b/api/request.js
@@ -8,27 +8,95 @@
 		// 	"Content-Type": "application/json;charset=UTF-8"
 		// },
 		method: "GET",
-		dataType: "json"
+		dataType: "json",
+
+	},
+	apiCount: {
+		agv_state: 0,
+		laser_data: 0,
+		current_teaching: 0
+	},
+
+	parseJson(str) {
+		try {
+			const obj = JSON.parse(str)
+			return obj
+		} catch (ex) {
+			return undefined
+		}
 	},
 	addLog(item) {
-		const list = session.getValue("request_log") || []
-
-		const res = typeof item.data == 'string' ? item.data : JSON.stringify(item.data)
-		if (res.length > 64 * 1024) {
-			// const maxData = session.getValue("request_log_max_data") || {}
-			// const key = `data${new Date().getTime()}`
-			// maxData[key] = item.data
-			// item.data_key = key
-			// delete item.data
-			// session.setValue("request_log_max_data", maxData)
-			 item.data  = res.length
-		}
-		if(item.url.indexOf("get_agv_state") > 0)
-		{
+		if (!getApp().globalData.withLog) {
 			return
 		}
+		if (item.statusCode == 200) {
+			const ret = this.parseJson(item.data)
+			if (ret?.code === 0) {
+				if (item.url.indexOf("get_agv_state") > 0) {
+
+					if (this.apiCount.agv_state % 20 != 0) {
+						this.apiCount.agv_state++;
+						return
+					}
+					this.apiCount.agv_state = 1;
+				}
+				if (item.url.indexOf("get_current_teaching_data") > 0) {
+
+					if (this.apiCount.current_teaching % 20 != 0) {
+						this.apiCount.current_teaching++;
+						return
+					}
+					this.apiCount.current_teaching = 1;
+				}
+
+				// if (item.url.indexOf("laser_data") > 0) {
+
+				// 	if (ret.data?.base_map?.image_base64) {
+				// 		this.apiCount.laser_data++;
+				// 	} else {
+				// 		if (this.apiCount.laser_data % 20 != 0) {
+				// 			this.apiCount.laser_data++;
+				// 			return
+				// 		}
+				// 		this.apiCount.laser_data = 1;
+				// 	}
+				// }
+				const res = ret.data
+				if (res) {
+					if (item.url.indexOf("getMapUrl") > 0) {
+						if (res.filedata) {
+							res.data_length = res.filedata.length
+							res.filedata = "..."
+							item.data = JSON.stringify(ret)
+						}
+					} else if (item.url.indexOf("laser_data") > 0) {
+						if (res?.base_map?.image_base64) {
+							res.base_map.image_length = res.base_map.image_base64.length
+							res.base_map.image_base64 = "..."
+							item.data = JSON.stringify(ret)
+						}
+
+					}
+					if (JSON.stringify(res).length > 100 * 1024) {
+						// const maxData = session.getValue("request_log_max_data") || {}
+						// const key = `data${new Date().getTime()}`
+						// maxData[key] = item.data
+						// item.data_key = key
+						// session.setValue("request_log_max_data", maxData)
+						ret.data = "..."
+						ret.data_length = JSON.stringify(res).length
+						item.data = JSON.stringify(ret)
+					}
+				}
+			}
+
+		}
+		const list = session.getValue("request_log") || []
+
+
 		list.unshift(item)
-		if (list.length > 1000) {
+
+		if (list.length > 512) {
 			const oldItem = list.pop()
 			if (oldItem.data_key) {
 				const maxData = session.getValue("request_log_max_data") || {}
@@ -46,9 +114,9 @@
 		};
 		options.method = options.method || this.common.method;
 		options.dataType = options.dataType || this.common.dataType;
-		
-		if(options.url.indexOf("get_agv_state") < 0)
-		{
+
+		if (options.url.indexOf("get_agv_state") < 0 && options.url.indexOf("laser_data") < 0 &&
+			options.url.indexOf("taskGroupStatus") < 0 && options.url.indexOf("get_current_teaching_data") < 0) {
 			console.log("url", options.url, options.data)
 		}
 		return new Promise((resolve, reject) => {
@@ -60,11 +128,13 @@
 				method: options.method,
 				dataType: options.dataType,
 				success: (result) => {
-					if(options.url.indexOf("get_agv_state") < 0)
-					{
+					if (options.url.indexOf("get_agv_state") < 0 && options.url.indexOf(
+							"laser_data") < 0 &&
+						options.url.indexOf("taskGroupStatus") < 0 && options.url.indexOf(
+							"get_current_teaching_data") < 0) { //
 						console.log("result", result)
 					}
-					
+
 					const now = new Date()
 					const date = `${now.getHours()}:${now.getMinutes()}:${now.getSeconds()}`
 					if (result.statusCode != 200) {
@@ -86,14 +156,7 @@
 							msg: "璁块棶澶辫触锛岀姸鎬佺爜锛� + result.statusCode
 						})
 					}
-					this.addLog({
-						date,
-						method: `${options.method || ""}`,
-						url: options.url,
-						param: options.data,
-						statusCode: result.statusCode,
-						data: result.data
-					})
+
 					var ret = result.data
 					if (typeof ret == 'string') {
 						try {
@@ -115,13 +178,21 @@
 							})
 						}
 					}
+					this.addLog({
+						date,
+						method: `${options.method || ""}`,
+						url: options.url,
+						param: options.data,
+						statusCode: result.statusCode,
+						data: JSON.stringify(ret)
+					})
 					if (ret.code == 0) {
 
 						resolve(ret.data);
 					} else {
 
 						reject({
-							msg: ret.msg || ""
+							msg: ret.msg || ret.message || ""
 						});
 					}
 				},

--
Gitblit v1.9.1