From 12aae5acd8449d896278e4274c245b4a9a69aafb Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期二, 25 六月 2024 16:16:40 +0800
Subject: [PATCH] 空异常处理mix接口
---
src/main/java/com/yb/controller/AiController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/yb/controller/AiController.java b/src/main/java/com/yb/controller/AiController.java
index ae5c676..2ded6a3 100644
--- a/src/main/java/com/yb/controller/AiController.java
+++ b/src/main/java/com/yb/controller/AiController.java
@@ -3,9 +3,12 @@
import com.alibaba.fastjson.JSON;
import com.yb.util.OkHttpUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import net.sf.json.JSONObject;
+import okhttp3.Response;
import org.springframework.ai.ollama.OllamaChatModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +23,7 @@
import java.util.Set;
+@Tag(name="terra openai")
@RestController
@RequestMapping("/api/v1")
public class AiController {
@@ -32,16 +36,21 @@
@Value("${spring.intent}")
String intent ;
+
+
@GetMapping("/chat")
+ @Operation(summary = "澶фā鍨嬪璇�")
public String chat(@RequestParam(value = "message",defaultValue = "Hi") String message){
- return chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+message);
+ return chatModel.call(message);
}
@GetMapping("/intent")
+ @Operation(summary = "鎰忓浘璇锋眰")
public String intent(@RequestParam(value = "message",defaultValue = "Hi") String message){
String json = okHttpUtil.getMessage(intent+"="+message);
-
- return json ;
+ Map<String,String> hashMap = new HashMap<>() ;
+ iteraJson(json,hashMap);
+ return JSON.toJSON(hashMap).toString() ;
}
public boolean iteraJson(String str, Map res){
if(str.toString().indexOf(":") == -1){
@@ -61,23 +70,51 @@
}
@GetMapping("/mix")
+ @Operation(summary = "鎰忓浘涓庡ぇ妯″瀷璇锋眰")
public String mix(@RequestParam(value = "message",defaultValue = "Hi") String message){
String json = okHttpUtil.getMessage(intent+"="+message);
+ System.out.println(message);
// JSONObject jsonObject = JSONObject.parseObject(json);
Map<String,String> hashMap = new HashMap<>() ;
- iteraJson(json,hashMap);
+ String place = null ;
+ if( json != null) {
+ iteraJson(json, hashMap);
- String place = hashMap.get("place");
+ place = hashMap.get("place");
+ }
if( place != null ){
- String llm = chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+place);
+ String llm = chatModel.call(place);
hashMap.put("content",llm);
json = JSON.toJSON(hashMap).toString() ;
}else{
- json = hashMap.put("content", chatModel.call("璇风敤涓枃鍥炵瓟濡備笅闂,濡傛灉鏈夊湴鍚嶅嚭鐜帮紝鍥炲埌鍐呭鍖呮嫭缁忕含搴﹀苟浣跨敤json杩斿洖,"+message));
+ json = hashMap.put("content", chatModel.call(message));
}
- return json ;
+ hashMap.put("code","200");
+ System.out.println(JSON.toJSON(hashMap).toString());
+ System.out.println("====================================");
+ return JSON.toJSON(hashMap).toString() ;
}
+
+ @GetMapping("/fastgpt")
+ @Operation(summary = "鐭ヨ瘑搴撴煡璇�")
+ public String fastgpt(@RequestParam(value = "message",defaultValue = "涓夌淮瀹炴櫙") String message){
+
+ //okHttpUtil.requesFast(message);
+ String json = okHttpUtil.requesFast(message);
+
+ return json ;
+ }
+
+ @GetMapping("/fastgpt_list")
+ @Operation(summary = "鐭ヨ瘑搴撳垪琛�")
+ public String fastgpt_list(){
+
+
+ String json = okHttpUtil.requesFast_kl();
+
+ return json ;
+ }
}
--
Gitblit v1.9.3