From 623cee8be4846e5762ff2949e519335ef8dee2bb Mon Sep 17 00:00:00 2001 From: suerprisePlus <15810472099@163.com> Date: 星期一, 09 九月 2024 18:30:55 +0800 Subject: [PATCH] 大模型知识图谱接口对接 --- target/classes/com/yb/service/AgentService.class | 0 target/ollama-ai-0.0.1-SNAPSHOT.jar | 0 target/classes/mapper/application-config.yml | 3 src/main/java/com/yb/service/IntentionService.java | 129 ++++++++++++++ target/classes/application-agent.yml | 55 ++++++ src/main/java/com/yb/controller/agentController.java | 76 +------- src/main/java/com/yb/service/AgentService.java | 61 ++++++ src/main/resources/application-agent.yml | 55 ++++++ target/classes/com/yb/service/XzService.class | 0 src/main/java/com/yb/service/XzService.java | 18 + target/classes/com/yb/service/IntentionService.class | 0 target/classes/application.yml | 27 -- 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 target/classes/application-config.yml | 3 src/main/java/com/yb/util/EntityHttpUtil.java | 19 - src/main/java/com/yb/config/XzConfig.java | 41 +++- target/ollama-ai-0.0.1-SNAPSHOT.jar.original | 0 target/classes/com/yb/config/XzConfig.class | 0 src/main/resources/application.yml | 27 -- target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 1 22 files changed, 374 insertions(+), 142 deletions(-) diff --git a/src/main/java/com/yb/config/XzConfig.java b/src/main/java/com/yb/config/XzConfig.java index 3f7583d..356c94d 100644 --- a/src/main/java/com/yb/config/XzConfig.java +++ b/src/main/java/com/yb/config/XzConfig.java @@ -4,32 +4,51 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import java.util.List; + @Component public class XzConfig { // 鍦扮悊瀹炰綋 - @Value("${spring.geographical.canview}") + @Value("${itcats.geographical.canview}") public String canview; - @Value("${spring.geographical.entityName}") + @Value("${itcats.geographical.entityName}") public String entityName; - @Value("${spring.geographical.dbid}") + @Value("${itcats.geographical.dbid}") public String dbid; - @Value("${spring.geographical.layerId}") + @Value("${itcats.geographical.layerId}") public String layerId; - @Value("${spring.geographical.queryEntity}") + @Value("${itcats.geographical.queryEntity}") public String queryEntity; - @Value("${spring.geographical.publickey}") + @Value("${itcats.geographical.publickey}") public String publickey; - @Value("${spring.geographical.token}") + @Value("${itcats.geographical.token}") public String token; + @Value("${itcats.geographical.geographicalUrl}") + public String geographicalUrl; + @Value("${itcats.geographical.queryFiled}") + public String queryFiled; + @Value("${itcats.geographical.typeFiled}") + public String typeFiled; + @Value("${itcats.geographical.layerQuery}") + public String layerQuery; + @Value("${itcats.geographical.relationList}") + public String relationList; + @Value("${itcats.geographical.relationDistinct}") + public String relationDistinct; + @Value("${itcats.geographical.relationRelateddata}") + public String relationRelateddata; + // Agent - @Value("${spring.agent.agentUrl}") + @Value("${itcats.agent.agentUrl}") public String agentUrl; - @Value("${spring.agent.agentRag}") + @Value("${itcats.agent.agentRag}") public String agentRag; - @Value("${spring.agent.agentIntent}") + @Value("${itcats.agent.agentIntent}") public String agentIntent; - @Value("${spring.agent.agentChat}") + @Value("${itcats.agent.agentChat}") public String agentChat; + @Value("${itcats.agent.funcName}") + public String[] funcName; } diff --git a/src/main/java/com/yb/controller/agentController.java b/src/main/java/com/yb/controller/agentController.java index 5cc62fc..2f5a653 100644 --- a/src/main/java/com/yb/controller/agentController.java +++ b/src/main/java/com/yb/controller/agentController.java @@ -9,6 +9,7 @@ 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,9 +34,9 @@ @Autowired private XzConfig xzConfig; @Autowired - private XzService xzService; - @Autowired private AgentService agentService; + @Autowired + private IntentionService intentionService; @ApiOperation("鎰忓浘璇嗗埆") @PostMapping("/intention") @@ -43,15 +44,9 @@ public R getIntention(@RequestParam Map<String, String> allParams) throws Exception { System.out.println("rec getMessage:" + allParams); String msg = allParams.get("message"); - String sessionId = allParams.get("session_id"); - String libId = allParams.get("lib_id"); - String url = xzConfig.agentUrl; - String intent = xzConfig.agentIntent; - String rag = xzConfig.agentRag; - String chart = xzConfig.agentChat; // 鍒ゆ柇msg鏄惁涓虹┖ if (StringUtils.isEmpty(msg)) { - String info = agentService.getAgentIntention(url, intent, "''"); + String info = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, "''"); JSONObject obj = JSONObject.parseObject(info); String cont = obj.getString("content"); System.out.println("rec isEmpty:" + cont); @@ -63,11 +58,10 @@ HashMap<String, Object> hashMap = new HashMap<String, Object>(); if (isMap) { hashMap.put("type", "Map"); - HashMap<String, Object> mapObj = new HashMap<String, Object>(); - String funcInfo = agentService.getAgentIntention(url, intent, msg); + String funcInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, msg); JSONObject jsonObject = JSON.parseObject(funcInfo); String orderString = jsonObject.getString("order"); - if(orderString == null){ + if (orderString == null) { hashMap.put("type", "text"); JSONObject errInfo = JSON.parseObject(funcInfo); String erroContent = errInfo.getString("content"); @@ -75,64 +69,13 @@ return R.error(erroContent); } - JSONObject orderObject = JSON.parseObject(orderString); - - String func = orderObject.getString("name"); - JSONObject argsObject = JSON.parseObject(orderObject.getString("args")); - String place = argsObject.getString("place"); - String type = argsObject.getString("attris"); - String dis = argsObject.getString("redius"); - int radius = 5000; - if (dis != null) { - dis = dis.replace("m", ""); - radius = Integer.parseInt(dis); - } - String queryFiled = "enti_name"; - String typeFiled = "sjnr"; - String func1 = "poiMap"; - String func2 = "aroundPoi"; - String func3 = "queryMeta"; - if (func.equals(func1)) { - String poiMap = agentService.getAgentPoiMap(place, queryFiled); - System.out.println("poiMap: " + poiMap); - JSONObject poiObj = JSONObject.parseObject(poiMap); - System.out.println("poiMap: " + poiObj); - mapObj.put("func", func1); - mapObj.put("data", poiObj); - } else if (func.equals(func2)) { - mapObj.put("func", func2); - String aroundPoi = agentService.getAgentAroundPoi(place, type, radius, queryFiled, typeFiled); - JSONArray dataArray = JSONArray.parseArray(aroundPoi); - System.out.println("aroundPoi: " + dataArray); - mapObj.put("data", dataArray); - } else if (func.equals(func3)) { - mapObj.put("func", func3); - String filedString= xzService.getQueryMeta(xzConfig.layerId, xzConfig.dbid,typeFiled,xzConfig.queryEntity); - JSONObject metaObject = JSON.parseObject(filedString); - JSONArray dataArray = metaObject.getJSONArray("data"); - String markDown = "| 鏁版嵁绫诲瀷 | 鏁版嵁閲� |\\n|------|------|\\n"; - 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()) { - if (key == typeFiled) { - filedValue[0] = dataObj.getString(key); - } else { - filedValue[1] = dataObj.getString(key); - } - } - markDown += "| " + filedValue[0] + " | " + filedValue[1] + " |\n"; - } - mapObj.put("data", markDown); - } - +// 鎰忓浘鍑芥暟鍖归厤 + HashMap<String, Object> mapObj = intentionService.getFunctionMatch(orderString); hashMap.put("content", mapObj); return R.ok(hashMap); } else { - String ragInfo = agentService.getAgentIntention(url, chart, msg); + String ragInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentChat, msg); JSONObject jsonObject = JSON.parseObject(ragInfo); String answer = jsonObject.getString("content"); System.out.println("Answer: " + answer); @@ -141,7 +84,6 @@ return R.ok(hashMap); } -// return R.error("鏈煡璇㈠埌鐩稿叧淇℃伅"); } diff --git a/src/main/java/com/yb/service/AgentService.java b/src/main/java/com/yb/service/AgentService.java index eb93be4..6107210 100644 --- a/src/main/java/com/yb/service/AgentService.java +++ b/src/main/java/com/yb/service/AgentService.java @@ -1,11 +1,15 @@ package com.yb.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.yb.config.XzConfig; import com.yb.entity.ReqEntity; 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; @Service public class AgentService { @@ -35,7 +39,7 @@ // public String getAgentPoiMap(String func, String filed) throws Exception { - String poiObj= xzService.getQueryFiled(func, filed, xzConfig.layerId, xzConfig.dbid, xzConfig.queryEntity); + String poiObj = xzService.getQueryFiled(func, filed, xzConfig.layerId, xzConfig.dbid, xzConfig.queryEntity); System.out.println("rec poiMap:" + poiObj); return poiObj; } @@ -47,7 +51,60 @@ Double lon = Double.parseDouble(obj.getString("lon")); Double lat = Double.parseDouble(obj.getString("lat")); String wkt = xzService.getWKt(lon, lat, dis); - return xzService.getQueryAround(type, wkt, typeFiled, xzConfig.layerId, xzConfig.dbid, xzConfig.queryEntity); + return xzService.getQueryAround(type, wkt, typeFiled, xzConfig.layerId, xzConfig.dbid, xzConfig.queryEntity); + + } + + public HashMap<String, Object> getQueryRelationship(String place, String filed) throws Exception { + String poiObj = xzService.getQueryEntity(place, filed, xzConfig.layerId, xzConfig.dbid, xzConfig.layerQuery); + HashMap<String, String> hashMap = new HashMap<String, String>(); + hashMap.put("token", xzConfig.token); + hashMap.put("dbid", xzConfig.dbid); + hashMap.put("groupid", ""); + String relationList = entityHttpUtil.getPostMessage(xzConfig.relationList, hashMap); + JSONObject relattionObj = JSONObject.parseObject(relationList); + String data = relattionObj.getString("data"); + JSONArray relationArry = JSONArray.parseArray(data); + JSONObject itemObj = new JSONObject(); + for (int i = 0; i < relationArry.size(); i++) { + JSONObject relationtem = relationArry.getJSONObject(i); + String name = relationtem.getString("name"); + if (name.equals("鍖呭惈鍏崇郴")) { + 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 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); + JSONObject relateddataeObj = JSONObject.parseObject(relationRelateddata); + String relateddataeData = relateddataeObj.getString("data"); + JSONArray relateddataeArray = JSONArray.parseArray(JSONObject.parseObject(relateddataeData).getString("items")); + System.out.println("rec getQueryRelationship:" + relateddataeArray); + ArrayList<String> list = new ArrayList<>(); + for (int k = 0; k < relateddataeArray.size(); k++) { + JSONObject reitem = relateddataeArray.getJSONObject(k); + list.add(reitem.getString("a_objectid")); + list.add(reitem.getString("b_objectid")); + } + 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("layerid", xzConfig.layerId); + reMap.put("querylatest", "true"); + String reMapList = entityHttpUtil.getPostMessage(xzConfig.layerQuery, reMap); + JSONArray reArray = JSONArray.parseArray(JSONObject.parseObject(reMapList).getString("data")); + System.out.println("rec getQueryRelationship:" + reArray); + HashMap<String, Object> traiMap = new HashMap<>(); + traiMap.put("center", JSONObject.parseObject(poiObj)); + traiMap.put("positions", reArray); + 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 new file mode 100644 index 0000000..e93676c --- /dev/null +++ b/src/main/java/com/yb/service/IntentionService.java @@ -0,0 +1,129 @@ +package com.yb.service; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.yb.config.XzConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; + +@Service +public class IntentionService { + @Autowired + private XzConfig xzConfig; + @Autowired + private AgentService agentService; + @Autowired + private XzService xzService; + + public HashMap<String, Object> getFunctionMatch(String orderString) throws Exception { + HashMap<String, Object> mapObj = new HashMap<String, Object>(); + JSONObject orderObject = JSON.parseObject(orderString); + String func = orderObject.getString("name"); + + if (func.equals(xzConfig.funcName[0])) { + mapObj = getPoiMap(orderObject, xzConfig.funcName[0]); + } else if (func.equals(xzConfig.funcName[1])) { + mapObj = getAroundPoi(orderObject, xzConfig.funcName[1]); + } 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]); + } else if (func.equals(xzConfig.funcName[3])) { + mapObj = getQueryRelationship(orderObject, xzConfig.funcName[3]); + } + + + return mapObj; + + } + + //鏌ョ湅鏌愪釜鍖哄煙鍐呭悇涓疄浣�/瀵硅薄涔嬮棿鐨勫叧绯� + private HashMap<String, Object> getQueryRelationship(JSONObject orderObject, String func) throws Exception { + HashMap<String, Object> hashMap = new HashMap<String, Object>(); + 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.put("data", poiMap); + return hashMap; + } + + //鏌ヨ鏁版嵁缁熻 + private HashMap<String, Object> getQueryMeta(JSONObject orderObject, String func) throws Exception { + HashMap<String, Object> hashMap = new HashMap<String, Object>(); + hashMap.put("func", func); + String filedString = xzService.getQueryMeta(xzConfig.layerId, xzConfig.dbid, xzConfig.typeFiled, xzConfig.queryEntity); + JSONObject metaObject = JSON.parseObject(filedString); + JSONArray dataArray = metaObject.getJSONArray("data"); + String markDown = "| 鏁版嵁绫诲瀷 | 鏁版嵁閲� |\n|------|------|\n"; + 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.put("data", markDown); + return hashMap; + + } + + //鏍规嵁鑼冨洿鏌ヨ鏁版嵁 + private HashMap<String, Object> getAroundPoi(JSONObject orderString, String func) throws Exception { + HashMap<String, Object> hashMap = new HashMap<String, Object>(); + hashMap.put("func", func); + JSONObject argsObject = JSON.parseObject(orderString.getString("args")); + String place = argsObject.getString("place"); + String type = argsObject.getString("attris"); + String dis = argsObject.getString("redius"); + int radius = 5000; + if (dis != null) { + dis = dis.replace("m", ""); + radius = Integer.parseInt(dis); + } + String aroundPoi = agentService.getAgentAroundPoi(place, type, radius, xzConfig.queryFiled, xzConfig.typeFiled); + JSONArray dataArray = JSONArray.parseArray(aroundPoi); + System.out.println("aroundPoi: " + dataArray); + hashMap.put("data", dataArray); + return hashMap; + + } + + //鏌ヨ鐐逛綅 + public HashMap<String, Object> getPoiMap(JSONObject orderString, String func) throws Exception { + HashMap<String, Object> hashMap = new HashMap<String, Object>(); + 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); + System.out.println("poiMap: " + poiObj); + hashMap.put("func", func); + hashMap.put("data", poiObj); + return hashMap; + } + + +} + + + + + + diff --git a/src/main/java/com/yb/service/XzService.java b/src/main/java/com/yb/service/XzService.java index 7f08fdc..f58fe56 100644 --- a/src/main/java/com/yb/service/XzService.java +++ b/src/main/java/com/yb/service/XzService.java @@ -35,7 +35,6 @@ HashMap formData = getHashMap(layerId, dbId, "1", "0", encrypt, null); String jsonString = entityHttpUtil.getPostMessage(queryEntity, formData); System.out.println("rec getQueryFiled:" + jsonString); - JSONObject jsonObject = JSON.parseObject(jsonString); JSONObject dataObjject = jsonObject.getJSONObject("data"); JSONArray dataArray = dataObjject.getJSONArray("items"); @@ -45,6 +44,23 @@ return ""; } + // 鍏抽敭瀛楁煡璇� + public String getQueryEntity(String place, String filed, String layerId, String dbId, String queryEntity) throws Exception { + String query = filed + " like '%" + place + "%'" + ""; + String key = getPublickey(); + String encrypt = RsaHelper.encrypt(key, query); + HashMap formData = getHashMap(layerId, dbId, "1", "100", encrypt, null); + formData.put("querytype", "entity"); + String jsonString1 = entityHttpUtil.getPostMessage(queryEntity, formData); + System.out.println("rec getQueryFiled:" + jsonString1); + JSONObject jsonObject = JSON.parseObject(jsonString1); + JSONObject dataObjject = jsonObject.getJSONObject("data"); + JSONArray dataArray = dataObjject.getJSONArray("items"); + return dataArray.getJSONObject(0).toString(); + + + } + // 鑼冨洿鏌ヨ public String getQueryAround(String type, String wkt, String filed, String layerId, String dbid, String entity) throws Exception { String query = filed + " like '%" + type + "%'" + ""; diff --git a/src/main/java/com/yb/util/EntityHttpUtil.java b/src/main/java/com/yb/util/EntityHttpUtil.java index a45e6d7..11cea99 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.yb.config.XzConfig; import okhttp3.*; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -16,22 +18,18 @@ @Component @RestController public class EntityHttpUtil { - - @Value("${spring.geographical.token}") - String token ; - - @Value("${spring.geographical.url}") - String url ; + @Autowired + private XzConfig xzConfig; public String getMessage(String aurl){ try{ - String axiosUrl = url+aurl; + 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",token) + .addHeader("Token",xzConfig.token) .url(axiosUrl) .build(); Response response = client.newCall(request).execute(); @@ -50,7 +48,6 @@ .writeTimeout(0, TimeUnit.SECONDS) .build(); Request request = new Request.Builder() - .url(aurl) .build(); Response response = client.newCall(request).execute(); @@ -62,7 +59,7 @@ } public String getPostMessage(String aurl, HashMap<String,String> parms){ try{ - String axiosUrl = url+aurl; + String axiosUrl = xzConfig.geographicalUrl+aurl; FormBody.Builder builder= new FormBody.Builder(); for(String key:parms.keySet()){ builder.add(key,parms.get(key)); @@ -73,7 +70,7 @@ .writeTimeout(5, TimeUnit.SECONDS) .build(); Request request = new Request.Builder() - .addHeader("Token",token) + .addHeader("Token",xzConfig.token) .url(axiosUrl) .post(requestBody) .build(); diff --git a/src/main/resources/application-agent.yml b/src/main/resources/application-agent.yml new file mode 100644 index 0000000..609da87 --- /dev/null +++ b/src/main/resources/application-agent.yml @@ -0,0 +1,55 @@ +itcats: + # 鍦扮悊瀹炰綋搴� + geographical: + # Token鍦板潃 + token: 9ce350f238ba44fda10ddfe8b80f8967 + # 璇锋眰鍦板潃 + geographicalUrl: http://106.120.22.26:8013/geo-service/ + # 鑾峰彇瀹炰綋搴撳垪琛� + canview: /entitydb/list/canview + # 鏌ヨ鍥惧眰鏁版嵁锛堟垨鏁伴噺锛� + queryEntity: /entitydbdata/query/entity + # 鑾峰彇key鍞竴鏍囪瘑 + publickey: /setting/publickey + # 瀹炰綋搴撳悕绉� + entityName: 澶фā鍨嬫祴璇曞簱 + # 瀹炰綋搴揹bid + # dbid: 3dce04bbab1540b5ae3d147e8503ab9d + dbid: 29766abee55e45d6a6bb232cdf74ebbe + # 瀹炰綋搴揹bid + # layerId: a61f2f8f-0bf9-422f-86fe-b7b0a30ebad9 + layerId: c8f3f75d-8730-44ec-81b7-f8ae4c5fd742 + # 鏌ヨ鍏抽敭瀛� + # queryFiled: enti_name + queryFiled: name_2 + # 鏌ヨ绫诲瀷瀛楁 + typeFiled: fclass_1 + # 瀹炰綋鍏抽敭瀛楁煡璇� + layerQuery: /entitydbdata/layer/query + # 鍏崇郴鍒楄〃鏌ヨ + relationList: /graph/relation/list + # 鍏崇郴鈥旀煡璇㈠叧鑱旇〃鏁版嵁 + relationDistinct: /graph/public/relation/ab_layerid/distinct + # 鍏崇郴鏌ヨ + relationRelateddata: /graph/public/relation/relateddata + + + + #Agent澶фā鍨� + agent: + # 璁块棶鍦板潃 + agentUrl: http://106.120.22.26:5367 + # 鎰忓浘鍑芥暟 + agentIntent: /intention + # rag鏈嶅姟 + agentRag: /rag + # charGpt + agentChat: /onlyChat + # 鍑芥暟鍚嶇О + funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate + + + + + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 990f5f3..3166dd6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,6 +3,8 @@ servlet: context-path: / spring: + profiles: + active: agent datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: org.postgresql.Driver @@ -12,30 +14,7 @@ jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss - # 鍦扮悊瀹炰綋搴� - geographical: - # Token鍦板潃 - token: 9ce350f238ba44fda10ddfe8b80f8967 - # 璇锋眰鍦板潃 - url: http://106.120.22.26:8013/geo-service/ - # 鑾峰彇瀹炰綋搴撳垪琛� - canview: /entitydb/list/canview - # 鏌ヨ鍥惧眰鏁版嵁锛堟垨鏁伴噺锛� - queryEntity: /entitydbdata/query/entity - # 鑾峰彇key鍞竴鏍囪瘑 - publickey: /setting/publickey - # 瀹炰綋搴撳悕绉� - entityName: 澶фā鍨嬫祴璇曞簱 - # 瀹炰綋搴揹bid - dbid: 3dce04bbab1540b5ae3d147e8503ab9d - # 瀹炰綋搴揹bid - layerId: a61f2f8f-0bf9-422f-86fe-b7b0a30ebad9 - agent: - agentUrl: http://106.120.22.26:5367 - agentIntent: /intention - agentRag: /rag - agentChat: /onlyChat application: name: ollama-ai ai: @@ -44,8 +23,6 @@ chat: # model: yi:9b-chat-v1.5-q4_0 model: qwen2:1.5b - - fastgpt: appid: 6673bfa1d14da0cede023f28 apikey: fastgpt-eNuz6Rsc5EMrYMiODBQbBXCbGwQYp9nSpYPE06vBBt3nitnFLdHSoQ0BAmNHDyB diff --git a/target/classes/application-agent.yml b/target/classes/application-agent.yml new file mode 100644 index 0000000..609da87 --- /dev/null +++ b/target/classes/application-agent.yml @@ -0,0 +1,55 @@ +itcats: + # 鍦扮悊瀹炰綋搴� + geographical: + # Token鍦板潃 + token: 9ce350f238ba44fda10ddfe8b80f8967 + # 璇锋眰鍦板潃 + geographicalUrl: http://106.120.22.26:8013/geo-service/ + # 鑾峰彇瀹炰綋搴撳垪琛� + canview: /entitydb/list/canview + # 鏌ヨ鍥惧眰鏁版嵁锛堟垨鏁伴噺锛� + queryEntity: /entitydbdata/query/entity + # 鑾峰彇key鍞竴鏍囪瘑 + publickey: /setting/publickey + # 瀹炰綋搴撳悕绉� + entityName: 澶фā鍨嬫祴璇曞簱 + # 瀹炰綋搴揹bid + # dbid: 3dce04bbab1540b5ae3d147e8503ab9d + dbid: 29766abee55e45d6a6bb232cdf74ebbe + # 瀹炰綋搴揹bid + # layerId: a61f2f8f-0bf9-422f-86fe-b7b0a30ebad9 + layerId: c8f3f75d-8730-44ec-81b7-f8ae4c5fd742 + # 鏌ヨ鍏抽敭瀛� + # queryFiled: enti_name + queryFiled: name_2 + # 鏌ヨ绫诲瀷瀛楁 + typeFiled: fclass_1 + # 瀹炰綋鍏抽敭瀛楁煡璇� + layerQuery: /entitydbdata/layer/query + # 鍏崇郴鍒楄〃鏌ヨ + relationList: /graph/relation/list + # 鍏崇郴鈥旀煡璇㈠叧鑱旇〃鏁版嵁 + relationDistinct: /graph/public/relation/ab_layerid/distinct + # 鍏崇郴鏌ヨ + relationRelateddata: /graph/public/relation/relateddata + + + + #Agent澶фā鍨� + agent: + # 璁块棶鍦板潃 + agentUrl: http://106.120.22.26:5367 + # 鎰忓浘鍑芥暟 + agentIntent: /intention + # rag鏈嶅姟 + agentRag: /rag + # charGpt + agentChat: /onlyChat + # 鍑芥暟鍚嶇О + funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate + + + + + + diff --git a/target/classes/application-config.yml b/target/classes/application-config.yml new file mode 100644 index 0000000..7755b2c --- /dev/null +++ b/target/classes/application-config.yml @@ -0,0 +1,3 @@ +config: +# HelloWorld + hello: HelloWorld \ No newline at end of file diff --git a/target/classes/application.yml b/target/classes/application.yml index 990f5f3..3166dd6 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -3,6 +3,8 @@ servlet: context-path: / spring: + profiles: + active: agent datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: org.postgresql.Driver @@ -12,30 +14,7 @@ jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss - # 鍦扮悊瀹炰綋搴� - geographical: - # Token鍦板潃 - token: 9ce350f238ba44fda10ddfe8b80f8967 - # 璇锋眰鍦板潃 - url: http://106.120.22.26:8013/geo-service/ - # 鑾峰彇瀹炰綋搴撳垪琛� - canview: /entitydb/list/canview - # 鏌ヨ鍥惧眰鏁版嵁锛堟垨鏁伴噺锛� - queryEntity: /entitydbdata/query/entity - # 鑾峰彇key鍞竴鏍囪瘑 - publickey: /setting/publickey - # 瀹炰綋搴撳悕绉� - entityName: 澶фā鍨嬫祴璇曞簱 - # 瀹炰綋搴揹bid - dbid: 3dce04bbab1540b5ae3d147e8503ab9d - # 瀹炰綋搴揹bid - layerId: a61f2f8f-0bf9-422f-86fe-b7b0a30ebad9 - agent: - agentUrl: http://106.120.22.26:5367 - agentIntent: /intention - agentRag: /rag - agentChat: /onlyChat application: name: ollama-ai ai: @@ -44,8 +23,6 @@ chat: # model: yi:9b-chat-v1.5-q4_0 model: qwen2:1.5b - - fastgpt: appid: 6673bfa1d14da0cede023f28 apikey: fastgpt-eNuz6Rsc5EMrYMiODBQbBXCbGwQYp9nSpYPE06vBBt3nitnFLdHSoQ0BAmNHDyB diff --git a/target/classes/com/yb/config/XzConfig.class b/target/classes/com/yb/config/XzConfig.class index fe97f4c..983472a 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 cc32366..4a3fd6c 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 b2be25a..2ded65f 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 new file mode 100644 index 0000000..a8d291d --- /dev/null +++ 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 d732e59..5765b6f 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 56497cd..b4112b6 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 new file mode 100644 index 0000000..7755b2c --- /dev/null +++ b/target/classes/mapper/application-config.yml @@ -0,0 +1,3 @@ +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 4bd0183..f2cb2ae 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 @@ -25,6 +25,7 @@ com\yb\util\EntityHttpUtil.class com\yb\entity\TMetaEntity.class com\yb\dao\TMetaDao.class +com\yb\service\IntentionService.class com\yb\service\XzService.class com\yb\config\Query.class com\yb\entity\ReqEntity.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 2398758..c23b1b2 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\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 E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\controller\WebSocketController.java diff --git a/target/ollama-ai-0.0.1-SNAPSHOT.jar b/target/ollama-ai-0.0.1-SNAPSHOT.jar index 439f80c..e5cdeaa 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 57cbd99..8dc560e 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