From 53ae0215de46b9bb68d9aa5d5a3e83dde7cb3986 Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期五, 27 九月 2024 15:20:11 +0800
Subject: [PATCH] 接口优化
---
target/classes/com/yb/service/AgentService.class | 0
target/ollama-ai-0.0.1-SNAPSHOT.jar | 0
src/main/java/com/yb/service/IntentionService.java | 5 +-
src/main/java/com/yb/service/AgentService.java | 16 +++----
target/classes/com/yb/service/XzService.class | 0
src/main/java/com/yb/service/XzService.java | 65 +++++++++++++++++++++++++-------
target/ollama-ai-0.0.1-SNAPSHOT.jar.original | 0
target/classes/com/yb/service/IntentionService.class | 0
8 files changed, 60 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/yb/service/AgentService.java b/src/main/java/com/yb/service/AgentService.java
index 63caef9..61c9868 100644
--- a/src/main/java/com/yb/service/AgentService.java
+++ b/src/main/java/com/yb/service/AgentService.java
@@ -61,13 +61,11 @@
public HashMap<String, Object> getQueryRelationship(String place, String filed) throws Exception {
String poiObj = xzService.getQueryEntity(place, filed, xzConfig.layerId, xzConfig.dbid, xzConfig.layerQuery);
- if(poiObj == null){
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("msg","鏈煡璇㈠埌"+place+"鐩稿叧鏁版嵁");
- return hashMap;
- }
-
-
+ if (poiObj == null) {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("msg", "鏈煡璇㈠埌" + place + "鐩稿叧鏁版嵁");
+ return hashMap;
+ }
HashMap<String, String> hashMap = new HashMap<String, String>();
hashMap.put("token", xzConfig.token);
hashMap.put("dbid", xzConfig.dbid);
@@ -142,11 +140,11 @@
String markDown = "| 鏁版嵁绫诲瀷 | 鏁版嵁閲� |\n|------|------|\n";
for (int i = 0; i < arrayList.size(); i++) {
String name = arrayList.get(i).getName();
- int count = arrayList.get(i).getCount();
+ int count = arrayList.get(i).getCount();
markDown += "| " + name + " | " + count + " |\n";
}
- traiMap.put("msg",markDown);
+ traiMap.put("msg", markDown);
}
System.out.println("rec getQueryRelationship:" + traiMap);
diff --git a/src/main/java/com/yb/service/IntentionService.java b/src/main/java/com/yb/service/IntentionService.java
index 6aaa81c..4bf8092 100644
--- a/src/main/java/com/yb/service/IntentionService.java
+++ b/src/main/java/com/yb/service/IntentionService.java
@@ -59,10 +59,9 @@
private HashMap<String, Object> getBatEnv(JSONObject orderObject, String func, Map<String, String> allParams) throws Exception {
HashMap<String, Object> hashMap = new HashMap<String, Object>();
hashMap.put("func", func);
-// List list = orderObject.get("history");
+
System.out.println("rec history1:" + allParams);
- String history = allParams.get("history");
- System.out.println("rec history1:" + history);
+
String val = entityHttpUtil.postAgentMessage(xzConfig.battleReport, allParams);
JSONObject js = JSONObject.parseObject(val);
if (js == null) {
diff --git a/src/main/java/com/yb/service/XzService.java b/src/main/java/com/yb/service/XzService.java
index 6b8b6a2..090f973 100644
--- a/src/main/java/com/yb/service/XzService.java
+++ b/src/main/java/com/yb/service/XzService.java
@@ -7,6 +7,7 @@
import com.yb.helper.RsaHelper;
import com.yb.util.EntityHttpUtil;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.locationtech.jts.geom.*;
@@ -35,12 +36,27 @@
private EntityHttpUtil entityHttpUtil;
@Autowired
private AgentService agentService;
+ int num = 40;
// 鍏抽敭瀛楁煡璇�
public String getQueryFiled(String place, String filed, String layerId, String dbId, String queryEntity) throws Exception {
-
+ String querySQL = "";
String valSql = " like '%" + place + "%'";
- String querySQL = getQuerySql(valSql, filed);
+ String key = getPublickey();
+ String query = getQuerySql(valSql, filed);
+// int num = 40;
+ if (query.length() > num) {
+ String[] sbuString = getSqlSubStr(query, num);
+ for (int w = 0; w < sbuString.length; w++) {
+ if (w > 0) {
+ querySQL += ",";
+ }
+ querySQL += RsaHelper.encrypt(key, sbuString[w]);
+ }
+ } else {
+ querySQL += RsaHelper.encrypt(key, query);
+ }
+ System.out.println("rec getQueryFiled:" + querySQL);
HashMap formData = getHashMap(layerId, dbId, "1", "0", querySQL, null);
String jsonString = entityHttpUtil.getPostMessage(queryEntity, formData);
System.out.println("rec getQueryFiled:" + jsonString);
@@ -53,32 +69,53 @@
return "";
}
- private String getQuerySql(String valSql, String filed) throws Exception {
- String key = getPublickey();
- String querySQL = "";
+ public String[] getSqlSubStr(String str, int chunkSize) {
+ int numChunks = (str.length() + chunkSize - 1) / chunkSize;
+ String[] chunks = new String[numChunks];
+ for (int i = 0; i < numChunks; i++) {
+ int start = i * chunkSize;
+ int end = Math.min(start + chunkSize, str.length());
+ chunks[i] = str.substring(start, end);
+ }
+ return chunks;
+ }
+
+ public String getQuerySql(String valSql, String filed) {
+ String query = "";
if (filed.indexOf(",") > -1) {
String[] fileds = filed.split(",");
for (int i = 0; i < fileds.length; i++) {
String name = fileds[i];
if (i > 0) {
- querySQL += ";";
+ query += " or ";
}
- String Sql = name + valSql + "";
- querySQL += RsaHelper.encrypt(key, Sql);
+ query += name + valSql;
}
+ query += "";
} else {
- String Sql = filed + valSql + "";
- querySQL = RsaHelper.encrypt(key, Sql);
+ query = filed + valSql + "";
}
- return querySQL;
-
+ return query;
}
-
// 鍏抽敭瀛楁煡璇�
public String getQueryEntity(String place, String filed, String layerId, String dbId, String queryEntity) throws Exception {
String valSql = " like '%" + place + "%'";
- String querySQL = getQuerySql(valSql, filed);
+ String key = getPublickey();
+ String query = getQuerySql(valSql, filed);
+ String querySQL = "";
+// int num = 40;
+ if (query.length() > num) {
+ String[] sbuString = getSqlSubStr(query, num);
+ for (int w = 0; w < sbuString.length; w++) {
+ if (w > 0) {
+ querySQL += ",";
+ }
+ querySQL += RsaHelper.encrypt(key, sbuString[w]);
+ }
+ } else {
+ querySQL += RsaHelper.encrypt(key, query);
+ }
HashMap formData = getHashMap(layerId, dbId, "1", "100", querySQL, null);
formData.put("querytype", "entity");
String jsonString1 = entityHttpUtil.getPostMessage(queryEntity, formData);
diff --git a/target/classes/com/yb/service/AgentService.class b/target/classes/com/yb/service/AgentService.class
index 46ac837..aef5970 100644
--- a/target/classes/com/yb/service/AgentService.class
+++ b/target/classes/com/yb/service/AgentService.class
Binary files differ
diff --git a/target/classes/com/yb/service/IntentionService.class b/target/classes/com/yb/service/IntentionService.class
index e641078..b1ddd55 100644
--- a/target/classes/com/yb/service/IntentionService.class
+++ b/target/classes/com/yb/service/IntentionService.class
Binary files differ
diff --git a/target/classes/com/yb/service/XzService.class b/target/classes/com/yb/service/XzService.class
index c62f9c1..db1393b 100644
--- a/target/classes/com/yb/service/XzService.class
+++ b/target/classes/com/yb/service/XzService.class
Binary files differ
diff --git a/target/ollama-ai-0.0.1-SNAPSHOT.jar b/target/ollama-ai-0.0.1-SNAPSHOT.jar
index 3136b07..4ab4aa2 100644
--- a/target/ollama-ai-0.0.1-SNAPSHOT.jar
+++ b/target/ollama-ai-0.0.1-SNAPSHOT.jar
Binary files differ
diff --git a/target/ollama-ai-0.0.1-SNAPSHOT.jar.original b/target/ollama-ai-0.0.1-SNAPSHOT.jar.original
index ac07856..36b295b 100644
--- a/target/ollama-ai-0.0.1-SNAPSHOT.jar.original
+++ b/target/ollama-ai-0.0.1-SNAPSHOT.jar.original
Binary files differ
--
Gitblit v1.9.3