suerprisePlus
2024-12-17 d4e4ea6405756d495806a609e24ae85ebd7345ef
代码更新
已修改14个文件
已删除1个文件
67 ■■■■ 文件已修改
src/main/java/com/yb/controller/THistoryController.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/controller/agentController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/service/AgentService.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yb/service/IntentionService.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-agent.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ThistoriesDaos.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/application-agent.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/controller/THistoryController.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/controller/agentController.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/service/AgentService.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/com/yb/service/IntentionService.class 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/mapper/ThistoriesDaos.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst 1 ●●●● 补丁 | 查看 | 原始文档 | 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/controller/THistoryController.java
@@ -138,16 +138,16 @@
    @ApiOperation(value = "getSessionById", notes = "")
    public R getSessionById(@RequestParam(name = "sessionid", defaultValue = " ") String sessionid) {
        List<THistoryEntity> list = thistoriesServices.getSessionId(sessionid);
        List<HashMap<Object, Object>> sList = new ArrayList<>();
        for (int i = 0; i < list.size(); i++) {
            THistoryEntity th = list.get(i);
            HashMap<Object, Object> hashMap = new HashMap<>();
            hashMap.put("id", th.getId());
            hashMap.put("human", th.getHuman());
            hashMap.put("ai", th.getAi());
            sList.add(hashMap);
        }
        PageUtils page = new PageUtils(sList,0,0,0);
//        List<HashMap<Object, Object>> sList = new ArrayList<>();
//        for (int i = 0; i < list.size(); i++) {
//            THistoryEntity th = list.get(i);
//            HashMap<Object, Object> hashMap = new HashMap<>();
//            hashMap.put("id", th.getId());
//            hashMap.put("human", th.getHuman());
//            hashMap.put("ai", th.getAi());
//            sList.add(hashMap);
//        }
        PageUtils page = new PageUtils(list,0,0,0);
        return R.ok() .put("page", page);
    }
src/main/java/com/yb/controller/agentController.java
@@ -131,7 +131,7 @@
        formData.put("token", xzConfig.token);
        formData.put("dbid", xzConfig.dbid);
        String obj = entityHttpUtil.getPostMessage(xzConfig.permissionLayer, formData);
//        System.out.println("layerList: " + obj);
        System.out.println("layerList: " + JSON.parseObject(JSONObject.parseObject(obj).getString("data")));
        HashMap<String, Object> hashMap = new HashMap<String, Object>();
        String layers = JSON.parseObject(JSONObject.parseObject(obj).getString("data")).getString("layers");
        JSONArray dataArray = JSONArray.parseArray(layers);
src/main/java/com/yb/service/AgentService.java
@@ -78,15 +78,18 @@
        for (int i = 0; i < relationArry.size(); i++) {
            JSONObject relationtem = relationArry.getJSONObject(i);
            String name = relationtem.getString("name");
            if (name.equals("包含关系")) {
//            if (name.equals("包含")) {
//                itemObj = relationtem;
//            }
            if (name.contains(String.valueOf("包含"))) {
                itemObj = relationtem;
            }
        }
        String distanceUrl = xzConfig.relationDistinct + "?dbid=" + xzConfig.dbid + "&token=" + xzConfig.token + "&relationid=" + itemObj.getString("code");
        String relationDistance = entityHttpUtil.getMessage(distanceUrl);
        JSONObject distanceObj = JSONObject.parseObject(relationList);
        String distanceData = relattionObj.getString("data");
        System.out.println("rec getQueryRelationship:" + distanceData);
//        String distanceUrl = xzConfig.relationDistinct + "?dbid=" + xzConfig.dbid + "&token=" + xzConfig.token + "&relationid=" + itemObj.getString("code");
//        String relationDistance = entityHttpUtil.getMessage(distanceUrl);
//        JSONObject distanceObj = JSONObject.parseObject(relationList);
//        String distanceData = relattionObj.getString("data");
//        System.out.println("rec getQueryRelationship:" + distanceData);
        String relateddataeUrl = xzConfig.relationRelateddata + "?start=1&count=1000000&&a_like=&b_like=&dbid=" + xzConfig.dbid + "&token=" + xzConfig.token + "&relationid=" + itemObj.getString("code");
        String relationRelateddata = entityHttpUtil.getMessage(relateddataeUrl);
@@ -103,7 +106,7 @@
        HashMap<String, String> reMap = new HashMap<String, String>();
        reMap.put("token", xzConfig.token);
        reMap.put("dbid", xzConfig.dbid);
        reMap.put("businessids", list.toString());
        reMap.put("ids", list.toString());
        reMap.put("layerid", xzConfig.layerId);
        reMap.put("querylatest", "true");
        String reMapList = entityHttpUtil.getPostMessage(xzConfig.layerQuery, reMap);
@@ -116,7 +119,12 @@
            ArrayList<RelaEntity> arrayList = new ArrayList<>();
            for (int i = 0; i < reArray.size(); i++) {
                String name = JSONObject.parseObject(reArray.getString(i)).getString(xzConfig.queryFiled);
                String name = JSONObject.parseObject(reArray.getString(i)).getString(xzConfig.typeFiled);
//             System.out.println("rec getQueryRelationship:" + name);
                if (name == null || name.isEmpty()) {
                    continue;
                } else {
                if (name.equals(place)) {
                    continue;
                }
@@ -137,6 +145,7 @@
                    arrayList.add(relaEntity);
                }
            }
            }
            String markDown = "| æ•°æ®ç±»åž‹ | æ•°æ®é‡ |\n|------|------|\n";
            for (int i = 0; i < arrayList.size(); i++) {
                String name = arrayList.get(i).getName();
@@ -147,7 +156,7 @@
            traiMap.put("msg", markDown);
        }
        System.out.println("rec getQueryRelationship:" + traiMap);
//        System.out.println("rec traiMap:" + traiMap);
        return traiMap;
    }
src/main/java/com/yb/service/IntentionService.java
@@ -92,10 +92,7 @@
        String key = "msg";
        String msg = (String) poiMap.get(key);
        hashMap.put("msg", msg);
        String center = (String) poiMap.get("center");
        if(center != null){
            hashMap.put("data", poiMap);
        }
        return hashMap;
    }
@@ -202,7 +199,7 @@
            List<Integer> cNum = new ArrayList<>();
            for (int i = 0; i < dataArray.size(); i++) {
                JSONObject dataObj = dataArray.getJSONObject(i);
                String fclass1 = dataObj.getString("fclass_1");
                String fclass1 = dataObj.getString(xzConfig.typeFiled);
                String ids = dataObj.getString("seid");
                if (cName.contains(fclass1)) {
                    for (int j = 0; j < cName.size(); j++) {
src/main/resources/application-agent.yml
@@ -52,8 +52,8 @@
  agent:
    #  è®¿é—®åœ°å€
    #    agentUrl: http://106.120.22.26:5367
    agentUrl: http://192.168.11.194:5367
    #    agentUrl: http://103.135.160.14:5367
#    agentUrl: http://192.168.11.194:5367
    agentUrl: http://103.135.160.14:5367
    #   
    agentIntent: /intention
    #  rag服务
src/main/resources/mapper/ThistoriesDaos.xml
@@ -4,7 +4,7 @@
    <!-- æ ¹æ®åç§°æ¨¡ç³ŠæŸ¥è¯¢-->
    <select id="getSessionId"  resultType="com.yb.entity.THistoryEntity"  >
        SELECT * FROM (
        SELECT id,human,ai FROM t_history
        SELECT * FROM t_history
        <where>
        <if test="sessionid != null">
target/classes/application-agent.yml
@@ -52,8 +52,8 @@
  agent:
    #  è®¿é—®åœ°å€
    #    agentUrl: http://106.120.22.26:5367
    agentUrl: http://192.168.11.194:5367
    #    agentUrl: http://103.135.160.14:5367
#    agentUrl: http://192.168.11.194:5367
    agentUrl: http://103.135.160.14:5367
    #   
    agentIntent: /intention
    #  rag服务
target/classes/com/yb/controller/THistoryController.class
Binary files differ
target/classes/com/yb/controller/agentController.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/mapper/ThistoriesDaos.xml
@@ -4,7 +4,7 @@
    <!-- æ ¹æ®åç§°æ¨¡ç³ŠæŸ¥è¯¢-->
    <select id="getSessionId"  resultType="com.yb.entity.THistoryEntity"  >
        SELECT * FROM (
        SELECT id,human,ai FROM t_history
        SELECT * FROM t_history
        <where>
        <if test="sessionid != null">
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
ÎļþÒÑɾ³ý
target/ollama-ai-0.0.1-SNAPSHOT.jar
Binary files differ
target/ollama-ai-0.0.1-SNAPSHOT.jar.original
Binary files differ