From ccc0c29ff83aafea87a6d3f3bca3ef9e0aa8268a Mon Sep 17 00:00:00 2001 From: suerprisePlus <15810472099@163.com> Date: 星期三, 28 八月 2024 15:55:30 +0800 Subject: [PATCH] API名称:[元数据查询]接口添加 --- target/classes/com/yb/controller/XzController.class | 0 target/ollama-ai-0.0.1-SNAPSHOT.jar | 0 target/ollama-ai-0.0.1-SNAPSHOT.jar.original | 0 src/main/java/com/yb/controller/XzController.java | 101 ++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 76 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/yb/controller/XzController.java b/src/main/java/com/yb/controller/XzController.java index 61ec0f8..2730ab9 100644 --- a/src/main/java/com/yb/controller/XzController.java +++ b/src/main/java/com/yb/controller/XzController.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import org.stringtemplate.v4.ST; import java.util.ArrayList; @@ -49,10 +50,7 @@ String publickey; @Value("${spring.geographical.token}") String token; - private JSONObject jsonObject; - private JSONObject dataObjject; - private Coordinate coord; - private Object filObj; + @PostMapping("/poiMap") @Operation(summary = "鏄剧ず鍦扮偣") @@ -66,9 +64,8 @@ JSONObject obj = JSONObject.parseObject(item); reqEntity.setX(obj.getString("lon")); reqEntity.setY(obj.getString("lat")); -// System.out.print(obj); reqEntity.setPlace(obj.getString("enti_name")); - System.out.println("rec message:" +reqEntity); + System.out.println("rec message:" + reqEntity); hash.put("poi", reqEntity); String message = JSON.toJSONString(hash); webSocketController.sendAllMessage(message); @@ -76,36 +73,88 @@ } @PostMapping("/aroundPoi") - @Operation(summary = "鏄剧ず鍦扮偣") + @Operation(summary = "鍛ㄨ竟灞炴�ф煡璇�") public R aroundPoi(@Parameter String place, @Parameter String mid, @Parameter String type, @Parameter int radius) throws Exception { - System.out.println("rec message:" + place + " mid:" + mid + " type:" + type + " radius:" + radius); HashMap<String, Object> hash = new HashMap<>(); - hash.put("func", "aroundpoi"); + hash.put("func", "aroundPoi"); hash.put("mid", mid); String item = getQueryFiled(place); JSONObject obj = JSONObject.parseObject(item); Double lon = Double.parseDouble(obj.getString("lon")); Double lat = Double.parseDouble(obj.getString("lat")); - String wkt = getWKt(lon,lat,radius); - String itemList = getQueryAround(type,wkt); + String wkt = getWKt(lon, lat, radius); + String itemList = getQueryAround(type, wkt); // System.out.print("ces: "+itemList); - JSONArray dataArray =JSONArray.parseArray(itemList); - ArrayList<ReqEntity> arrayList= new ArrayList<>(); - for(int i =0;i< dataArray.size();i++ ){ - + JSONArray dataArray = JSONArray.parseArray(itemList); + ArrayList<ReqEntity> arrayList = new ArrayList<>(); + for (int i = 0; i < dataArray.size(); i++) { Object element = dataArray.get(i); if (element instanceof JSONObject) { JSONObject jsonObject = (JSONObject) element; - ReqEntity reqEntity= new ReqEntity(); + ReqEntity reqEntity = new ReqEntity(); reqEntity.setX(jsonObject.getString("lon")); reqEntity.setY(jsonObject.getString("lat")); reqEntity.setPlace(jsonObject.getString("enti_name")); arrayList.add(reqEntity); } } - System.out.println("rec message:" +arrayList); + System.out.println("rec message:" + arrayList); hash.put("poi", arrayList); + String message = JSON.toJSONString(hash); + webSocketController.sendAllMessage(message); + return R.ok(hash); + } + + @PostMapping("/queryMeta") + @Operation(summary = "鍏冧俊鎭煡璇�") + public R queryMeta(@Parameter String mid) { + System.out.println("queryMeta"); + HashMap<String, Object> hash = new HashMap<>(); + hash.put("func", "queryMeta"); + hash.put("mid", mid); +// 缁熻鏌ヨ鎺ュ彛鎷兼帴 + JSONArray jsonArray = new JSONArray(); + HashMap<String, Object> staticField = new HashMap<>(); + String filed = "sjnr"; + staticField.put("type", "count"); + staticField.put("field", "sjnr"); + staticField.put("outfield", "count_" + filed); + jsonArray.add(staticField); + HashMap<String, String> formData = new HashMap<>(); + formData.put("token", token); + formData.put("containCount", "true"); + formData.put("layerid", layerId); + formData.put("dbid", dbid); + formData.put("statistics", jsonArray.toString()); + formData.put("groupby", filed); + String filedString = entityHttpUtil.getPostMessage(queryEntity, formData); + System.out.println("rec message:" + filedString); + JSONObject jsonObject = JSON.parseObject(filedString); + JSONArray dataArray = jsonObject.getJSONArray("data"); + HashMap<String, Object> markMap = new HashMap<>(); + JSONArray markArray= new JSONArray(); + String markDown = "| 鏁版嵁绫诲瀷 | 鏁版嵁閲� |\\n|------|------|\\n"; + for (int i = 0; i < dataArray.size(); i++) { + JSONObject dataObj = dataArray.getJSONObject(i); + System.out.println("rec message:" + dataObj); + String[] filedValue = new String[2]; + + for (String key : dataObj.keySet()) { + if (key == filed) { + filedValue[0]= dataObj.getString(key); + } else { + filedValue[1]= dataObj.getString(key); + } + } + markDown+="| "+ filedValue[0]+" | "+filedValue[1]+" |\n"; + } + + markMap.put("markdown",markDown); + markArray.add(markMap); + hash.put("markdown",markArray); + hash.put("content","鍦扮悊瀹炰綋鏁版嵁搴�"); + System.out.println("rec message:" + hash); String message = JSON.toJSONString(hash); webSocketController.sendAllMessage(message); return R.ok(hash); @@ -134,17 +183,17 @@ // 杈撳嚭WKT // System.out.println("WKT: " + wkt); Envelope envelope = bufferedGeometry.getEnvelopeInternal(); - double [] wkt = new double[4]; - wkt[0]=envelope.getMinX(); - wkt[1]=envelope.getMinY(); - wkt[2]=envelope.getMaxX(); - wkt[3]=envelope.getMaxY(); + double[] wkt = new double[4]; + wkt[0] = envelope.getMinX(); + wkt[1] = envelope.getMinY(); + wkt[2] = envelope.getMaxX(); + wkt[3] = envelope.getMaxY(); String arrayAsString = Arrays.toString(wkt); System.out.println("arrayAsString: " + arrayAsString); return arrayAsString; } - public String getQueryAround(String type,String wkt) throws Exception { + public String getQueryAround(String type, String wkt) throws Exception { String query = "sjnr like '%" + type + "%'" + ""; String key = getPublickey(); String encrypt = RsaHelper.encrypt(key, query); @@ -163,6 +212,7 @@ JSONArray dataArray = dataObjject.getJSONArray("items"); return dataArray.toString(); } + //鍏抽敭瀛楁煡璇� public String getQueryFiled(String place) throws Exception { String query = "enti_name like '%" + place + "%'" + ""; @@ -213,6 +263,7 @@ return R.ok(hash); } + /*@GetMapping("/queryPath/{start_point}/{end_point}") @Operation(summary = "璺嚎鏌ヨ") public R queryPath(@PathVariable("start_point")String start_point,@PathVariable("end_point")String end_point){ @@ -230,9 +281,9 @@ return R.ok(hash); } */ - @PostMapping("/queryMeta") + @PostMapping("/queryMeta2") @Operation(summary = "鍏冧俊鎭煡璇�") - public R queryMeta(@Parameter String mid) { + public R queryMeta2(@Parameter String mid) { System.out.println("queryMeta "); HashMap<String, Object> hash = new HashMap<>(); hash.put("func", "queryMeta"); diff --git a/target/classes/com/yb/controller/XzController.class b/target/classes/com/yb/controller/XzController.class index c76c033..01100f9 100644 --- a/target/classes/com/yb/controller/XzController.class +++ b/target/classes/com/yb/controller/XzController.class Binary files differ diff --git a/target/ollama-ai-0.0.1-SNAPSHOT.jar b/target/ollama-ai-0.0.1-SNAPSHOT.jar index 34caff9..e536d29 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 a7343a7..5995e3f 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