Commit 27acefb3 authored by 何金镒's avatar 何金镒

设备控制接口 优化

parent 778f36b4
......@@ -139,12 +139,13 @@ public class SycDeviceService {
String operateId = synDevice.getOperateId();
jsonObject.set("deviceId", synDevice.getDeviceId());
jsonObject.set("deviceName", synDevice.getDeviceName());
jsonObject.set("roomId", synDevice.getRoomId());
jsonObject.set("roomName", synDevice.getRoomName());
jsonObject.set("typeId", operateId);
jsonObject.set("model", synDevice.getModel());
if(capabilities != null && capabilities == 2){
jsonObject.set("roomId", synDevice.getRoomId());
jsonObject.set("typeId", operateId);
String deviceModel_json_str = device_model_cache.get(operateId);
if(StrUtil.isBlank(deviceModel_json_str)){
QueryWrapper<DeviceModel> deviceModel_wrapper = new QueryWrapper<>();
......
......@@ -5,16 +5,19 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
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 org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.redis.core.RedisTemplate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
......@@ -24,12 +27,26 @@ class KonkeAiAlibabaMcpApplicationTests {
@Autowired
private SpacesService spacesService;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
public static String sn = "40D95A41C134";
public static String date = "2025-09-18";
public static String roomId = "0b9fad390ef04bbe9ab8a72af7314bb2";
public static String subspaceId = null;
// @Test
// void redistest() {
// String redis_key = RedisKeys.KONKE_DIFY_CONVERSATION_ID+ sn;
//
// Set<String> keys = redisTemplate.keys(RedisKeys.KONKE_DIFY_CONVERSATION_ID + "*");
// for(String key : keys){
// System.out.println( key);
// redisTemplate.delete(key);
// }
// }
// @Test
// void testSpacesService() {
// JSONObject appointmentTimeByRoomId = spacesService.getAppointmentTimeByRoomId(sn, date, roomId, subspaceId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment