suerprisePlus
2024-10-18 1efa47bc58fe0673a231233f644d3a5f8277e42c
接口优化修改
已添加9个文件
已修改23个文件
372 ■■■■ 文件已修改
src/main/java/com/yb/config/XzConfig.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/controller/THistoryController.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/controller/TokenController.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/controller/agentController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/dao/ThistoriestDao.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/service/AgentService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/service/IntentionService.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/service/THistoryService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/service/ThistoriesServices.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/service/XzService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/util/EntityHttpUtil.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-agent.yml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ThistoriesDaos.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/application-agent.yml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/config/XzConfig.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/controller/THistoryController.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/controller/TokenController.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/controller/agentController.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/dao/ThistoriestDao.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/service/AgentService.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/service/IntentionService.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/service/ThistoriesServices.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/service/XzService.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/util/EntityHttpUtil.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/mapper/ThistoriesDaos.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/mapper/ThistoryDaos.fxml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/ollama-ai-0.0.1-SNAPSHOT.jar 补丁 | 查看 | 原始文档 | blame | 历史
target/ollama-ai-0.0.1-SNAPSHOT.jar.original 补丁 | 查看 | 原始文档 | blame | 历史
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}")
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);
    }
}
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();
        }
    }
}
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);
    }
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);
}
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);
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;
    }
    //查看某个区域内各个实体/对象之间的关系
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);
}
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);
    }
}
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
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;
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: å¤§æ¨¡åž‹æµ‹è¯•库
    #   å®žä½“库dbid
    #    dbid: 3dce04bbab1540b5ae3d147e8503ab9d
    dbid: 29766abee55e45d6a6bb232cdf74ebbe
    #    dbid: 29766abee55e45d6a6bb232cdf74ebbe
    dbid: 51d8a71b5ce248f4af32bc3a52f1bcff
    #   å®žä½“库dbid
    #    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
src/main/resources/application.yml
@@ -58,7 +58,7 @@
    # è¿™ä¸ªé…ç½®ä¼šå°†æ‰§è¡Œçš„sql打印出来,在开发或测试的时候可以用
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    # è¿”回类型为Map,显示null对应的字段
    call-setters-on-nulls: true
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>
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: å¤§æ¨¡åž‹æµ‹è¯•库
    #   å®žä½“库dbid
    #    dbid: 3dce04bbab1540b5ae3d147e8503ab9d
    dbid: 29766abee55e45d6a6bb232cdf74ebbe
    #    dbid: 29766abee55e45d6a6bb232cdf74ebbe
    dbid: 51d8a71b5ce248f4af32bc3a52f1bcff
    #   å®žä½“库dbid
    #    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
target/classes/application.yml
@@ -58,7 +58,7 @@
    # è¿™ä¸ªé…ç½®ä¼šå°†æ‰§è¡Œçš„sql打印出来,在开发或测试的时候可以用
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    # è¿”回类型为Map,显示null对应的字段
    call-setters-on-nulls: true
target/classes/com/yb/config/XzConfig.class
Binary files differ
target/classes/com/yb/controller/THistoryController.class
Binary files differ
target/classes/com/yb/controller/TokenController.class
Binary files differ
target/classes/com/yb/controller/agentController.class
Binary files differ
target/classes/com/yb/dao/ThistoriestDao.class
Binary files differ
target/classes/com/yb/service/AgentService.class
Binary files differ
target/classes/com/yb/service/IntentionService.class
Binary files differ
target/classes/com/yb/service/ThistoriesServices.class
Binary files differ
target/classes/com/yb/service/XzService.class
Binary files differ
target/classes/com/yb/util/EntityHttpUtil.class
Binary files differ
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>
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>
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
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
target/ollama-ai-0.0.1-SNAPSHOT.jar
Binary files differ
target/ollama-ai-0.0.1-SNAPSHOT.jar.original
Binary files differ