From d4e4ea6405756d495806a609e24ae85ebd7345ef Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期二, 17 十二月 2024 09:30:12 +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 | 9 +---
target/classes/application-agent.yml | 4 +-
src/main/java/com/yb/controller/agentController.java | 2
src/main/java/com/yb/service/AgentService.java | 63 ++++++++++++++++++-------------
src/main/resources/application-agent.yml | 4 +-
target/classes/com/yb/service/IntentionService.class | 0
/dev/null | 1
target/classes/com/yb/controller/THistoryController.class | 0
src/main/java/com/yb/controller/THistoryController.java | 20 +++++-----
target/classes/com/yb/controller/agentController.class | 0
target/classes/mapper/ThistoriesDaos.xml | 2
src/main/resources/mapper/ThistoriesDaos.xml | 2
target/ollama-ai-0.0.1-SNAPSHOT.jar.original | 0
15 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/yb/controller/THistoryController.java b/src/main/java/com/yb/controller/THistoryController.java
index e97440b..a5baefb 100644
--- a/src/main/java/com/yb/controller/THistoryController.java
+++ b/src/main/java/com/yb/controller/THistoryController.java
@@ -138,16 +138,16 @@
@ApiOperation(value = "getSessionById", notes = "")
public R getSessionById(@RequestParam(name = "sessionid", defaultValue = " ") String sessionid) {
List<THistoryEntity> list = thistoriesServices.getSessionId(sessionid);
- List<HashMap<Object, Object>> sList = new ArrayList<>();
- for (int i = 0; i < list.size(); i++) {
- THistoryEntity th = list.get(i);
- HashMap<Object, Object> hashMap = new HashMap<>();
- hashMap.put("id", th.getId());
- hashMap.put("human", th.getHuman());
- hashMap.put("ai", th.getAi());
- sList.add(hashMap);
- }
- PageUtils page = new PageUtils(sList,0,0,0);
+// List<HashMap<Object, Object>> sList = new ArrayList<>();
+// for (int i = 0; i < list.size(); i++) {
+// THistoryEntity th = list.get(i);
+// HashMap<Object, Object> hashMap = new HashMap<>();
+// hashMap.put("id", th.getId());
+// hashMap.put("human", th.getHuman());
+// hashMap.put("ai", th.getAi());
+// sList.add(hashMap);
+// }
+ PageUtils page = new PageUtils(list,0,0,0);
return R.ok() .put("page", page);
}
diff --git a/src/main/java/com/yb/controller/agentController.java b/src/main/java/com/yb/controller/agentController.java
index 0c152c4..315e30a 100644
--- a/src/main/java/com/yb/controller/agentController.java
+++ b/src/main/java/com/yb/controller/agentController.java
@@ -131,7 +131,7 @@
formData.put("token", xzConfig.token);
formData.put("dbid", xzConfig.dbid);
String obj = entityHttpUtil.getPostMessage(xzConfig.permissionLayer, formData);
-// System.out.println("layerList: " + obj);
+ System.out.println("layerList: " + JSON.parseObject(JSONObject.parseObject(obj).getString("data")));
HashMap<String, Object> hashMap = new HashMap<String, Object>();
String layers = JSON.parseObject(JSONObject.parseObject(obj).getString("data")).getString("layers");
JSONArray dataArray = JSONArray.parseArray(layers);
diff --git a/src/main/java/com/yb/service/AgentService.java b/src/main/java/com/yb/service/AgentService.java
index 152d873..a1b1943 100644
--- a/src/main/java/com/yb/service/AgentService.java
+++ b/src/main/java/com/yb/service/AgentService.java
@@ -29,8 +29,8 @@
return obj;
}
- public String getAgentIntention(String url, String api, String msg,String sessionid,String libid) throws Exception {
- String http = url + api +"?session_id="+sessionid+ "&lib_id=" + libid+ "&message=" + msg;
+ public String getAgentIntention(String url, String api, String msg, String sessionid, String libid) throws Exception {
+ String http = url + api + "?session_id=" + sessionid + "&lib_id=" + libid + "&message=" + msg;
System.out.println("rec getMessage:" + http);
String obj = entityHttpUtil.getAgentMessage(http);
System.out.println("rec getMessage:" + obj);
@@ -78,15 +78,18 @@
for (int i = 0; i < relationArry.size(); i++) {
JSONObject relationtem = relationArry.getJSONObject(i);
String name = relationtem.getString("name");
- if (name.equals("鍖呭惈鍏崇郴")) {
+// if (name.equals("鍖呭惈")) {
+// itemObj = relationtem;
+// }
+ if (name.contains(String.valueOf("鍖呭惈"))) {
itemObj = relationtem;
}
}
- String distanceUrl = xzConfig.relationDistinct + "?dbid=" + xzConfig.dbid + "&token=" + xzConfig.token + "&relationid=" + itemObj.getString("code");
- String relationDistance = entityHttpUtil.getMessage(distanceUrl);
- JSONObject distanceObj = JSONObject.parseObject(relationList);
- String distanceData = relattionObj.getString("data");
- System.out.println("rec getQueryRelationship:" + distanceData);
+// String distanceUrl = xzConfig.relationDistinct + "?dbid=" + xzConfig.dbid + "&token=" + xzConfig.token + "&relationid=" + itemObj.getString("code");
+// String relationDistance = entityHttpUtil.getMessage(distanceUrl);
+// JSONObject distanceObj = JSONObject.parseObject(relationList);
+// String distanceData = relattionObj.getString("data");
+// System.out.println("rec getQueryRelationship:" + distanceData);
String relateddataeUrl = xzConfig.relationRelateddata + "?start=1&count=1000000&&a_like=&b_like=&dbid=" + xzConfig.dbid + "&token=" + xzConfig.token + "&relationid=" + itemObj.getString("code");
String relationRelateddata = entityHttpUtil.getMessage(relateddataeUrl);
@@ -103,7 +106,7 @@
HashMap<String, String> reMap = new HashMap<String, String>();
reMap.put("token", xzConfig.token);
reMap.put("dbid", xzConfig.dbid);
- reMap.put("businessids", list.toString());
+ reMap.put("ids", list.toString());
reMap.put("layerid", xzConfig.layerId);
reMap.put("querylatest", "true");
String reMapList = entityHttpUtil.getPostMessage(xzConfig.layerQuery, reMap);
@@ -116,25 +119,31 @@
ArrayList<RelaEntity> arrayList = new ArrayList<>();
for (int i = 0; i < reArray.size(); i++) {
- String name = JSONObject.parseObject(reArray.getString(i)).getString(xzConfig.queryFiled);
- if (name.equals(place)) {
+ String name = JSONObject.parseObject(reArray.getString(i)).getString(xzConfig.typeFiled);
+// System.out.println("rec getQueryRelationship:" + name);
+ if (name == null || name.isEmpty()) {
continue;
- }
- boolean contains = false;
- for (int j = 0; j < arrayList.size(); j++) {
- RelaEntity firstElement = arrayList.get(j);
- if (firstElement.getName().equals(name)) {
- int flag = firstElement.getCount();
- flag++;
- firstElement.setCount(flag);
- contains = true;
+ } else {
+
+ if (name.equals(place)) {
+ continue;
}
- }
- if (contains == false) {
- RelaEntity relaEntity = new RelaEntity();
- relaEntity.setName(name);
- relaEntity.setCount(1);
- arrayList.add(relaEntity);
+ boolean contains = false;
+ for (int j = 0; j < arrayList.size(); j++) {
+ RelaEntity firstElement = arrayList.get(j);
+ if (firstElement.getName().equals(name)) {
+ int flag = firstElement.getCount();
+ flag++;
+ firstElement.setCount(flag);
+ contains = true;
+ }
+ }
+ if (contains == false) {
+ RelaEntity relaEntity = new RelaEntity();
+ relaEntity.setName(name);
+ relaEntity.setCount(1);
+ arrayList.add(relaEntity);
+ }
}
}
String markDown = "| 鏁版嵁绫诲瀷 | 鏁版嵁閲� |\n|------|------|\n";
@@ -147,7 +156,7 @@
traiMap.put("msg", markDown);
}
- System.out.println("rec getQueryRelationship:" + traiMap);
+// System.out.println("rec traiMap:" + traiMap);
return traiMap;
}
diff --git a/src/main/java/com/yb/service/IntentionService.java b/src/main/java/com/yb/service/IntentionService.java
index b822eec..7634b08 100644
--- a/src/main/java/com/yb/service/IntentionService.java
+++ b/src/main/java/com/yb/service/IntentionService.java
@@ -49,7 +49,7 @@
mapObj = getCombatSimulate(orderObject, func);
} else if (func.equals(xzConfig.funcName[5])) {
// mapObj = getBatEnv(orderObject, func, allParams);
- getBatEnv(orderObject, func, allParams,report);
+ getBatEnv(orderObject, func, allParams,report);
}else{
}
@@ -92,10 +92,7 @@
String key = "msg";
String msg = (String) poiMap.get(key);
hashMap.put("msg", msg);
- String center = (String) poiMap.get("center");
- if(center != null){
- hashMap.put("data", poiMap);
- }
+ hashMap.put("data", poiMap);
return hashMap;
}
@@ -202,7 +199,7 @@
List<Integer> cNum = new ArrayList<>();
for (int i = 0; i < dataArray.size(); i++) {
JSONObject dataObj = dataArray.getJSONObject(i);
- String fclass1 = dataObj.getString("fclass_1");
+ String fclass1 = dataObj.getString(xzConfig.typeFiled);
String ids = dataObj.getString("seid");
if (cName.contains(fclass1)) {
for (int j = 0; j < cName.size(); j++) {
diff --git a/src/main/resources/application-agent.yml b/src/main/resources/application-agent.yml
index f709cf1..04c4ca4 100644
--- a/src/main/resources/application-agent.yml
+++ b/src/main/resources/application-agent.yml
@@ -52,8 +52,8 @@
agent:
# 璁块棶鍦板潃
# agentUrl: http://106.120.22.26:5367
- agentUrl: http://192.168.11.194:5367
- # agentUrl: http://103.135.160.14:5367
+# agentUrl: http://192.168.11.194:5367
+ agentUrl: http://103.135.160.14:5367
#
agentIntent: /intention
# rag鏈嶅姟
diff --git a/src/main/resources/mapper/ThistoriesDaos.xml b/src/main/resources/mapper/ThistoriesDaos.xml
index 9fccabb..841f27d 100644
--- a/src/main/resources/mapper/ThistoriesDaos.xml
+++ b/src/main/resources/mapper/ThistoriesDaos.xml
@@ -4,7 +4,7 @@
<!-- 鏍规嵁鍚嶇О妯＄硦鏌ヨ-->
<select id="getSessionId" resultType="com.yb.entity.THistoryEntity" >
SELECT * FROM (
- SELECT id,human,ai FROM t_history
+ SELECT * FROM t_history
<where>
<if test="sessionid != null">
diff --git a/target/classes/application-agent.yml b/target/classes/application-agent.yml
index f709cf1..04c4ca4 100644
--- a/target/classes/application-agent.yml
+++ b/target/classes/application-agent.yml
@@ -52,8 +52,8 @@
agent:
# 璁块棶鍦板潃
# agentUrl: http://106.120.22.26:5367
- agentUrl: http://192.168.11.194:5367
- # agentUrl: http://103.135.160.14:5367
+# agentUrl: http://192.168.11.194:5367
+ agentUrl: http://103.135.160.14:5367
#
agentIntent: /intention
# rag鏈嶅姟
diff --git a/target/classes/com/yb/controller/THistoryController.class b/target/classes/com/yb/controller/THistoryController.class
index a66d027..fc62c03 100644
--- a/target/classes/com/yb/controller/THistoryController.class
+++ b/target/classes/com/yb/controller/THistoryController.class
Binary files differ
diff --git a/target/classes/com/yb/controller/agentController.class b/target/classes/com/yb/controller/agentController.class
index 47708eb..8b58e71 100644
--- a/target/classes/com/yb/controller/agentController.class
+++ b/target/classes/com/yb/controller/agentController.class
Binary files differ
diff --git a/target/classes/com/yb/service/AgentService.class b/target/classes/com/yb/service/AgentService.class
index d14ef52..8a05d9a 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 ec240d4..c933da8 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/mapper/ThistoriesDaos.xml b/target/classes/mapper/ThistoriesDaos.xml
index 9fccabb..841f27d 100644
--- a/target/classes/mapper/ThistoriesDaos.xml
+++ b/target/classes/mapper/ThistoriesDaos.xml
@@ -4,7 +4,7 @@
<!-- 鏍规嵁鍚嶇О妯＄硦鏌ヨ-->
<select id="getSessionId" resultType="com.yb.entity.THistoryEntity" >
SELECT * FROM (
- SELECT id,human,ai FROM t_history
+ SELECT * FROM t_history
<where>
<if test="sessionid != null">
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index 5e13926..0000000
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-com\yb\OllamaApiTest.class
diff --git a/target/ollama-ai-0.0.1-SNAPSHOT.jar b/target/ollama-ai-0.0.1-SNAPSHOT.jar
index f3bf168..3cc10a6 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 a6bf51b..435be27 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