From 1efa47bc58fe0673a231233f644d3a5f8277e42c Mon Sep 17 00:00:00 2001 From: suerprisePlus <15810472099@163.com> Date: 星期五, 18 十月 2024 14:46:22 +0800 Subject: [PATCH] 接口优化修改 --- src/main/java/com/yb/service/IntentionService.java | 30 ++- target/classes/application-agent.yml | 33 +++- target/classes/com/yb/service/XzService.class | 0 src/main/java/com/yb/service/XzService.java | 3 src/main/java/com/yb/dao/ThistoriestDao.java | 21 +++ target/classes/com/yb/service/ThistoriesServices.class | 0 target/classes/mapper/ThistoryDaos.fxml | 11 + target/classes/com/yb/service/IntentionService.class | 0 src/main/java/com/yb/service/THistoryService.java | 4 target/classes/com/yb/controller/TokenController.class | 0 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 | 3 src/main/java/com/yb/util/EntityHttpUtil.java | 34 ++++ target/ollama-ai-0.0.1-SNAPSHOT.jar.original | 0 target/classes/com/yb/config/XzConfig.class | 0 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 3 target/classes/com/yb/service/AgentService.class | 0 target/ollama-ai-0.0.1-SNAPSHOT.jar | 0 src/main/java/com/yb/service/ThistoriesServices.java | 23 +++ src/main/java/com/yb/controller/agentController.java | 20 +- src/main/java/com/yb/service/AgentService.java | 4 src/main/resources/application-agent.yml | 33 +++- target/classes/com/yb/dao/ThistoriestDao.class | 0 target/classes/application.yml | 2 target/classes/com/yb/controller/THistoryController.class | 0 src/main/java/com/yb/controller/THistoryController.java | 30 +++ target/classes/mapper/ThistoriesDaos.xml | 17 ++ src/main/java/com/yb/controller/TokenController.java | 72 ++++++++++ src/main/resources/mapper/ThistoriesDaos.xml | 17 ++ src/main/java/com/yb/config/XzConfig.java | 10 + src/main/resources/application.yml | 2 32 files changed, 318 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/yb/config/XzConfig.java b/src/main/java/com/yb/config/XzConfig.java index 6334b2c..982c1e4 100644 --- a/src/main/java/com/yb/config/XzConfig.java +++ b/src/main/java/com/yb/config/XzConfig.java @@ -40,6 +40,16 @@ public String relationRelateddata; @Value("${itcats.geographical.permissionLayer}") public String permissionLayer; + @Value("${itcats.geographical.logUser}") + public String logUser; + @Value("${itcats.geographical.logPass}") + public String logPass; + @Value("${itcats.geographical.accountgraphicalUrl}") + public String accountgraphicalUrl; + @Value("${itcats.geographical.securityPublickey}") + public String securityPublickey; + @Value("${itcats.geographical.securityLogin}") + public String securityLogin; // Agent @Value("${itcats.agent.agentUrl}") diff --git a/src/main/java/com/yb/controller/THistoryController.java b/src/main/java/com/yb/controller/THistoryController.java index 6606470..e97440b 100644 --- a/src/main/java/com/yb/controller/THistoryController.java +++ b/src/main/java/com/yb/controller/THistoryController.java @@ -4,10 +4,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; -import com.alibaba.fastjson.JSON; import com.yb.dao.THistoryDao; +import com.yb.service.ThistoriesServices; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,6 +32,8 @@ private THistoryService tHistoryService; @Autowired private THistoryDao tHistoryDao; + @Autowired + private ThistoriesServices thistoriesServices; /** * 鍒楄〃 @@ -83,10 +86,10 @@ @PostMapping("/save") @ApiOperation(value = "save", notes = "") public R save(@RequestBody THistoryEntity tHistory) { - int id = tHistoryDao.insert(tHistory); + int id = tHistoryDao.insert(tHistory); // tHistory.getId().toString() - HashMap<String,Object> hashMap= new HashMap<>(); - hashMap.put("id",tHistory.getId().toString()); + HashMap<String, Object> hashMap = new HashMap<>(); + hashMap.put("id", tHistory.getId().toString()); return R.ok(hashMap); } @@ -130,4 +133,23 @@ } return R.ok(list); } + + @GetMapping("/getSessionById") + @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); + return R.ok() .put("page", page); + } + + } diff --git a/src/main/java/com/yb/controller/TokenController.java b/src/main/java/com/yb/controller/TokenController.java new file mode 100644 index 0000000..db85065 --- /dev/null +++ b/src/main/java/com/yb/controller/TokenController.java @@ -0,0 +1,72 @@ +package com.yb.controller; + +import com.alibaba.fastjson.JSON; +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.context.annotation.Configuration; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import sun.text.resources.FormatData; + +import java.io.IOException; +import java.util.HashMap; + +@Component +@Configuration +@EnableScheduling +public class TokenController { + @Autowired + private EntityHttpUtil entityHttpUtil; + @Autowired + private XzConfig xzConfig; + @Autowired + WebSocketController webSocketController; + + private String publickey = null; + + @Async + @Scheduled(fixedRate = 900000L) + public void webSocketGetInfo() throws Exception, IOException, InterruptedException { + + getGedbPublickey(); + } + + private void getGedbPublickey() throws Exception { + String url = xzConfig.accountgraphicalUrl + xzConfig.securityPublickey; + JSONObject data = JSONObject.parseObject(entityHttpUtil.getAgentMessage(url)); + System.out.println("webSocketGetInfo: data" + data); + String code = data.getString("code"); + if (code.contains("200")) { + publickey = data.getString("data"); + getGedbToken(); + } else { + System.out.println("webSocketGetInfo: 鎺ュ彛寮傚父" + data); + getGedbPublickey(); + } + } + + private void getGedbToken() throws Exception { + String url = xzConfig.accountgraphicalUrl + xzConfig.securityLogin; + HashMap<String, String> hashMap = new HashMap(); + hashMap.put("userid", xzConfig.logUser); + String encrypt = RsaHelper.encrypt(publickey, xzConfig.logPass); + hashMap.put("password", encrypt); + JSONObject data = JSON.parseObject(entityHttpUtil.getPostAccount(url, hashMap)); + String code = data.getString("code"); + if (code.contains("200")) { + JSONObject token_data = JSONObject.parseObject(data.getString("data")); + xzConfig.token = token_data.getString("token"); + } else { + System.out.println("webSocketGetInfo: 鎺ュ彛寮傚父" + data); + getGedbToken(); + } + + + } + +} diff --git a/src/main/java/com/yb/controller/agentController.java b/src/main/java/com/yb/controller/agentController.java index 3b81df3..0c152c4 100644 --- a/src/main/java/com/yb/controller/agentController.java +++ b/src/main/java/com/yb/controller/agentController.java @@ -50,10 +50,12 @@ 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"); // 鍒ゆ柇msg鏄惁涓虹┖ if (StringUtils.isEmpty(msg)) { - String info = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, "''"); + String info = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, "''",sessionid,libid); JSONObject obj = JSONObject.parseObject(info); String cont = obj.getString("content"); System.out.println("rec isEmpty:" + cont); @@ -65,7 +67,8 @@ HashMap<String, Object> hashMap = new HashMap<String, Object>(); if (isMap) { hashMap.put("type", "Map"); - String funcInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, msg); + hashMap.put("session_id", allParams.get("session_id")); + String funcInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, msg,sessionid,libid); JSONObject jsonObject = JSON.parseObject(funcInfo); String orderString = jsonObject.getString("order"); if (orderString == null) { @@ -76,13 +79,14 @@ return R.error(erroContent); } + String report =jsonObject.getString("report"); // 鎰忓浘鍑芥暟鍖归厤 - HashMap<String, Object> mapObj = intentionService.getFunctionMatch(orderString, allParams); + HashMap<String, Object> mapObj = intentionService.getFunctionMatch(orderString, allParams,report); // hashMap.put("place",place) String args = JSONObject.parseObject(orderString).getString("args"); - if(args!= null){ + if (args != null) { String place = JSONObject.parseObject(args).getString("place"); - mapObj.put("place",place); + mapObj.put("place", place); } hashMap.put("content", mapObj); return R.ok(hashMap); @@ -92,7 +96,7 @@ 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); + String ragInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentChat, msg,sessionid,libid); JSONObject jsonObject = JSON.parseObject(ragInfo); String answer = jsonObject.getString("content"); System.out.println("Answer: " + answer); @@ -127,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: " + 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); @@ -160,7 +164,7 @@ } - System.out.println("layerList: " + list); +// System.out.println("layerList: " + list); hashMap.put("data", list); return R.ok(hashMap); } diff --git a/src/main/java/com/yb/dao/ThistoriestDao.java b/src/main/java/com/yb/dao/ThistoriestDao.java new file mode 100644 index 0000000..3ab6ddc --- /dev/null +++ b/src/main/java/com/yb/dao/ThistoriestDao.java @@ -0,0 +1,21 @@ +package com.yb.dao; + + +import com.yb.entity.THistoryEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Mapper +@Repository +public interface ThistoriestDao { + +// @Select("\n" + +// "SELECT * FROM (\n" + +// " SELECT id,human,ai FROM t_history where sessionid='m8YvkamB55WFHPKvFHTbP' ORDER BY id DESC LIMIT 5\n" + +// ") AS subquery") + List<THistoryEntity> getSessionId(String sessionid); +} diff --git a/src/main/java/com/yb/service/AgentService.java b/src/main/java/com/yb/service/AgentService.java index 61c9868..152d873 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) throws Exception { - String http = url + api + "?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); diff --git a/src/main/java/com/yb/service/IntentionService.java b/src/main/java/com/yb/service/IntentionService.java index 4bf8092..b822eec 100644 --- a/src/main/java/com/yb/service/IntentionService.java +++ b/src/main/java/com/yb/service/IntentionService.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.houbb.opencc4j.core.impl.ZhConvertBootstrap; import com.yb.config.XzConfig; +import com.yb.controller.WebSocketController; import com.yb.helper.RsaHelper; import com.yb.util.EntityHttpUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +27,10 @@ @Autowired private EntityHttpUtil entityHttpUtil; - public HashMap<String, Object> getFunctionMatch(String orderString, Map<String, String> allParams) throws Exception { + @Autowired + private WebSocketController webSocketController ; + + public HashMap<String, Object> getFunctionMatch(String orderString, Map<String, String> allParams,String report) throws Exception { HashMap<String, Object> mapObj = new HashMap<String, Object>(); JSONObject orderObject = JSON.parseObject(orderString); String name = JSONObject.parseObject(orderObject.getString("args")).getString("place"); @@ -44,7 +48,10 @@ } else if (func.equals(xzConfig.funcName[4])) { mapObj = getCombatSimulate(orderObject, func); } else if (func.equals(xzConfig.funcName[5])) { - mapObj = getBatEnv(orderObject, func, allParams); +// mapObj = getBatEnv(orderObject, func, allParams); + getBatEnv(orderObject, func, allParams,report); + }else{ + } return mapObj; @@ -56,22 +63,23 @@ return hashMap; } - private HashMap<String, Object> getBatEnv(JSONObject orderObject, String func, Map<String, String> allParams) throws Exception { + private void getBatEnv(JSONObject orderObject, String func, Map<String, String> allParams,String report) throws Exception { HashMap<String, Object> hashMap = new HashMap<String, Object>(); hashMap.put("func", func); - + hashMap.put("session_id", (String)allParams.get("session_id")); System.out.println("rec history1:" + allParams); - String val = entityHttpUtil.postAgentMessage(xzConfig.battleReport, allParams); - JSONObject js = JSONObject.parseObject(val); - if (js == null) { +// String val = entityHttpUtil.postAgentMessage(xzConfig.battleReport, allParams); +// JSONObject js = JSONObject.parseObject(val); + if (report ==""|| report == null) { hashMap.put("msg", "鎶ュ憡鐢熸垚澶辫触"); - return hashMap; + webSocketController.sendAllMessage(JSON.toJSONString(hashMap)); + }else{ + hashMap.put("msg", report); + webSocketController.sendAllMessage(JSON.toJSONString(hashMap)); } - System.out.println("rec history1:" + val); - hashMap.put("msg", js.getString("content")); - return hashMap; + } //鏌ョ湅鏌愪釜鍖哄煙鍐呭悇涓疄浣�/瀵硅薄涔嬮棿鐨勫叧绯� diff --git a/src/main/java/com/yb/service/THistoryService.java b/src/main/java/com/yb/service/THistoryService.java index 4149692..4fde5f5 100644 --- a/src/main/java/com/yb/service/THistoryService.java +++ b/src/main/java/com/yb/service/THistoryService.java @@ -6,6 +6,8 @@ import com.yb.config.Query; import com.yb.entity.THistoryEntity; +import java.util.ArrayList; +import java.util.List; import java.util.Map; /** @@ -19,5 +21,7 @@ PageUtils queryPage(Map<String, Object> params); PageUtils query(Map<String, Object> params); + + } diff --git a/src/main/java/com/yb/service/ThistoriesServices.java b/src/main/java/com/yb/service/ThistoriesServices.java new file mode 100644 index 0000000..7703d04 --- /dev/null +++ b/src/main/java/com/yb/service/ThistoriesServices.java @@ -0,0 +1,23 @@ +package com.yb.service; + + +import com.yb.dao.ThistoriestDao; +import com.yb.entity.THistoryEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class ThistoriesServices implements ThistoriestDao { + @Autowired + ThistoriestDao thistoriestDao; + + @Override + public List<THistoryEntity> getSessionId(String sessionid) { + return thistoriestDao.getSessionId(sessionid); + + + } +} diff --git a/src/main/java/com/yb/service/XzService.java b/src/main/java/com/yb/service/XzService.java index 090f973..d9dc8f0 100644 --- a/src/main/java/com/yb/service/XzService.java +++ b/src/main/java/com/yb/service/XzService.java @@ -159,7 +159,8 @@ HashMap<String, String> formData = getHashMap(layerId, dbid, null, null, null, null); formData.put("statistics", jsonArray.toString()); formData.put("groupby", filed); - return entityHttpUtil.getPostMessage(entity, formData); + String meta = entityHttpUtil.getPostMessage(entity, formData); + return meta; } // 鑾峰彇杩斿洖淇℃伅Map diff --git a/src/main/java/com/yb/util/EntityHttpUtil.java b/src/main/java/com/yb/util/EntityHttpUtil.java index 1846e44..cc3a8d0 100644 --- a/src/main/java/com/yb/util/EntityHttpUtil.java +++ b/src/main/java/com/yb/util/EntityHttpUtil.java @@ -39,7 +39,7 @@ Response response = client.newCall(request).execute(); return response.body().string(); } catch (IOException e) { - System.out.println(e.getMessage()); + System.out.println("寮傚父锛�"+aurl+","+e.getMessage()); return null; } @@ -47,7 +47,7 @@ public String getAgentMessage(String aurl) { try { - + System.out.println("鎺ュ彛璇锋眰鍦板潃锛�"+aurl ); OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS) .readTimeout(0, TimeUnit.SECONDS) .writeTimeout(0, TimeUnit.SECONDS) @@ -58,7 +58,7 @@ Response response = client.newCall(request).execute(); return response.body().string(); } catch (IOException e) { - System.out.println(e.getMessage()); + System.out.println("寮傚父锛�"+aurl+","+e.getMessage()); return null; } @@ -86,12 +86,34 @@ Response response = client.newCall(request).execute(); return response.body().string(); } catch (IOException e) { - System.out.println(e.getMessage()); + System.out.println("寮傚父锛�"+aurl+","+e.getMessage()); return null; } // return null; } - + public String getPostAccount(String aurl, HashMap<String, String> parms) { + try { + 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(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .build(); + Request request = new Request.Builder() + .url(aurl) + .post(requestBody) + .build(); + Response response = client.newCall(request).execute(); + return response.body().string(); + } catch (IOException e) { + System.out.println("寮傚父锛�"+aurl+","+e.getMessage()); + return null; + } +// return null; + } public String postAgentMessage(String aurl, Map<String, String> parms) { try { String axiosUrl = xzConfig.agentUrl + aurl; @@ -118,7 +140,7 @@ Response response = client.newCall(request).execute(); return response.body().string(); } catch (IOException e) { - System.out.println(e.getMessage()); + System.out.println("寮傚父锛�"+aurl+","+e.getMessage()); return null; } // return null; diff --git a/src/main/resources/application-agent.yml b/src/main/resources/application-agent.yml index 8f7db0d..f709cf1 100644 --- a/src/main/resources/application-agent.yml +++ b/src/main/resources/application-agent.yml @@ -1,10 +1,16 @@ itcats: # 鍦扮悊瀹炰綋搴� geographical: +# logUser: admin +# logPass: Clive2012 + logUser: terra01 + logPass: admin # Token鍦板潃 - token: 9ce350f238ba44fda10ddfe8b80f8967 + token: null # 璇锋眰鍦板潃 - geographicalUrl: http://106.120.22.26:8013/geo-service/ + # geographicalUrl: http://106.120.22.26:8013/geo-service/ + geographicalUrl: http://103.135.160.14:5366/geo-service/ + accountgraphicalUrl: http://103.135.160.14:5366/account-service/ # 鑾峰彇瀹炰綋搴撳垪琛� canview: /entitydb/list/canview # 鏌ヨ鍥惧眰鏁版嵁锛堟垨鏁伴噺锛� @@ -14,16 +20,18 @@ # 瀹炰綋搴撳悕绉� entityName: 澶фā鍨嬫祴璇曞簱 # 瀹炰綋搴揹bid - # dbid: 3dce04bbab1540b5ae3d147e8503ab9d - dbid: 29766abee55e45d6a6bb232cdf74ebbe + # dbid: 29766abee55e45d6a6bb232cdf74ebbe + dbid: 51d8a71b5ce248f4af32bc3a52f1bcff # 瀹炰綋搴揹bid # layerId: a61f2f8f-0bf9-422f-86fe-b7b0a30ebad9 - layerId: c8f3f75d-8730-44ec-81b7-f8ae4c5fd742 + layerId: e27aae6b-f04c-4c95-8711-40198368b8d8 # 鏌ヨ鍏抽敭瀛� # queryFiled: enti_name - queryFiled: name,name_2,name_1 + # queryFiled: name,name_2,name_1 + queryFiled: entityname # 鏌ヨ绫诲瀷瀛楁 - typeFiled: fclass_1 + # typeFiled: fclass_1 + typeFiled: targettype # 瀹炰綋鍏抽敭瀛楁煡璇� layerQuery: /entitydbdata/layer/query # 鍏崇郴鍒楄〃鏌ヨ @@ -34,14 +42,19 @@ relationRelateddata: /graph/public/relation/relateddata # 鑾峰彇鍥惧眰鍒楄〃 permissionLayer: /entitydb/map/config + # 鑾峰彇鐧诲綍鍏挜 + securityPublickey: /security/publickey + # 绯荤粺鐧诲綍鎺ュ彛 + securityLogin: /security/login #Agent澶фā鍨� agent: # 璁块棶鍦板潃 - agentUrl: http://106.120.22.26:5367 -# agentUrl: http://103.135.160.14:5637 - # 鎰忓浘鍑芥暟 + # agentUrl: http://106.120.22.26:5367 + agentUrl: http://192.168.11.194:5367 + # agentUrl: http://103.135.160.14:5367 + # agentIntent: /intention # rag鏈嶅姟 agentRag: /rag diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d51a06f..e9cc71d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -58,7 +58,7 @@ # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈� call-setters-on-nulls: true diff --git a/src/main/resources/mapper/ThistoriesDaos.xml b/src/main/resources/mapper/ThistoriesDaos.xml new file mode 100644 index 0000000..9fccabb --- /dev/null +++ b/src/main/resources/mapper/ThistoriesDaos.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.yb.dao.ThistoriestDao"> + <!-- 鏍规嵁鍚嶇О妯$硦鏌ヨ--> + <select id="getSessionId" resultType="com.yb.entity.THistoryEntity" > + SELECT * FROM ( + SELECT id,human,ai FROM t_history + <where> + + <if test="sessionid != null"> + sessionid like #{sessionid} + </if> + </where> ORDER BY id DESC LIMIT 5 + ) AS subquery + ORDER BY id ASC; + </select> +</mapper> \ No newline at end of file diff --git a/target/classes/application-agent.yml b/target/classes/application-agent.yml index 8f7db0d..f709cf1 100644 --- a/target/classes/application-agent.yml +++ b/target/classes/application-agent.yml @@ -1,10 +1,16 @@ itcats: # 鍦扮悊瀹炰綋搴� geographical: +# logUser: admin +# logPass: Clive2012 + logUser: terra01 + logPass: admin # Token鍦板潃 - token: 9ce350f238ba44fda10ddfe8b80f8967 + token: null # 璇锋眰鍦板潃 - geographicalUrl: http://106.120.22.26:8013/geo-service/ + # geographicalUrl: http://106.120.22.26:8013/geo-service/ + geographicalUrl: http://103.135.160.14:5366/geo-service/ + accountgraphicalUrl: http://103.135.160.14:5366/account-service/ # 鑾峰彇瀹炰綋搴撳垪琛� canview: /entitydb/list/canview # 鏌ヨ鍥惧眰鏁版嵁锛堟垨鏁伴噺锛� @@ -14,16 +20,18 @@ # 瀹炰綋搴撳悕绉� entityName: 澶фā鍨嬫祴璇曞簱 # 瀹炰綋搴揹bid - # dbid: 3dce04bbab1540b5ae3d147e8503ab9d - dbid: 29766abee55e45d6a6bb232cdf74ebbe + # dbid: 29766abee55e45d6a6bb232cdf74ebbe + dbid: 51d8a71b5ce248f4af32bc3a52f1bcff # 瀹炰綋搴揹bid # layerId: a61f2f8f-0bf9-422f-86fe-b7b0a30ebad9 - layerId: c8f3f75d-8730-44ec-81b7-f8ae4c5fd742 + layerId: e27aae6b-f04c-4c95-8711-40198368b8d8 # 鏌ヨ鍏抽敭瀛� # queryFiled: enti_name - queryFiled: name,name_2,name_1 + # queryFiled: name,name_2,name_1 + queryFiled: entityname # 鏌ヨ绫诲瀷瀛楁 - typeFiled: fclass_1 + # typeFiled: fclass_1 + typeFiled: targettype # 瀹炰綋鍏抽敭瀛楁煡璇� layerQuery: /entitydbdata/layer/query # 鍏崇郴鍒楄〃鏌ヨ @@ -34,14 +42,19 @@ relationRelateddata: /graph/public/relation/relateddata # 鑾峰彇鍥惧眰鍒楄〃 permissionLayer: /entitydb/map/config + # 鑾峰彇鐧诲綍鍏挜 + securityPublickey: /security/publickey + # 绯荤粺鐧诲綍鎺ュ彛 + securityLogin: /security/login #Agent澶фā鍨� agent: # 璁块棶鍦板潃 - agentUrl: http://106.120.22.26:5367 -# agentUrl: http://103.135.160.14:5637 - # 鎰忓浘鍑芥暟 + # agentUrl: http://106.120.22.26:5367 + agentUrl: http://192.168.11.194:5367 + # agentUrl: http://103.135.160.14:5367 + # agentIntent: /intention # rag鏈嶅姟 agentRag: /rag diff --git a/target/classes/application.yml b/target/classes/application.yml index d51a06f..e9cc71d 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -58,7 +58,7 @@ # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈� call-setters-on-nulls: true diff --git a/target/classes/com/yb/config/XzConfig.class b/target/classes/com/yb/config/XzConfig.class index c6d60cc..5df127d 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/THistoryController.class b/target/classes/com/yb/controller/THistoryController.class index 071ef04..a66d027 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/TokenController.class b/target/classes/com/yb/controller/TokenController.class new file mode 100644 index 0000000..ac6c9bf --- /dev/null +++ b/target/classes/com/yb/controller/TokenController.class Binary files differ diff --git a/target/classes/com/yb/controller/agentController.class b/target/classes/com/yb/controller/agentController.class index 8b68a86..47708eb 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/dao/ThistoriestDao.class b/target/classes/com/yb/dao/ThistoriestDao.class new file mode 100644 index 0000000..be44c34 --- /dev/null +++ b/target/classes/com/yb/dao/ThistoriestDao.class Binary files differ diff --git a/target/classes/com/yb/service/AgentService.class b/target/classes/com/yb/service/AgentService.class index aef5970..d14ef52 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 b1ddd55..ec240d4 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/ThistoriesServices.class b/target/classes/com/yb/service/ThistoriesServices.class new file mode 100644 index 0000000..e8d6f15 --- /dev/null +++ b/target/classes/com/yb/service/ThistoriesServices.class Binary files differ diff --git a/target/classes/com/yb/service/XzService.class b/target/classes/com/yb/service/XzService.class index db1393b..d75769d 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 f811455..7e2291f 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/ThistoriesDaos.xml b/target/classes/mapper/ThistoriesDaos.xml new file mode 100644 index 0000000..9fccabb --- /dev/null +++ b/target/classes/mapper/ThistoriesDaos.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.yb.dao.ThistoriestDao"> + <!-- 鏍规嵁鍚嶇О妯$硦鏌ヨ--> + <select id="getSessionId" resultType="com.yb.entity.THistoryEntity" > + SELECT * FROM ( + SELECT id,human,ai FROM t_history + <where> + + <if test="sessionid != null"> + sessionid like #{sessionid} + </if> + </where> ORDER BY id DESC LIMIT 5 + ) AS subquery + ORDER BY id ASC; + </select> +</mapper> \ No newline at end of file diff --git a/target/classes/mapper/ThistoryDaos.fxml b/target/classes/mapper/ThistoryDaos.fxml new file mode 100644 index 0000000..419262a --- /dev/null +++ b/target/classes/mapper/ThistoryDaos.fxml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.yb.dao.ThistoryDaos"> + <!-- 鏍规嵁鍚嶇О妯$硦鏌ヨ--> + <select id="getSessionById" resultType="java.util.ArrayList" > + SELECT * FROM ( + SELECT id,human,ai FROM t_history where sessionid='m8YvkamB55WFHPKvFHTbP' ORDER BY id DESC LIMIT 5 + ) AS subquery + ORDER BY id ASC; + </select> +</mapper> \ 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 837c5ef..1558ad5 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 @@ -2,6 +2,7 @@ com\yb\config\XzConfig.class com\yb\controller\GisOsmPoisFree1Controller.class com\yb\entity\GisOsmPoisFree1Entity.class +com\yb\dao\ThistoriestDao.class com\yb\config\Constant$ScheduleStatus.class com\yb\config\R.class com\yb\message\WebSocketStompConfig.class @@ -15,6 +16,7 @@ com\yb\controller\XzController.class com\yb\service\TMetaService.class com\yb\controller\agentController.class +com\yb\controller\TokenController.class com\yb\controller\WebSocketController.class com\yb\config\SQLFilter.class com\yb\service\impl\TMetaServiceImpl.class @@ -43,3 +45,4 @@ com\yb\controller\THistoryController.class com\yb\postgis\GeometryDeserializer.class com\yb\config\PageUtils.class +com\yb\service\ThistoriesServices.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 66d8265..3fd958c 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 @@ -10,11 +10,14 @@ E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\message\WebsocketConfiguration.java E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\service\impl\TMetaServiceImpl.java E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\config\Query.java +E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\dao\ThistoriestDao.java E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\entity\GisOsmPoisFree1Entity.java E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\entity\ReqEntity.java E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\util\EntityHttpUtil.java 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\TokenController.java +E:\project\AI澶фā鍨媆鏂版櫤瀵规帴\ollama_ai\src\main\java\com\yb\service\ThistoriesServices.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 diff --git a/target/ollama-ai-0.0.1-SNAPSHOT.jar b/target/ollama-ai-0.0.1-SNAPSHOT.jar index 4ab4aa2..f3bf168 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 36b295b..a6bf51b 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