接口修改

suerprisePlus

2024-09-14 0cf13d9df73e8e9befa36236756ef02dd5f60e94

接口修改

 src/main/java/com/yb/config/XzConfig.java

@@ -38,6 +38,8 @@
    public String relationDistinct;

    @Value("${itcats.geographical.relationRelateddata}")

    public String relationRelateddata;

    @Value("${itcats.geographical.permissionLayer}")

    public String permissionLayer;



    //   Agent

    @Value("${itcats.agent.agentUrl}")

@@ -50,5 +52,7 @@
    public String agentChat;

    @Value("${itcats.agent.funcName}")

    public String[] funcName;

    @Value("${itcats.agent.battleReport}")

    public String battleReport;



}


 src/main/java/com/yb/controller/agentController.java

@@ -2,15 +2,17 @@




import com.alibaba.fastjson.JSON;



import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.fasterxml.jackson.databind.JsonNode;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.core.JsonParser;



import com.yb.config.R;

import com.yb.config.XzConfig;

import com.yb.service.AgentService;

import com.yb.service.IntentionService;

import com.yb.service.XzService;



import com.yb.util.EntityHttpUtil;

import io.swagger.annotations.Api;

import io.swagger.annotations.ApiOperation;

import io.swagger.v3.oas.annotations.Operation;

@@ -21,7 +23,9 @@
import org.springframework.stereotype.Component;

import org.springframework.web.bind.annotation.*;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



@Tag(name = "Agent意图")

@@ -37,6 +41,8 @@
    private AgentService agentService;

    @Autowired

    private IntentionService intentionService;

    @Autowired

    private EntityHttpUtil entityHttpUtil;



    @ApiOperation("意图识别")

    @PostMapping("/intention")

@@ -44,6 +50,7 @@
    public R getIntention(@RequestParam Map<String, String> allParams) throws Exception {

        System.out.println("rec getMessage:" + allParams);

        String msg = allParams.get("message");



//       åˆ¤æ–­msg是否为空

        if (StringUtils.isEmpty(msg)) {

            String info = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentIntent, "''");

@@ -70,11 +77,15 @@


            }

//          æ„å›¾å‡½æ•°åŒ¹é…

            HashMap<String, Object> mapObj = intentionService.getFunctionMatch(orderString);

            HashMap<String, Object> mapObj = intentionService.getFunctionMatch(orderString, allParams);

            hashMap.put("content", mapObj);

            return R.ok(hashMap);



        } else {



            String ragInfo1 = agentService.getAgentRag(xzConfig.agentUrl, xzConfig.agentRag, allParams.get("session_id"), allParams.get("lib_id"), msg);

            System.out.println("rec rag:" + ragInfo1);

            if (ragInfo1.equals("")) {

            String ragInfo = agentService.getAgentIntention(xzConfig.agentUrl, xzConfig.agentChat, msg);

            JSONObject jsonObject = JSON.parseObject(ragInfo);

            String answer = jsonObject.getString("content");

@@ -82,10 +93,72 @@
            hashMap.put("content", answer);

            hashMap.put("type", "Rag");

            return R.ok(hashMap);

            } else {

                JSONObject jsonObject1 = JSON.parseObject(ragInfo1);

                String answer1 = jsonObject1.getString("content");

                System.out.println("Answer: " + answer1);

                String jso = JSONObject.parseObject(answer1).getString("answer");

                String context = JSONObject.parseObject(answer1).getString("context");

//                JSONArray jsonArray = JSON.parseArray(context);

//                String metadata = "";

//                for (int i = 0; i < jsonArray.size(); i++) {

//                    JSONObject jsonObject = jsonArray.getJSONObject(i);

//

//                    metadata = jsonObject.getString("metadata");

//

//

//                }

                if (context != "") {

//                    String[] fileSource = metadata.split("/");

                    hashMap.put("fileSrource",  JSON.parseArray(context));

                }

                hashMap.put("content", jso);

                hashMap.put("type", "Rag");

                return R.ok(hashMap);

            }



        }





    }



    @ApiOperation("获取图层列表")

    @GetMapping("/layerList")

    @Operation(summary = "获取图层列表")

    public R getLayerList() throws Exception {

        HashMap<String, String> formData = new HashMap<>();

        formData.put("token", xzConfig.token);

        formData.put("dbid", xzConfig.dbid);

        String obj = entityHttpUtil.getPostMessage(xzConfig.permissionLayer, formData);

        System.out.println("Answer: " + obj);

        HashMap<String, Object> hashMap = new HashMap<String, Object>();

        String layers = JSON.parseObject(JSONObject.parseObject(obj).getString("data")).getString("layers");

        JSONArray dataArray = JSONArray.parseArray(layers);

        ArrayList<HashMap> list = new ArrayList<>();

        for (int i = 0; i < dataArray.size(); i++) {

            JSONObject itmObj = JSONObject.parseObject(dataArray.get(i).toString());

            String item = itmObj.getString("dataformat");

//            System.out.println("Answer: " + item);

            String id = itmObj.getString("id");

            if (item.equals("entity")) {

                HashMap<String, Object> itmHash = new HashMap<>();

                String name = itmObj.getString("name");

                String url = itmObj.getString("lod_url");

                if (url != null) {

                    String l1 = JSONObject.parseObject(JSONObject.parseObject(url).getString("3d")).getString("l0");

                    itmHash.put("url", l1);

                    itmHash.put("sourceType", "Tileset");

                    itmHash.put("name", name);

                    itmHash.put("id", id);

                    list.add(itmHash);

                }



            }



        }

        hashMap.put("data", list);

        return R.ok(hashMap);

    }





}


 src/main/java/com/yb/entity/RelaEntity.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.yb.entity;



import lombok.Data;



@Data

public class RelaEntity {

    private String name;



    public String getName() {

        return name;

    }



    public void setName(String name) {

        this.name = name;

    }



    public int getCount() {

        return count;

    }



    public void setCount(int count) {

        this.count = count;

    }



    private int count;

}


 src/main/java/com/yb/service/AgentService.java

@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.yb.config.XzConfig;

import com.yb.entity.ReqEntity;

import com.yb.entity.RelaEntity;

import com.yb.util.EntityHttpUtil;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

@@ -48,6 +48,9 @@
    public String getAgentAroundPoi(String place, String type, int dis, String filed, String typeFiled) throws Exception {

        String item = xzService.getQueryFiled(place, filed, xzConfig.layerId, xzConfig.dbid, xzConfig.queryEntity);

        JSONObject obj = JSONObject.parseObject(item);

        if (obj == null) {

            return "";

        }

        Double lon = Double.parseDouble(obj.getString("lon"));

        Double lat = Double.parseDouble(obj.getString("lat"));

        String wkt = xzService.getWKt(lon, lat, dis);

@@ -57,6 +60,14 @@


    public HashMap<String, Object> getQueryRelationship(String place, String filed) throws Exception {

        String poiObj = xzService.getQueryEntity(place, filed, xzConfig.layerId, xzConfig.dbid, xzConfig.layerQuery);



       if(poiObj == null){

           HashMap<String, Object> hashMap = new HashMap<>();

           hashMap.put("msg","未查询到"+place+"相关数据");

           return hashMap;

       }





        HashMap<String, String> hashMap = new HashMap<String, String>();

        hashMap.put("token", xzConfig.token);

        hashMap.put("dbid", xzConfig.dbid);

@@ -103,6 +114,41 @@
        HashMap<String, Object> traiMap = new HashMap<>();

        traiMap.put("center", JSONObject.parseObject(poiObj));

        traiMap.put("positions", reArray);

        if (reArray.size() > 0) {

            ArrayList<RelaEntity> arrayList = new ArrayList<>();

            for (int i = 0; i < reArray.size(); i++) {



                String name = JSONObject.parseObject(reArray.getString(i)).getString(xzConfig.queryFiled);

                if (name.equals(place)) {

                    continue;

                }

                boolean contains = false;

                for (int j = 0; j < arrayList.size(); j++) {

                    RelaEntity firstElement = arrayList.get(j);

                    if (firstElement.getName().equals(name)) {

                        int flag = firstElement.getCount();

                        flag++;

                        firstElement.setCount(flag);

                        contains = true;

                    }

                }

                if (contains == false) {

                    RelaEntity relaEntity = new RelaEntity();

                    relaEntity.setName(name);

                    relaEntity.setCount(1);

                    arrayList.add(relaEntity);

                }

            }

            String markDown = "| æ•°æ®ç±»åž‹ | æ•°æ®é‡ |\n|------|------|\n";

            for (int i = 0; i < arrayList.size(); i++) {

                String name = arrayList.get(i).getName();

                int count =  arrayList.get(i).getCount();

                markDown += "| " + name + " | " + count + " |\n";



            }

            traiMap.put("msg",markDown);

        }



        System.out.println("rec getQueryRelationship:" + traiMap);

        return traiMap;




 src/main/java/com/yb/service/IntentionService.java

@@ -4,10 +4,15 @@
import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.yb.config.XzConfig;

import com.yb.helper.RsaHelper;

import com.yb.util.EntityHttpUtil;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



@Service

public class IntentionService {

@@ -17,27 +22,56 @@
    private AgentService agentService;

    @Autowired

    private XzService xzService;

    @Autowired

    private EntityHttpUtil entityHttpUtil;



    public HashMap<String, Object> getFunctionMatch(String orderString) throws Exception {

    public HashMap<String, Object> getFunctionMatch(String orderString, Map<String, String> allParams) throws Exception {

        HashMap<String, Object> mapObj = new HashMap<String, Object>();

        JSONObject orderObject = JSON.parseObject(orderString);

        String name = JSONObject.parseObject(orderObject.getString("args")).getString("place");

        String func = orderObject.getString("name");

        String history = orderObject.getString("history");



        if (func.equals(xzConfig.funcName[0])) {

            mapObj = getPoiMap(orderObject, xzConfig.funcName[0]);

            mapObj = getPoiMap(orderObject,func);

        } else if (func.equals(xzConfig.funcName[1])) {

            mapObj = getAroundPoi(orderObject, xzConfig.funcName[1]);

            mapObj = getAroundPoi(orderObject, func);

        } else if (func.equals(xzConfig.funcName[2])) {

            mapObj = getQueryMeta(orderObject, xzConfig.funcName[2]);

        } else if (func.equals(xzConfig.funcName[2])) {

            mapObj = getQueryMeta(orderObject, xzConfig.funcName[2]);

            mapObj = getQueryMeta(orderObject, func);

        } else if (func.equals(xzConfig.funcName[3])) {

            mapObj = getQueryRelationship(orderObject, xzConfig.funcName[3]);

            mapObj = getQueryRelationship(orderObject, func);

        }else if (func.equals(xzConfig.funcName[4])) {

            mapObj = getCombatSimulate(orderObject, func);

        }else if (func.equals(xzConfig.funcName[5])) {

            mapObj = getBatEnv(orderObject, func, allParams);

        }





        return mapObj;



    }



    private HashMap<String, Object> getCombatSimulate(JSONObject orderObject, String func) {

        HashMap<String, Object> hashMap = new HashMap<String, Object>();

        hashMap.put("func", func);

        return  hashMap;

    }



    private HashMap<String, Object> getBatEnv(JSONObject orderObject, String func, Map<String, String> allParams) throws Exception {

        HashMap<String, Object> hashMap = new HashMap<String, Object>();

        hashMap.put("func", func);

//        List list = orderObject.get("history");

        System.out.println("rec history1:" + allParams);

        String history = allParams.get("history");

        System.out.println("rec history1:" + history);

        String val = entityHttpUtil.postAgentMessage(xzConfig.battleReport, allParams);

        JSONObject js = JSONObject.parseObject(val);

        if(js == null){

            hashMap.put("msg", "报告生成失败");

            return hashMap;

        }

        System.out.println("rec history1:" + val);

        hashMap.put("msg", js.getString("content"));



        return hashMap;

    }



    //查看某个区域内各个实体/对象之间的关系

@@ -47,6 +81,9 @@
        JSONObject argsObject = JSON.parseObject(orderObject.getString("args"));

        String place = argsObject.getString("place");

        HashMap<String,Object> poiMap = agentService.getQueryRelationship(place, xzConfig.queryFiled);

        String key = "msg";

        String msg = (String) poiMap.get(key);

        hashMap.put("msg", msg);

        hashMap.put("data", poiMap);

        return hashMap;

    }

@@ -59,29 +96,46 @@
        JSONObject metaObject = JSON.parseObject(filedString);

        JSONArray dataArray = metaObject.getJSONArray("data");

        String markDown = "| æ•°æ®ç±»åž‹ | æ•°æ®é‡ |\n|------|------|\n";

        ArrayList<HashMap<String, Object>> list = new ArrayList<>();

        for (int i = 0; i < dataArray.size(); i++) {

            JSONObject dataObj = dataArray.getJSONObject(i);

            System.out.println("rec queryMeta:" + dataObj);

            String[] filedValue = new String[2];



            for (String key : dataObj.keySet()) {

                System.out.println("rec 1:" + key+":"+xzConfig.typeFiled);

                 String itemObj = dataObj.getString(key);

                System.out.println("rec 2:" +itemObj);



                if (key.equals(xzConfig.typeFiled) ) {

                    filedValue[0] = dataObj.getString(key);

                }else{

                    filedValue[1] = dataObj.getString(key);

            HashMap<String, Object> listhash = new HashMap<>();

            String name = dataObj.getString(xzConfig.typeFiled);

            String count = dataObj.getString("count_" + xzConfig.typeFiled);

            ArrayList filedList = getQueryByFiledList(name);

            listhash.put("name", name);

            listhash.put("ids", filedList);

            list.add(listhash);

            markDown += "| " + name + " | " + count + " |\n";

                }



            }

            markDown += "| " + filedValue[0] + " | " + filedValue[1] + " |\n";



        }

        hashMap.put("ids", list);

        hashMap.put("data", markDown);

        return hashMap;



    }



    //    å…³é”®å­—查询分类查询数据量

    private ArrayList getQueryByFiledList(String name) throws Exception {

        String obj = xzConfig.typeFiled + " = '" + name + "'" + "";

        String encrypt = RsaHelper.encrypt(xzService.getPublickey(), obj);

        HashMap hashMap = xzService.getHashMap(xzConfig.layerId, xzConfig.dbid, "1", "0", encrypt, null);

        String val = entityHttpUtil.getPostMessage(xzConfig.queryEntity, hashMap);

        ArrayList list = new ArrayList();

        String fObj = JSONObject.parseObject(val).getString("data");

        System.out.println("rec queryMeta:" + fObj);

        if (fObj != null) {

            JSONArray fArray = JSONArray.parseArray(JSONObject.parseObject(fObj).getString("items"));

            System.out.println("rec queryMeta:" + fArray);

            System.out.println("rec queryMeta:" + fArray.size());

            if (fArray.size() > 0) {

                for (int i = 0; i < fArray.size(); i++) {

                    String sid = JSONObject.parseObject(fArray.get(i).toString()).getString("seid");

                    list.add(sid);

                }

            }

        }

        return list;

    }



    //根据范围查询数据

@@ -98,9 +152,16 @@
            radius = Integer.parseInt(dis);

        }

        String aroundPoi = agentService.getAgentAroundPoi(place, type, radius, xzConfig.queryFiled, xzConfig.typeFiled);

        if (aroundPoi == "" || aroundPoi.isEmpty()) {

            String msg = "未查询到" + place + "相关数据。请提供更加详细数据。";

            hashMap.put("msg", msg);

            return hashMap;

        }

        JSONArray dataArray = JSONArray.parseArray(aroundPoi);

        System.out.println("aroundPoi: " + dataArray);

        hashMap.put("data", dataArray);

        String msg = "已查询到" + place + "内的" + type + "相关数据。共查询到" + dataArray.size() + "条数据。";

        hashMap.put("msg", msg);

        return hashMap;



    }

@@ -111,11 +172,17 @@
        JSONObject argsObject = JSON.parseObject(orderString.getString("args"));

        String place = argsObject.getString("place");

        String poiMap = agentService.getAgentPoiMap(place, xzConfig.queryFiled);

        System.out.println("poiMap: " + poiMap);

        JSONObject poiObj = JSONObject.parseObject(poiMap);

        if (poiMap == "" || poiMap.isEmpty()) {

            String msg = "未查询到" + place + "相关数据。请提供更加详细数据。";

            hashMap.put("msg", msg);

            return hashMap;

        }

        System.out.println("poiMap: " + poiObj);

        hashMap.put("func", func);

        hashMap.put("data", poiObj);

        String msg = "已查询到" + place + "相关数据。" + place + "数据已在地图上显示";

        hashMap.put("msg", msg);

        return hashMap;

    }




 src/main/java/com/yb/service/XzService.java

@@ -11,9 +11,7 @@
import org.springframework.stereotype.Service;

import org.locationtech.jts.geom.*;

import org.locationtech.jts.operation.buffer.BufferOp;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.web.bind.annotation.*;





import java.util.*;

import java.util.HashMap;

@@ -56,6 +54,9 @@
        JSONObject jsonObject = JSON.parseObject(jsonString1);

        JSONObject dataObjject = jsonObject.getJSONObject("data");

        JSONArray dataArray = dataObjject.getJSONArray("items");

        if(dataArray.size()<=0){

            return null;

        }

        return dataArray.getJSONObject(0).toString();






 src/main/java/com/yb/util/EntityHttpUtil.java

@@ -1,7 +1,9 @@
package com.yb.util;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONObject;

import com.yb.config.XzConfig;

import io.swagger.v3.core.util.Json;

import okhttp3.*;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

@@ -10,9 +12,11 @@


import org.springframework.web.bind.annotation.RestController;



import java.io.File;

import java.io.IOException;



import java.util.HashMap;

import java.util.Map;

import java.util.concurrent.TimeUnit;



@Component

@@ -57,6 +61,9 @@
        }

        return  null;

    }







    public String getPostMessage(String aurl, HashMap<String,String> parms){

        try{

            String axiosUrl = xzConfig.geographicalUrl+aurl;

@@ -65,9 +72,9 @@
                builder.add(key,parms.get(key));

            }

            RequestBody requestBody =  builder.build();

            OkHttpClient client = new OkHttpClient.Builder().connectTimeout(5, TimeUnit.SECONDS)

                    .readTimeout(5, TimeUnit.SECONDS)

                    .writeTimeout(5, TimeUnit.SECONDS)

            OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)

                    .readTimeout(0, TimeUnit.SECONDS)

                    .writeTimeout(0, TimeUnit.SECONDS)

                    .build();

            Request request = new Request.Builder()

                    .addHeader("Token",xzConfig.token)

@@ -82,4 +89,38 @@
        return  null;

    }



    public String postAgentMessage(String aurl, Map<String, String> parms) {

        try {

            String axiosUrl = xzConfig.agentUrl + aurl;

            MediaType JSON = MediaType.parse("application/json; charset=utf-8");

//            JSONObject jsonObject= JSONObject.parseObject(parms.toString());

            HashMap<String,Object> itemMap = new HashMap<>();

            for (String key : parms.keySet()) {

                if(key=="history_msg"){

                    itemMap.put(key,JSONObject.parseObject( parms.get(key)));

                }else{

                    itemMap.put(key, parms.get(key));

                }

                System.out.println("rec application/json:" + key);

            }

            RequestBody requestBody = RequestBody.create(JSON,JSONObject.toJSON(itemMap).toString());

            OkHttpClient client = new OkHttpClient.Builder().connectTimeout(0, TimeUnit.SECONDS)

                    .readTimeout(0, TimeUnit.SECONDS)

                    .writeTimeout(0, TimeUnit.SECONDS)

                    .build();

            Request request = new Request.Builder()

                    .url(axiosUrl)

                    .post(requestBody)

                    .build();

            Response response = client.newCall(request).execute();

            return response.body().string();

        } catch (IOException e) {

            System.out.println(e.getMessage());

        }

        return null;









    }

}


 src/main/resources/application-agent.yml

@@ -32,7 +32,8 @@
    relationDistinct: /graph/public/relation/ab_layerid/distinct

    #   å…³ç³»æŸ¥è¯¢

    relationRelateddata: /graph/public/relation/relateddata



    #   èŽ·å–图层列表

    permissionLayer: /entitydb/map/config





  #Agent大模型

@@ -45,8 +46,10 @@
    agentRag: /rag

    #  charGpt

    agentChat: /onlyChat

    #  charGpt

    battleReport: /battleReport

    #    å‡½æ•°åç§°

    funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate

    funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate,batEnv








 target/classes/application-agent.yml

@@ -32,7 +32,8 @@
    relationDistinct: /graph/public/relation/ab_layerid/distinct

    #   å…³ç³»æŸ¥è¯¢

    relationRelateddata: /graph/public/relation/relateddata



    #   èŽ·å–图层列表

    permissionLayer: /entitydb/map/config





  #Agent大模型

@@ -45,8 +46,10 @@
    agentRag: /rag

    #  charGpt

    agentChat: /onlyChat

    #  charGpt

    battleReport: /battleReport

    #    å‡½æ•°åç§°

    funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate

    funcName: poiMap,aroundPoi,queryMeta,queryRelationship,combatSimulate,batEnv








 target/classes/application-config.yml

ÎļþÒÑɾ³ý

 target/classes/com/yb/config/XzConfig.class

Binary files differ

 target/classes/com/yb/controller/agentController.class

Binary files differ

 target/classes/com/yb/entity/RelaEntity.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/XzService.class

Binary files differ

 target/classes/com/yb/util/EntityHttpUtil.class

Binary files differ

 target/classes/mapper/application-config.yml

ÎļþÒÑɾ³ý

 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -24,6 +24,7 @@
com\yb\postgis\PointTypeHandler.class
com\yb\util\EntityHttpUtil.class
com\yb\entity\TMetaEntity.class
com\yb\entity\RelaEntity.class
com\yb\dao\TMetaDao.class
com\yb\service\IntentionService.class
com\yb\service\XzService.class

 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -16,6 +16,7 @@
E:\project\AI大模型\新智对接\ollama_ai\src\main\java\com\yb\service\GisOsmPoisFree1Service.java
E:\project\AI大模型\新智对接\ollama_ai\src\main\java\com\yb\OllamaAiApplication.java
E:\project\AI大模型\新智对接\ollama_ai\src\main\java\com\yb\controller\GisOsmPoisFree1Controller.java
E:\project\AI大模型\新智对接\ollama_ai\src\main\java\com\yb\entity\RelaEntity.java
E:\project\AI大模型\新智对接\ollama_ai\src\main\java\com\yb\service\IntentionService.java
E:\project\AI大模型\新智对接\ollama_ai\src\main\java\com\yb\service\impl\GisOsmPoisFree1ServiceImpl.java
E:\project\AI大模型\新智对接\ollama_ai\src\main\java\com\yb\config\Constant.java

 target/ollama-ai-0.0.1-SNAPSHOT.jar

Binary files differ

 target/ollama-ai-0.0.1-SNAPSHOT.jar.original

Binary files differ