优化场景推荐 2

src/main/java/com/ikonke/konkeaialibabamcp/controller/DifyControllerV2.java

@@ -119,13 +119,19 @@ public class DifyControllerV2 {
 					cleanedInput = ""; // 或者设置默认值
 				}
 				if(StrUtil.isNotBlank(cleanedInput)){
+					if(cleanedInput.equalsIgnoreCase("拜拜") || cleanedInput.equalsIgnoreCase("再见")
+							|| cleanedInput.equalsIgnoreCase("退出") || cleanedInput.equalsIgnoreCase("退出对话")
+							|| cleanedInput.equalsIgnoreCase("结束对话") || cleanedInput.equalsIgnoreCase("结束")
+							|| cleanedInput.equalsIgnoreCase("闭嘴") || cleanedInput.equalsIgnoreCase("不要说好")){
+						res = String.format(res, "好的", true);
+					}else{
 						// 异步执行对话????
 						eventPublisher.publishEvent(new DifyChatSteamEvent(this,token.getSn(), cleanedInput));
-				}
-
-
-
 						res = String.format(res, "正在思考中", false);
+					}
+				}else{
+					res = String.format(res, "未检查到输入", false);
+				}
 				response = JSONUtil.parseObj(res);
 			}else if(list.size() > 1){
 				log.error("【{}】：获取CDCToken失败，CDCToken数量大于1",deviceName);

src/main/java/com/ikonke/konkeaialibabamcp/controller/open/DeviceController2.java

@@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/device")
 public class DeviceController2 {
 
-	@Autowired
-	private SycDeviceService sycDeviceService;
 	@Autowired
 	private KonkeIotUtils konkeIotServer;
 
@@ -28,16 +26,31 @@ public class DeviceController2 {
 		return ResultResp.setDate(konkeIotServer.optScene(CcuUtils.getCcuName(ccuName), sceneId));
 	}
 
-	@PostMapping("/saveTemporaryScene")
+	@GetMapping("/saveTemporaryScene")
 	public ResultResp saveTemporaryScene(@RequestParam(value = "ccuName") String ccuName,
-	                        @RequestParam(value = "temporarySceneId") String temporarySceneId) {
-		log.info("saveTemporaryScene..临时场景存储..ccuName:{},temporarySceneId:{}",ccuName,temporarySceneId);
+	                        @RequestParam(value = "sceneId") String sceneId) {
+		log.info("saveTemporaryScene..临时场景存储..ccuName:{},sceneId:{}",ccuName,sceneId);
 
-		if(konkeIotServer.saveTemporaryScene(ccuName, temporarySceneId)){
+		if(konkeIotServer.saveTemporaryScene(ccuName, sceneId)){
 			return ResultResp.setDate("保存成功");
 		}else{
 			return ResultResp.setBadDate("保存失败");
 		}
 	}
 
+	@DeleteMapping("/delScene")
+	public ResultResp delScene(@RequestParam("sceneId") String sceneId,
+	                        @RequestParam("sn") String sn,
+	                        @RequestParam(value = "ccuName") String ccuName) {
+		log.info("delScene..删除场景..ccuName:{},temporarySceneId:{},sn:{}",ccuName,sceneId,sn);
+
+		boolean b = konkeIotServer.delScene(sn,ccuName,sceneId);
+
+		if(b){
+			return ResultResp.setDate("删除成功");
+		}else{
+			return ResultResp.setBadDate("删除失败");
+		}
+	}
+
 }

src/main/java/com/ikonke/konkeaialibabamcp/event/listener/DifyChatSteamEventListener.java

@@ -57,7 +57,7 @@ public class DifyChatSteamEventListener {
 						.execute().body();
 
 				log.info("dify请求返回11--->:{}",ai_result);
-				ai_result = ai_result.replaceAll("\n", "").trim();
+				ai_result = ai_result.replaceAll("\n", "##").trim();
 				log.info("dify请求返回22--->:{}",ai_result);
 
 				JSONObject json = new JSONObject();

src/test/java/com/ikonke/konkeaialibabamcp/KonkeAiAlibabaMcpApplicationTests.java

@@ -10,6 +10,7 @@ import com.ikonke.konkeaialibabamcp.constant.RedisKeys;
 import com.ikonke.konkeaialibabamcp.service.cdc.spaces.SpacesService;
 import com.ikonke.konkeaialibabamcp.utils.CDCUtils;
 import com.ikonke.konkeaialibabamcp.utils.CcuUtils;
+import io.micrometer.core.instrument.util.StringEscapeUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -56,16 +57,19 @@ class KonkeAiAlibabaMcpApplicationTests {
 
 //	@Test
 //	void testJSOn(){
-//		String ai_result = "{\n" +
-//				"\"msg\":\"场景名称：睡眠模式" +
-//				"场景动作：" +
-//				"主灯：关闭" +
-//				"单路调光面板：关闭" +
-//				"智能灯带：关闭\"," +
-//				"\"sceneid\":\"1\"," +
-//				"\"type\":\"scene\"" +
-//				"}";
+//		String ai_result = "{\"msg\":\"场景名称：舒适睡眠\n" +
+//				"场景动作：\n" +
+//				"主灯：关闭\n" +
+//				"单路调光面板：关闭\n" +
+//				"智能灯带：关闭\n" +
+//				"地暖：打开,运行模式设置为自动，温度设置为22度\n" +
+//				"新风：打开,运行模式设置为自动，风速调至中风\n" +
+//				"空调：打开,模式设置为制冷，温度设置为20度，风速调至中风\",\"sceneid\":\"1\",\"type\":\"scene\"}";
 //
+////		ai_result = ai_result.replaceAll("\n", "");
+//
+////		ai_result = StringEscapeUtils.escapeJson(ai_result);
+////		System.out.println("---->"+ai_result);
 //
 //		JSONObject json = new JSONObject();
 //		if(!JSONUtil.isTypeJSON(ai_result)){