From 0cf13d9df73e8e9befa36236756ef02dd5f60e94 Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期六, 14 九月 2024 09:55:38 +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 | 121 +++++++++++++---
target/classes/application-agent.yml | 7
src/main/java/com/yb/controller/agentController.java | 95 ++++++++++++-
src/main/java/com/yb/service/AgentService.java | 48 ++++++
src/main/resources/application-agent.yml | 7
target/classes/com/yb/service/XzService.class | 0
src/main/java/com/yb/service/XzService.java | 7
src/main/java/com/yb/entity/RelaEntity.java | 26 +++
target/classes/com/yb/service/IntentionService.class | 0
/dev/null | 3
target/classes/com/yb/controller/agentController.class | 0
target/classes/com/yb/util/EntityHttpUtil.class | 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 1
src/main/java/com/yb/util/EntityHttpUtil.java | 87 +++++++++---
src/main/java/com/yb/config/XzConfig.java | 4
target/ollama-ai-0.0.1-SNAPSHOT.jar.original | 0
target/classes/com/yb/config/XzConfig.class | 0
target/classes/com/yb/entity/RelaEntity.class | 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 1
21 files changed, 335 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/yb/config/XzConfig.java b/src/main/java/com/yb/config/XzConfig.java
index 356c94d..6334b2c 100644
--- a/src/main/java/com/yb/config/XzConfig.java
+++ b/src/main/java/com/yb/config/XzConfig.java
@@ -38,6 +38,8 @@
public String relationDistinct;
@Value("${itcats.geographical.relationRelateddata}")
public String relationRelateddata;
+ @Value("${itcats.geographical.permissionLayer}")
+ public String permissionLayer;
// Agent
@Value("${itcats.agent.agentUrl}")
@@ -50,5 +52,7 @@
public String agentChat;
@Value("${itcats.agent.funcName}")
public String[] funcName;
+ @Value("${itcats.agent.battleReport}")
+ public String battleReport;
}
diff --git a/src/main/java/com/yb/controller/agentController.java b/src/main/java/com/yb/controller/agentController.java
index 2f5a653..47eb4a5 100644
--- a/src/main/java/com/yb/controller/agentController.java
+++ b/src/main/java/com/yb/controller/agentController.java
@@ -2,15 +2,17 @@
import com.alibaba.fastjson.JSON;
+
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.JsonParser;
+
import com.yb.config.R;
import com.yb.config.XzConfig;
import com.yb.service.AgentService;
import com.yb.service.IntentionService;
-import com.yb.service.XzService;
+
+import com.yb.util.EntityHttpUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
@@ -21,7 +23,9 @@
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Tag(name = "Agent鎰忓浘")
@@ -37,6 +41,8 @@
private AgentService agentService;
@Autowired
private IntentionService intentionService;
+ @Autowired
+ private EntityHttpUtil entityHttpUtil;
@ApiOperation("鎰忓浘璇嗗埆")
@PostMapping("/intention")
@@ -44,6 +50,7 @@
public R getIntention(@RequestParam Map<String, String> allParams) throws Exception {
System.out.println("rec getMessage:" + allParams);
String msg = allParams.get("message");
+
// 鍒ゆ柇msg鏄惁涓虹┖
if (StringUtils.isEmpty(msg)) {
String info = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, "''");
@@ -70,22 +77,88 @@
}
// 鎰忓浘鍑芥暟鍖归厤
- HashMap<String, Object> mapObj = intentionService.getFunctionMatch(orderString);
+ HashMap<String, Object> mapObj = intentionService.getFunctionMatch(orderString, allParams);
hashMap.put("content", mapObj);
return R.ok(hashMap);
} else {
- String ragInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentChat, msg);
- JSONObject jsonObject = JSON.parseObject(ragInfo);
- String answer = jsonObject.getString("content");
- System.out.println("Answer: " + answer);
- hashMap.put("content", answer);
- hashMap.put("type", "Rag");
- return R.ok(hashMap);
+
+ String ragInfo1 = agentService.getAgentRag(xzConfig.agentUrl, xzConfig.agentRag, allParams.get("session_id"), allParams.get("lib_id"), msg);
+ System.out.println("rec rag:" + ragInfo1);
+ if (ragInfo1.equals("")) {
+ String ragInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentChat, msg);
+ JSONObject jsonObject = JSON.parseObject(ragInfo);
+ String answer = jsonObject.getString("content");
+ System.out.println("Answer: " + answer);
+ hashMap.put("content", answer);
+ hashMap.put("type", "Rag");
+ return R.ok(hashMap);
+ } else {
+ JSONObject jsonObject1 = JSON.parseObject(ragInfo1);
+ String answer1 = jsonObject1.getString("content");
+ System.out.println("Answer: " + answer1);
+ String jso = JSONObject.parseObject(answer1).getString("answer");
+ String context = JSONObject.parseObject(answer1).getString("context");
+// JSONArray jsonArray = JSON.parseArray(context);
+// String metadata = "";
+// for (int i = 0; i < jsonArray.size(); i++) {
+// JSONObject jsonObject = jsonArray.getJSONObject(i);
+//
+// metadata = jsonObject.getString("metadata");
+//
+//
+// }
+ if (context != "") {
+// String[] fileSource = metadata.split("/");
+ hashMap.put("fileSrource", JSON.parseArray(context));
+ }
+ hashMap.put("content", jso);
+ hashMap.put("type", "Rag");
+ return R.ok(hashMap);
+ }
+
}
}
+ @ApiOperation("鑾峰彇鍥惧眰鍒楄〃")
+ @GetMapping("/layerList")
+ @Operation(summary = "鑾峰彇鍥惧眰鍒楄〃")
+ public R getLayerList() throws Exception {
+ HashMap<String, String> formData = new HashMap<>();
+ formData.put("token", xzConfig.token);
+ formData.put("dbid", xzConfig.dbid);
+ String obj = entityHttpUtil.getPostMessage(xzConfig.permissionLayer, formData);
+ System.out.println("Answer: " + obj);
+ HashMap<String, Object> hashMap = new HashMap<String, Object>();
+ String layers = JSON.parseObject(JSONObject.parseObject(obj).getString("data")).getString("layers");
+ JSONArray dataArray = JSONArray.parseArray(layers);
+ ArrayList<HashMap> list = new ArrayList<>();
+ for (int i = 0; i < dataArray.size(); i++) {
+ JSONObject itmObj = JSONObject.parseObject(dataArray.get(i).toString());
+ String item = itmObj.getString("dataformat");
+// System.out.println("Answer: " + item);
+ String id = itmObj.getString("id");
+ if (item.equals("entity")) {
+ HashMap<String, Object> itmHash = new HashMap<>();
+ String name = itmObj.getString("name");
+ String url = itmObj.getString("lod_url");
+ if (url != null) {
+ String l1 = JSONObject.parseObject(JSONObject.parseObject(url).getString("3d")).getString("l0");
+ itmHash.put("url", l1);
+ itmHash.put("sourceType", "Tileset");
+ itmHash.put("name", name);
+ itmHash.put("id", id);
+ list.add(itmHash);
+ }
+
+ }
+
+ }
+ hashMap.put("data", list);
+ return R.ok(hashMap);
+ }
+
}
diff --git a/src/main/java/com/yb/entity/RelaEntity.java b/src/main/java/com/yb/entity/RelaEntity.java
new file mode 100644
index 0000000..9d99bcf
--- /dev/null
+++ b/src/main/java/com/yb/entity/RelaEntity.java
@@ -0,0 +1,26 @@
+package com.yb.entity;
+
+import lombok.Data;
+
+@Data
+public class RelaEntity {
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getCount() {
+ return count;
+ }
+
+ public void setCount(int count) {
+ this.count = count;
+ }
+
+ private int count;
+}
diff --git a/src/main/java/com/yb/service/AgentService.java b/src/main/java/com/yb/service/AgentService.java
index 6107210..63caef9 100644
--- a/src/main/java/com/yb/service/AgentService.java
+++ b/src/main/java/com/yb/service/AgentService.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yb.config.XzConfig;
-import com.yb.entity.ReqEntity;
+import com.yb.entity.RelaEntity;
import com.yb.util.EntityHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +48,9 @@
public String getAgentAroundPoi(String place, String type, int dis, String filed, String typeFiled) throws Exception {
String item = xzService.getQueryFiled(place, filed, xzConfig.layerId, xzConfig.dbid, xzConfig.queryEntity);
JSONObject obj = JSONObject.parseObject(item);
+ if (obj == null) {
+ return "";
+ }
Double lon = Double.parseDouble(obj.getString("lon"));
Double lat = Double.parseDouble(obj.getString("lat"));
String wkt = xzService.getWKt(lon, lat, dis);
@@ -57,6 +60,14 @@
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;
+ }
+
+
HashMap<String, String> hashMap = new HashMap<String, String>();
hashMap.put("token", xzConfig.token);
hashMap.put("dbid", xzConfig.dbid);
@@ -103,6 +114,41 @@
HashMap<String, Object> traiMap = new HashMap<>();
traiMap.put("center", JSONObject.parseObject(poiObj));
traiMap.put("positions", reArray);
+ if (reArray.size() > 0) {
+ 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)) {
+ 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;
+ }
+ }
+ if (contains == false) {
+ RelaEntity relaEntity = new RelaEntity();
+ relaEntity.setName(name);
+ relaEntity.setCount(1);
+ arrayList.add(relaEntity);
+ }
+ }
+ String markDown = "| 鏁版嵁绫诲瀷 | 鏁版嵁閲� |\n|------|------|\n";
+ for (int i = 0; i < arrayList.size(); i++) {
+ String name = arrayList.get(i).getName();
+ int count = arrayList.get(i).getCount();
+ markDown += "| " + name + " | " + count + " |\n";
+
+ }
+ traiMap.put("msg",markDown);
+ }
+
System.out.println("rec getQueryRelationship:" + traiMap);
return traiMap;
diff --git a/src/main/java/com/yb/service/IntentionService.java b/src/main/java/com/yb/service/IntentionService.java
index e93676c..3744eef 100644
--- a/src/main/java/com/yb/service/IntentionService.java
+++ b/src/main/java/com/yb/service/IntentionService.java
@@ -4,10 +4,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yb.config.XzConfig;
+import com.yb.helper.RsaHelper;
+import com.yb.util.EntityHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service
public class IntentionService {
@@ -17,27 +22,56 @@
private AgentService agentService;
@Autowired
private XzService xzService;
+ @Autowired
+ private EntityHttpUtil entityHttpUtil;
- public HashMap<String, Object> getFunctionMatch(String orderString) throws Exception {
+ public HashMap<String, Object> getFunctionMatch(String orderString, Map<String, String> allParams) throws Exception {
HashMap<String, Object> mapObj = new HashMap<String, Object>();
JSONObject orderObject = JSON.parseObject(orderString);
+ String name = JSONObject.parseObject(orderObject.getString("args")).getString("place");
String func = orderObject.getString("name");
+ String history = orderObject.getString("history");
if (func.equals(xzConfig.funcName[0])) {
- mapObj = getPoiMap(orderObject, xzConfig.funcName[0]);
+ mapObj = getPoiMap(orderObject,func);
} else if (func.equals(xzConfig.funcName[1])) {
- mapObj = getAroundPoi(orderObject, xzConfig.funcName[1]);
+ mapObj = getAroundPoi(orderObject, func);
} else if (func.equals(xzConfig.funcName[2])) {
- mapObj = getQueryMeta(orderObject, xzConfig.funcName[2]);
- } else if (func.equals(xzConfig.funcName[2])) {
- mapObj = getQueryMeta(orderObject, xzConfig.funcName[2]);
+ mapObj = getQueryMeta(orderObject, func);
} else if (func.equals(xzConfig.funcName[3])) {
- mapObj = getQueryRelationship(orderObject, xzConfig.funcName[3]);
+ mapObj = getQueryRelationship(orderObject, func);
+ }else if (func.equals(xzConfig.funcName[4])) {
+ mapObj = getCombatSimulate(orderObject, func);
+ }else if (func.equals(xzConfig.funcName[5])) {
+ mapObj = getBatEnv(orderObject, func, allParams);
}
-
-
return mapObj;
+ }
+
+ private HashMap<String, Object> getCombatSimulate(JSONObject orderObject, String func) {
+ HashMap<String, Object> hashMap = new HashMap<String, Object>();
+ hashMap.put("func", func);
+ return hashMap;
+ }
+
+ 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){
+ hashMap.put("msg", "鎶ュ憡鐢熸垚澶辫触");
+ return hashMap;
+ }
+ System.out.println("rec history1:" + val);
+ hashMap.put("msg", js.getString("content"));
+
+ return hashMap;
}
//鏌ョ湅鏌愪釜鍖哄煙鍐呭悇涓疄浣�/瀵硅薄涔嬮棿鐨勫叧绯�
@@ -46,7 +80,10 @@
hashMap.put("func", func);
JSONObject argsObject = JSON.parseObject(orderObject.getString("args"));
String place = argsObject.getString("place");
- HashMap<String,Object> poiMap = agentService.getQueryRelationship(place, xzConfig.queryFiled);
+ HashMap<String, Object> poiMap = agentService.getQueryRelationship(place, xzConfig.queryFiled);
+ String key = "msg";
+ String msg = (String) poiMap.get(key);
+ hashMap.put("msg", msg);
hashMap.put("data", poiMap);
return hashMap;
}
@@ -59,29 +96,46 @@
JSONObject metaObject = JSON.parseObject(filedString);
JSONArray dataArray = metaObject.getJSONArray("data");
String markDown = "| 鏁版嵁绫诲瀷 | 鏁版嵁閲� |\n|------|------|\n";
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
for (int i = 0; i < dataArray.size(); i++) {
JSONObject dataObj = dataArray.getJSONObject(i);
System.out.println("rec queryMeta:" + dataObj);
- String[] filedValue = new String[2];
-
- for (String key : dataObj.keySet()) {
- System.out.println("rec 1:" + key+":"+xzConfig.typeFiled);
- String itemObj = dataObj.getString(key);
- System.out.println("rec 2:" +itemObj);
-
- if (key.equals(xzConfig.typeFiled) ) {
- filedValue[0] = dataObj.getString(key);
- }else{
- filedValue[1] = dataObj.getString(key);
- }
-
- }
- markDown += "| " + filedValue[0] + " | " + filedValue[1] + " |\n";
-
+ HashMap<String, Object> listhash = new HashMap<>();
+ String name = dataObj.getString(xzConfig.typeFiled);
+ String count = dataObj.getString("count_" + xzConfig.typeFiled);
+ ArrayList filedList = getQueryByFiledList(name);
+ listhash.put("name", name);
+ listhash.put("ids", filedList);
+ list.add(listhash);
+ markDown += "| " + name + " | " + count + " |\n";
}
+ hashMap.put("ids", list);
hashMap.put("data", markDown);
return hashMap;
+ }
+
+ // 鍏抽敭瀛楁煡璇㈠垎绫绘煡璇㈡暟鎹噺
+ private ArrayList getQueryByFiledList(String name) throws Exception {
+ String obj = xzConfig.typeFiled + " = '" + name + "'" + "";
+ String encrypt = RsaHelper.encrypt(xzService.getPublickey(), obj);
+ HashMap hashMap = xzService.getHashMap(xzConfig.layerId, xzConfig.dbid, "1", "0", encrypt, null);
+ String val = entityHttpUtil.getPostMessage(xzConfig.queryEntity, hashMap);
+ ArrayList list = new ArrayList();
+ String fObj = JSONObject.parseObject(val).getString("data");
+ System.out.println("rec queryMeta:" + fObj);
+ if (fObj != null) {
+ JSONArray fArray = JSONArray.parseArray(JSONObject.parseObject(fObj).getString("items"));
+ System.out.println("rec queryMeta:" + fArray);
+ System.out.println("rec queryMeta:" + fArray.size());
+ if (fArray.size() > 0) {
+ for (int i = 0; i < fArray.size(); i++) {
+ String sid = JSONObject.parseObject(fArray.get(i).toString()).getString("seid");
+ list.add(sid);
+ }
+ }
+ }
+ return list;
}
//鏍规嵁鑼冨洿鏌ヨ鏁版嵁
@@ -98,9 +152,16 @@
radius = Integer.parseInt(dis);
}
String aroundPoi = agentService.getAgentAroundPoi(place, type, radius, xzConfig.queryFiled, xzConfig.typeFiled);
+ if (aroundPoi == "" || aroundPoi.isEmpty()) {
+ String msg = "鏈煡璇㈠埌" + place + "鐩稿叧鏁版嵁銆傝鎻愪緵鏇村姞璇︾粏鏁版嵁銆�";
+ hashMap.put("msg", msg);
+ return hashMap;
+ }
JSONArray dataArray = JSONArray.parseArray(aroundPoi);
System.out.println("aroundPoi: " + dataArray);
hashMap.put("data", dataArray);
+ String msg = "宸叉煡璇㈠埌" + place + "鍐呯殑" + type + "鐩稿叧鏁版嵁銆傚叡鏌ヨ鍒�" + dataArray.size() + "鏉℃暟鎹��";
+ hashMap.put("msg", msg);
return hashMap;
}
@@ -111,11 +172,17 @@
JSONObject argsObject = JSON.parseObject(orderString.getString("args"));
String place = argsObject.getString("place");
String poiMap = agentService.getAgentPoiMap(place, xzConfig.queryFiled);
- System.out.println("poiMap: " + poiMap);
JSONObject poiObj = JSONObject.parseObject(poiMap);
+ if (poiMap == "" || poiMap.isEmpty()) {
+ String msg = "鏈煡璇㈠埌" + place + "鐩稿叧鏁版嵁銆傝鎻愪緵鏇村姞璇︾粏鏁版嵁銆�";
+ hashMap.put("msg", msg);
+ return hashMap;
+ }
System.out.println("poiMap: " + poiObj);
hashMap.put("func", func);
hashMap.put("data", poiObj);
+ String msg = "宸叉煡璇㈠埌" + place + "鐩稿叧鏁版嵁銆�" + place + "鏁版嵁宸插湪鍦板浘涓婃樉绀�";
+ hashMap.put("msg", msg);
return hashMap;
}
diff --git a/src/main/java/com/yb/service/XzService.java b/src/main/java/com/yb/service/XzService.java
index f58fe56..622fbbc 100644
--- a/src/main/java/com/yb/service/XzService.java
+++ b/src/main/java/com/yb/service/XzService.java
@@ -11,9 +11,7 @@
import org.springframework.stereotype.Service;
import org.locationtech.jts.geom.*;
import org.locationtech.jts.operation.buffer.BufferOp;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+
import java.util.*;
import java.util.HashMap;
@@ -56,6 +54,9 @@
JSONObject jsonObject = JSON.parseObject(jsonString1);
JSONObject dataObjject = jsonObject.getJSONObject("data");
JSONArray dataArray = dataObjject.getJSONArray("items");
+ if(dataArray.size()<=0){
+ return null;
+ }
return dataArray.getJSONObject(0).toString();
diff --git a/src/main/java/com/yb/util/EntityHttpUtil.java b/src/main/java/com/yb/util/EntityHttpUtil.java
index 11cea99..cc65d33 100644
--- a/src/main/java/com/yb/util/EntityHttpUtil.java
+++ b/src/main/java/com/yb/util/EntityHttpUtil.java
@@ -1,7 +1,9 @@
package com.yb.util;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.yb.config.XzConfig;
+import io.swagger.v3.core.util.Json;
import okhttp3.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -10,9 +12,11 @@
import org.springframework.web.bind.annotation.RestController;
+import java.io.File;
import java.io.IOException;
import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
@Component
@@ -21,27 +25,27 @@
@Autowired
private XzConfig xzConfig;
- public String getMessage(String aurl){
- try{
- String axiosUrl = xzConfig.geographicalUrl +aurl;
+ public String getMessage(String aurl) {
+ try {
+ String axiosUrl = xzConfig.geographicalUrl + aurl;
OkHttpClient client = new OkHttpClient.Builder().connectTimeout(5, TimeUnit.SECONDS)
.readTimeout(5, TimeUnit.SECONDS)
.writeTimeout(5, TimeUnit.SECONDS)
.build();
Request request = new Request.Builder()
- .addHeader("Token",xzConfig.token)
+ .addHeader("Token", xzConfig.token)
.url(axiosUrl)
.build();
Response response = client.newCall(request).execute();
return response.body().string();
- }catch (IOException e){
+ } catch (IOException e) {
System.out.println(e.getMessage());
}
- return null;
+ return null;
}
- public String getAgentMessage(String aurl){
- try{
+ public String getAgentMessage(String aurl) {
+ try {
OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)
.readTimeout(0, TimeUnit.SECONDS)
@@ -52,34 +56,71 @@
.build();
Response response = client.newCall(request).execute();
return response.body().string();
- }catch (IOException e){
+ } catch (IOException e) {
System.out.println(e.getMessage());
}
- return null;
+ return null;
}
- public String getPostMessage(String aurl, HashMap<String,String> parms){
- try{
- String axiosUrl = xzConfig.geographicalUrl+aurl;
- FormBody.Builder builder= new FormBody.Builder();
- for(String key:parms.keySet()){
- builder.add(key,parms.get(key));
+
+
+
+ public String getPostMessage(String aurl, HashMap<String, String> parms) {
+ try {
+ String axiosUrl = xzConfig.geographicalUrl + aurl;
+ FormBody.Builder builder = new FormBody.Builder();
+ for (String key : parms.keySet()) {
+ builder.add(key, parms.get(key));
}
- RequestBody requestBody = builder.build();
- OkHttpClient client = new OkHttpClient.Builder().connectTimeout(5, TimeUnit.SECONDS)
- .readTimeout(5, TimeUnit.SECONDS)
- .writeTimeout(5, TimeUnit.SECONDS)
+ RequestBody requestBody = builder.build();
+ OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)
+ .readTimeout(0, TimeUnit.SECONDS)
+ .writeTimeout(0, TimeUnit.SECONDS)
.build();
Request request = new Request.Builder()
- .addHeader("Token",xzConfig.token)
+ .addHeader("Token", xzConfig.token)
.url(axiosUrl)
.post(requestBody)
.build();
Response response = client.newCall(request).execute();
return response.body().string();
- }catch (IOException e){
+ } catch (IOException e) {
System.out.println(e.getMessage());
}
- return null;
+ return null;
}
+ public String postAgentMessage(String aurl, Map<String, String> parms) {
+ try {
+ String axiosUrl = xzConfig.agentUrl + aurl;
+ MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+// JSONObject jsonObject= JSONObject.parseObject(parms.toString());
+ HashMap<String,Object> itemMap = new HashMap<>();
+ for (String key : parms.keySet()) {
+ if(key=="history_msg"){
+ itemMap.put(key,JSONObject.parseObject( parms.get(key)));
+ }else{
+ itemMap.put(key, parms.get(key));
+ }
+ System.out.println("rec application/json:" + key);
+ }
+ RequestBody requestBody = RequestBody.create(JSON,JSONObject.toJSON(itemMap).toString());
+ OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)
+ .readTimeout(0, TimeUnit.SECONDS)
+ .writeTimeout(0, TimeUnit.SECONDS)
+ .build();
+ Request request = new Request.Builder()
+ .url(axiosUrl)
+ .post(requestBody)
+ .build();
+ Response response = client.newCall(request).execute();
+ return response.body().string();
+ } catch (IOException e) {
+ System.out.println(e.getMessage());
+ }
+ return null;
+
+
+
+
+ }
}
diff --git a/src/main/resources/application-agent.yml b/src/main/resources/application-agent.yml
index 609da87..65842a8 100644
--- a/src/main/resources/application-agent.yml
+++ b/src/main/resources/application-agent.yml
@@ -32,7 +32,8 @@
relationDistinct: /graph/public/relation/ab_layerid/distinct
# 鍏崇郴鏌ヨ
relationRelateddata: /graph/public/relation/relateddata
-
+ # 鑾峰彇鍥惧眰鍒楄〃
+ permissionLayer: /entitydb/map/config
#Agent澶фā鍨�
@@ -45,8 +46,10 @@
agentRag: /rag
# charGpt
agentChat: /onlyChat
+ # charGpt
+ battleReport: /battleReport
# 鍑芥暟鍚嶇О
- funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate
+ funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate,batEnv
diff --git a/target/classes/application-agent.yml b/target/classes/application-agent.yml
index 609da87..65842a8 100644
--- a/target/classes/application-agent.yml
+++ b/target/classes/application-agent.yml
@@ -32,7 +32,8 @@
relationDistinct: /graph/public/relation/ab_layerid/distinct
# 鍏崇郴鏌ヨ
relationRelateddata: /graph/public/relation/relateddata
-
+ # 鑾峰彇鍥惧眰鍒楄〃
+ permissionLayer: /entitydb/map/config
#Agent澶фā鍨�
@@ -45,8 +46,10 @@
agentRag: /rag
# charGpt
agentChat: /onlyChat
+ # charGpt
+ battleReport: /battleReport
# 鍑芥暟鍚嶇О
- funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate
+ funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate,batEnv
diff --git a/target/classes/application-config.yml b/target/classes/application-config.yml
deleted file mode 100644
index 7755b2c..0000000
--- a/target/classes/application-config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-config:
-# HelloWorld
- hello: HelloWorld
\ No newline at end of file
diff --git a/target/classes/com/yb/config/XzConfig.class b/target/classes/com/yb/config/XzConfig.class
index 983472a..c6d60cc 100644
--- a/target/classes/com/yb/config/XzConfig.class
+++ b/target/classes/com/yb/config/XzConfig.class
Binary files differ
diff --git a/target/classes/com/yb/controller/agentController.class b/target/classes/com/yb/controller/agentController.class
index 4a3fd6c..1acd0d4 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/entity/RelaEntity.class b/target/classes/com/yb/entity/RelaEntity.class
new file mode 100644
index 0000000..c94b4dc
--- /dev/null
+++ b/target/classes/com/yb/entity/RelaEntity.class
Binary files differ
diff --git a/target/classes/com/yb/service/AgentService.class b/target/classes/com/yb/service/AgentService.class
index 2ded65f..46ac837 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 a8d291d..6bc9338 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 5765b6f..d8edebf 100644
--- a/target/classes/com/yb/service/XzService.class
+++ b/target/classes/com/yb/service/XzService.class
Binary files differ
diff --git a/target/classes/com/yb/util/EntityHttpUtil.class b/target/classes/com/yb/util/EntityHttpUtil.class
index b4112b6..d3857e8 100644
--- a/target/classes/com/yb/util/EntityHttpUtil.class
+++ b/target/classes/com/yb/util/EntityHttpUtil.class
Binary files differ
diff --git a/target/classes/mapper/application-config.yml b/target/classes/mapper/application-config.yml
deleted file mode 100644
index 7755b2c..0000000
--- a/target/classes/mapper/application-config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-config:
-# HelloWorld
- hello: HelloWorld
\ No newline at end of file
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index f2cb2ae..a95fa35 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -24,6 +24,7 @@
com\yb\postgis\PointTypeHandler.class
com\yb\util\EntityHttpUtil.class
com\yb\entity\TMetaEntity.class
+com\yb\entity\RelaEntity.class
com\yb\dao\TMetaDao.class
com\yb\service\IntentionService.class
com\yb\service\XzService.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index c23b1b2..ac7c31d 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -16,6 +16,7 @@
E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\service\GisOsmPoisFree1Service.java
E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\OllamaAiApplication.java
E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\controller\GisOsmPoisFree1Controller.java
+E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\entity\RelaEntity.java
E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\service\IntentionService.java
E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\service\impl\GisOsmPoisFree1ServiceImpl.java
E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\config\Constant.java
diff --git a/target/ollama-ai-0.0.1-SNAPSHOT.jar b/target/ollama-ai-0.0.1-SNAPSHOT.jar
index e5cdeaa..b6ef3b8 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 8dc560e..e849643 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