Merge remote-tracking branch 'origin/mqy20260511' into mqy20260511

iot-platform/pom.xml

@@ -195,4 +195,4 @@
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
-</project>
+</project>

iot-platform/src/main/java/com/iot/platform/task/VehicleSyncTask.java

@@ -23,305 +23,305 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class VehicleSyncTask {
 
-    private static final Logger log = LoggerFactory.getLogger(VehicleSyncTask.class);
-
-    private final SysCarService sysCarService;
-    private final SysDeviceService sysDeviceService;
-    private final StringRedisTemplate stringRedisTemplate;
-    private final SysrealtimeService sysrealtimeService;
-    private final SysDeviceVoService sysDeviceVoService;
-    private final SysDeviceControlService sysDeviceControlService;
-    private final RestTemplate restTemplate;
-    private final IotProperties iotProperties;
-
-    public VehicleSyncTask(SysCarService sysCarService,
-                           SysDeviceService sysDeviceService,
-                           StringRedisTemplate stringRedisTemplate,
-                           SysrealtimeService sysrealtimeService,
-                           SysDeviceVoService sysDeviceVoService,
-                           SysDeviceControlService sysDeviceControlService,
-                           RestTemplate restTemplate,
-                           IotProperties iotProperties) {
-        this.sysCarService = sysCarService;
-        this.sysDeviceService = sysDeviceService;
-        this.stringRedisTemplate = stringRedisTemplate;
-        this.sysrealtimeService = sysrealtimeService;
-        this.sysDeviceVoService = sysDeviceVoService;
-        this.sysDeviceControlService = sysDeviceControlService;
-        this.restTemplate = restTemplate;
-        this.iotProperties = iotProperties;
-    }
-
-    private boolean tryLock(String lockKey, long expireSeconds) {
-        Boolean acquired = stringRedisTemplate.opsForValue().setIfAbsent(lockKey, "1", expireSeconds, TimeUnit.SECONDS);
-        return Boolean.TRUE.equals(acquired);
-    }
-
-    private void unlock(String lockKey) {
-        Boolean deleted = stringRedisTemplate.delete(lockKey);
-        if (!Boolean.TRUE.equals(deleted)) {
-            log.warn("分布式锁释放失败: {}", lockKey);
-        }
-    }
-
-    /**
-     * 更新车辆的控制器信息
-     * 30秒更新一次
-     */
-    @Scheduled(fixedDelay = 30000)
-    public void updateSysCar() {
-        String lockKey = "lock:vehicle-sync:updateSysCar";
-        if (!tryLock(lockKey, 60)) {
-            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
-            return;
-        }
-        try {
-            doUpdateSysCar();
-        } finally {
-            unlock(lockKey);
-        }
-    }
-
-    private void doUpdateSysCar() {
-        List<SysCar> sysCarList = sysCarService.selectcontrollerId();
-        for (SysCar sysCar : sysCarList) {
-            try {
-                if (sysCar.getControllerId() == null || sysCar.getControllerId().isEmpty()) {
-                    continue;
-                }
-                SysDevice latitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "纬度");
-                SysDevice longitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "经度");
-
-                String redisKeyPattern = "workorder:coordinate:" + sysCar.getControllerId() + ":*";
-                Set<String> keys = scanKeys(redisKeyPattern);
-
-                if (keys == null || keys.isEmpty()) {
-                    updateCarPosition(sysCar, latitude, longitude);
-                } else {
-                    for (String key : keys) {
-                        Map<Object, Object> coordinateMap = stringRedisTemplate.opsForHash().entries(key);
-                        Object cachedLat = coordinateMap.get("latitude");
-                        Object cachedLon = coordinateMap.get("longitude");
-                        if (cachedLat != null && cachedLat.equals(latitude.getV()) && cachedLon != null && cachedLon.equals(longitude.getV())) {
-                            continue;
-                        }
-                        updateCarPosition(sysCar, latitude, longitude);
-                    }
-                }
-            } catch (DataAccessException e) {
-                log.error("更新车辆位置失败 carId={}: {}", sysCar.getCarId(), e.getMessage(), e);
-            } catch (Exception e) {
-                log.error("更新车辆位置异常 carId={}: {}", sysCar.getCarId(), e.getMessage(), e);
-            }
-        }
-    }
-
-    private void updateCarPosition(SysCar sysCar, SysDevice latitude, SysDevice longitude) {
-        String redisKey = "workorder:coordinate:" + sysCar.getControllerId();
-        stringRedisTemplate.opsForHash().put(redisKey, "latitude", latitude.getV());
-        stringRedisTemplate.opsForHash().put(redisKey, "longitude", longitude.getV());
-        stringRedisTemplate.persist(redisKey);
-
-        String position = latitude.getV() + "," + longitude.getV();
-        sysCarService.updatecarposition(position, sysCar.getCarId());
-        String url = iotProperties.getMqtt().getVehicleTriggerUrl() + "?carId=" + sysCar.getCarId();
-        try {
-            restTemplate.postForObject(url, null, String.class);
-        } catch (RestClientException e) {
-            log.warn("触发webhook失败 carId={}: {}", sysCar.getCarId(), e.getMessage());
-        }
-    }
-
-    private Set<String> scanKeys(String pattern) {
-        Set<String> keys = new HashSet<>();
-        ScanOptions options = ScanOptions.scanOptions().match(pattern).count(100).build();
-        try {
-            stringRedisTemplate.execute((RedisCallback<Void>) connection -> {
-                org.springframework.data.redis.core.Cursor<byte[]> cursor = connection.scan(options);
-                while (cursor.hasNext()) {
-                    keys.add(new String(cursor.next()));
-                }
-                cursor.close();
-                return null;
-            });
-        } catch (RedisConnectionFailureException e) {
-            log.warn("Redis SCAN 连接失败 pattern={}: {}", pattern, e.getMessage());
-        } catch (Exception e) {
-            log.error("Redis SCAN 失败 pattern={}: {}", pattern, e.getMessage(), e);
-        }
-        return keys;
-    }
-
-    @Scheduled(fixedDelay = 30000)
-    public void insertDevice() {
-        String lockKey = "lock:vehicle-sync:insertDevice";
-        if (!tryLock(lockKey, 60)) {
-            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
-            return;
-        }
-        try {
-            doInsertDevice();
-        } finally {
-            unlock(lockKey);
-        }
-    }
-
-    private void doInsertDevice() {
-        Set<String> activeKeys;
-        try {
-            activeKeys = stringRedisTemplate.opsForSet().members("DSB:active:devices");
-        } catch (Exception e) {
-            log.warn("redis中无数据");
-            return;
-        }
-        try {
-            if (activeKeys == null || activeKeys.isEmpty()) {
-                log.info("redis中无数据");
-                return;
-            }
-            List<SysDeviceControl> sysDeviceControlList = sysDeviceControlService.selectdevice("device");
-            for (String redisKey : activeKeys) {
-                Map<Object, Object> dataMap = stringRedisTemplate.opsForHash().entries(redisKey);
-                if (dataMap == null || dataMap.isEmpty()) {
-                    stringRedisTemplate.opsForSet().remove("DSB:active:devices", redisKey);
-                    continue;
-                }
-                String[] parts = redisKey.split(":", 3);
-                if (parts.length != 3 || !"DSB".equals(parts[0])) {
-                    log.warn("跳过非法 key: {}", redisKey);
-                    continue;
-                }
-                String controllerId = parts[1];
-                Integer count = sysDeviceVoService.selectcount(controllerId);
-                if (count != null && count > 0) {
-                    StringBuilder keyvalue = new StringBuilder();
-                    for (int i = 0; i < sysDeviceControlList.size(); i++) {
-                        for (Map.Entry<Object, Object> entry : dataMap.entrySet()) {
-                            String fieldKey = entry.getKey().toString();
-                            String fieldvalue = entry.getValue().toString();
-                            if (sysDeviceControlList.get(i).getControllerName().equals(fieldKey)) {
-                                keyvalue.append(fieldKey).append("=/'").append(fieldvalue).append("/'");
-                                if (i < sysDeviceControlList.size() - 1) {
-                                    keyvalue.append(",");
-                                }
-                            }
-                        }
-                    }
-                    boolean updated = sysDeviceVoService.updatesysdevice(keyvalue.toString(), controllerId);
-                    if (!updated) {
-                        log.warn("更新设备配置失败: controllerId={}", controllerId);
-                    }
-                } else {
-                    StringBuilder key = new StringBuilder();
-                    StringBuilder value = new StringBuilder();
-                    for (int i = 0; i < sysDeviceControlList.size(); i++) {
-                        for (Map.Entry<Object, Object> entry : dataMap.entrySet()) {
-                            String fieldKey = entry.getKey().toString();
-                            String fieldvalue = entry.getValue().toString();
-                            if (sysDeviceControlList.get(i).getControllerName().equals(fieldKey)) {
-                                key.append(fieldKey);
-                                value.append(fieldvalue);
-                                if (i < sysDeviceControlList.size() - 1) {
-                                    key.append(",");
-                                    value.append(",");
-                                }
-                            }
-                        }
-                    }
-                    boolean inserted = sysDeviceVoService.insertdevice(key.toString(), value.toString());
-                    if (!inserted) {
-                        log.warn("插入设备配置失败: controllerId={}", controllerId);
-                    }
-                }
-            }
-        } catch (RedisConnectionFailureException e) {
-            log.warn("Redis 连接失败，跳过本次同步: {}", e.getMessage());
-        } catch (DataAccessException e) {
-            log.error("数据库操作失败: {}", e.getMessage(), e);
-        } catch (Exception e) {
-            log.error("同步设备配置失败: {}", e.getMessage(), e);
-        }
-    }
-
-    /**
-     * 更新数据库实时数据
-     */
-    @Scheduled(fixedDelay = 30000)
-    public void syncRedisToMySQL() {
-        String lockKey = "lock:vehicle-sync:syncRedisToMySQL";
-        if (!tryLock(lockKey, 60)) {
-            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
-            return;
-        }
-        try {
-            doSyncRedisToMySQL();
-        } finally {
-            unlock(lockKey);
-        }
-    }
-
-    private void doSyncRedisToMySQL() {
-        Set<String> activeKeys = stringRedisTemplate.opsForSet().members("DSB:active:devices");
-        if (activeKeys == null || activeKeys.isEmpty()) return;
-
-        for (String redisKey : activeKeys) {
-            try {
-                Map<Object, Object> dataMap = stringRedisTemplate.opsForHash().entries(redisKey);
-                if (dataMap == null || dataMap.isEmpty()) {
-                    stringRedisTemplate.opsForSet().remove("DSB:active:devices", redisKey);
-                    continue;
-                }
-
-                String[] parts = redisKey.split(":", 3);
-                if (parts.length != 3 || !"DSB".equals(parts[0])) {
-                    log.warn("跳过非法 key: {}", redisKey);
-                    continue;
-                }
-                String controllerId = parts[1];
-
-                try {
-                    sysrealtimeService.createrealtime(controllerId);
-                } catch (Exception e) {
-                    log.error("创建表失败: {} | {}", controllerId, e.getMessage(), e);
-                    continue;
-                }
-
-                String createTime = getStringValue(dataMap, "createTime");
-                String timestamp = getStringValue(dataMap, "timestamp");
-                String deviceId = getStringValue(dataMap, "device_id");
-                if (createTime == null || timestamp == null || deviceId == null) {
-                    continue;
-                }
-
-                List<String> existingKeys = sysrealtimeService.selectAllKeys(controllerId);
-                Set<String> existingKeySet = existingKeys != null ? new HashSet<>(existingKeys) : Collections.emptySet();
-
-                for (Map.Entry<Object, Object> entry : dataMap.entrySet()) {
-                    String fieldKey = entry.getKey().toString();
-                    if ("createTime".equals(fieldKey) || "timestamp".equals(fieldKey) || "device_id".equals(fieldKey)) {
-                        continue;
-                    }
-                    String fieldValue = getStringValue(dataMap, fieldKey);
-                    if (fieldValue == null) continue;
-
-                    if (existingKeySet.contains(fieldKey)) {
-                        sysrealtimeService.updatetables(controllerId, createTime, fieldValue, timestamp, fieldKey, deviceId);
-                    } else {
-                        sysrealtimeService.inserttables(controllerId, createTime, deviceId, timestamp, fieldKey, fieldValue);
-                    }
-                }
-            } catch (RedisConnectionFailureException e) {
-                log.error("Redis 连接失败: {} | {}", redisKey, e.getMessage());
-            } catch (DataAccessException e) {
-                log.error("数据库操作失败: {} | {}", redisKey, e.getMessage(), e);
-            } catch (Exception e) {
-                log.error("同步设备失败: {} | {}", redisKey, e.getMessage(), e);
-            }
-        }
-    }
-
-    private String getStringValue(Map<Object, Object> map, String key) {
-        Object val = map.get(key);
-        return val == null ? null : val.toString().trim();
-    }
+//    private static final Logger log = LoggerFactory.getLogger(VehicleSyncTask.class);
+//
+//    private final SysCarService sysCarService;
+//    private final SysDeviceService sysDeviceService;
+//    private final StringRedisTemplate stringRedisTemplate;
+//    private final SysrealtimeService sysrealtimeService;
+//    private final SysDeviceVoService sysDeviceVoService;
+//    private final SysDeviceControlService sysDeviceControlService;
+//    private final RestTemplate restTemplate;
+//    private final IotProperties iotProperties;
+//
+//    public VehicleSyncTask(SysCarService sysCarService,
+//                           SysDeviceService sysDeviceService,
+//                           StringRedisTemplate stringRedisTemplate,
+//                           SysrealtimeService sysrealtimeService,
+//                           SysDeviceVoService sysDeviceVoService,
+//                           SysDeviceControlService sysDeviceControlService,
+//                           RestTemplate restTemplate,
+//                           IotProperties iotProperties) {
+//        this.sysCarService = sysCarService;
+//        this.sysDeviceService = sysDeviceService;
+//        this.stringRedisTemplate = stringRedisTemplate;
+//        this.sysrealtimeService = sysrealtimeService;
+//        this.sysDeviceVoService = sysDeviceVoService;
+//        this.sysDeviceControlService = sysDeviceControlService;
+//        this.restTemplate = restTemplate;
+//        this.iotProperties = iotProperties;
+//    }
+//
+//    private boolean tryLock(String lockKey, long expireSeconds) {
+//        Boolean acquired = stringRedisTemplate.opsForValue().setIfAbsent(lockKey, "1", expireSeconds, TimeUnit.SECONDS);
+//        return Boolean.TRUE.equals(acquired);
+//    }
+//
+//    private void unlock(String lockKey) {
+//        Boolean deleted = stringRedisTemplate.delete(lockKey);
+//        if (!Boolean.TRUE.equals(deleted)) {
+//            log.warn("分布式锁释放失败: {}", lockKey);
+//        }
+//    }
+//
+//    /**
+//     * 更新车辆的控制器信息
+//     * 30秒更新一次
+//     */
+//    @Scheduled(fixedDelay = 30000)
+//    public void updateSysCar() {
+//        String lockKey = "lock:vehicle-sync:updateSysCar";
+//        if (!tryLock(lockKey, 60)) {
+//            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
+//            return;
+//        }
+//        try {
+//            doUpdateSysCar();
+//        } finally {
+//            unlock(lockKey);
+//        }
+//    }
+//
+//    private void doUpdateSysCar() {
+//        List<SysCar> sysCarList = sysCarService.selectcontrollerId();
+//        for (SysCar sysCar : sysCarList) {
+//            try {
+//                if (sysCar.getControllerId() == null || sysCar.getControllerId().isEmpty()) {
+//                    continue;
+//                }
+//                SysDevice latitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "纬度");
+//                SysDevice longitude = sysDeviceService.selectsysdevice(sysCar.getControllerId(), "经度");
+//
+//                String redisKeyPattern = "workorder:coordinate:" + sysCar.getControllerId() + ":*";
+//                Set<String> keys = scanKeys(redisKeyPattern);
+//
+//                if (keys == null || keys.isEmpty()) {
+//                    updateCarPosition(sysCar, latitude, longitude);
+//                } else {
+//                    for (String key : keys) {
+//                        Map<Object, Object> coordinateMap = stringRedisTemplate.opsForHash().entries(key);
+//                        Object cachedLat = coordinateMap.get("latitude");
+//                        Object cachedLon = coordinateMap.get("longitude");
+//                        if (cachedLat != null && cachedLat.equals(latitude.getV()) && cachedLon != null && cachedLon.equals(longitude.getV())) {
+//                            continue;
+//                        }
+//                        updateCarPosition(sysCar, latitude, longitude);
+//                    }
+//                }
+//            } catch (DataAccessException e) {
+//                log.error("更新车辆位置失败 carId={}: {}", sysCar.getCarId(), e.getMessage(), e);
+//            } catch (Exception e) {
+//                log.error("更新车辆位置异常 carId={}: {}", sysCar.getCarId(), e.getMessage(), e);
+//            }
+//        }
+//    }
+//
+//    private void updateCarPosition(SysCar sysCar, SysDevice latitude, SysDevice longitude) {
+//        String redisKey = "workorder:coordinate:" + sysCar.getControllerId();
+//        stringRedisTemplate.opsForHash().put(redisKey, "latitude", latitude.getV());
+//        stringRedisTemplate.opsForHash().put(redisKey, "longitude", longitude.getV());
+//        stringRedisTemplate.persist(redisKey);
+//
+//        String position = latitude.getV() + "," + longitude.getV();
+//        sysCarService.updatecarposition(position, sysCar.getCarId());
+//        String url = iotProperties.getMqtt().getVehicleTriggerUrl() + "?carId=" + sysCar.getCarId();
+//        try {
+//            restTemplate.postForObject(url, null, String.class);
+//        } catch (RestClientException e) {
+//            log.warn("触发webhook失败 carId={}: {}", sysCar.getCarId(), e.getMessage());
+//        }
+//    }
+//
+//    private Set<String> scanKeys(String pattern) {
+//        Set<String> keys = new HashSet<>();
+//        ScanOptions options = ScanOptions.scanOptions().match(pattern).count(100).build();
+//        try {
+//            stringRedisTemplate.execute((RedisCallback<Void>) connection -> {
+//                org.springframework.data.redis.core.Cursor<byte[]> cursor = connection.scan(options);
+//                while (cursor.hasNext()) {
+//                    keys.add(new String(cursor.next()));
+//                }
+//                cursor.close();
+//                return null;
+//            });
+//        } catch (RedisConnectionFailureException e) {
+//            log.warn("Redis SCAN 连接失败 pattern={}: {}", pattern, e.getMessage());
+//        } catch (Exception e) {
+//            log.error("Redis SCAN 失败 pattern={}: {}", pattern, e.getMessage(), e);
+//        }
+//        return keys;
+//    }
+//
+////    @Scheduled(fixedDelay = 30000)
+////    public void insertDevice() {
+////        String lockKey = "lock:vehicle-sync:insertDevice";
+////        if (!tryLock(lockKey, 60)) {
+////            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
+////            return;
+////        }
+////        try {
+////            doInsertDevice();
+////        } finally {
+////            unlock(lockKey);
+////        }
+////    }
+////
+////    private void doInsertDevice() {
+////        Set<String> activeKeys;
+////        try {
+////            activeKeys = stringRedisTemplate.opsForSet().members("DSB:active:devices");
+////        } catch (Exception e) {
+////            log.warn("redis中无数据");
+////            return;
+////        }
+////        try {
+////            if (activeKeys == null || activeKeys.isEmpty()) {
+////                log.info("redis中无数据");
+////                return;
+////            }
+////            List<SysDeviceControl> sysDeviceControlList = sysDeviceControlService.selectdevice("device");
+////            for (String redisKey : activeKeys) {
+////                Map<Object, Object> dataMap = stringRedisTemplate.opsForHash().entries(redisKey);
+////                if (dataMap == null || dataMap.isEmpty()) {
+////                    stringRedisTemplate.opsForSet().remove("DSB:active:devices", redisKey);
+////                    continue;
+////                }
+////                String[] parts = redisKey.split(":", 3);
+////                if (parts.length != 3 || !"DSB".equals(parts[0])) {
+////                    log.warn("跳过非法 key: {}", redisKey);
+////                    continue;
+////                }
+////                String controllerId = parts[1];
+////                Integer count = sysDeviceVoService.selectcount(controllerId);
+////                if (count != null && count > 0) {
+////                    StringBuilder keyvalue = new StringBuilder();
+////                    for (int i = 0; i < sysDeviceControlList.size(); i++) {
+////                        for (Map.Entry<Object, Object> entry : dataMap.entrySet()) {
+////                            String fieldKey = entry.getKey().toString();
+////                            String fieldvalue = entry.getValue().toString();
+////                            if (sysDeviceControlList.get(i).getControllerName().equals(fieldKey)) {
+////                                keyvalue.append(fieldKey).append("=/'").append(fieldvalue).append("/'");
+////                                if (i < sysDeviceControlList.size() - 1) {
+////                                    keyvalue.append(",");
+////                                }
+////                            }
+////                        }
+////                    }
+////                    boolean updated = sysDeviceVoService.updatesysdevice(keyvalue.toString(), controllerId);
+////                    if (!updated) {
+////                        log.warn("更新设备配置失败: controllerId={}", controllerId);
+////                    }
+////                } else {
+////                    StringBuilder key = new StringBuilder();
+////                    StringBuilder value = new StringBuilder();
+////                    for (int i = 0; i < sysDeviceControlList.size(); i++) {
+////                        for (Map.Entry<Object, Object> entry : dataMap.entrySet()) {
+////                            String fieldKey = entry.getKey().toString();
+////                            String fieldvalue = entry.getValue().toString();
+////                            if (sysDeviceControlList.get(i).getControllerName().equals(fieldKey)) {
+////                                key.append(fieldKey);
+////                                value.append(fieldvalue);
+////                                if (i < sysDeviceControlList.size() - 1) {
+////                                    key.append(",");
+////                                    value.append(",");
+////                                }
+////                            }
+////                        }
+////                    }
+////                    boolean inserted = sysDeviceVoService.insertdevice(key.toString(), value.toString());
+////                    if (!inserted) {
+////                        log.warn("插入设备配置失败: controllerId={}", controllerId);
+////                    }
+////                }
+////            }
+////        } catch (RedisConnectionFailureException e) {
+////            log.warn("Redis 连接失败，跳过本次同步: {}", e.getMessage());
+////        } catch (DataAccessException e) {
+////            log.error("数据库操作失败: {}", e.getMessage(), e);
+////        } catch (Exception e) {
+////            log.error("同步设备配置失败: {}", e.getMessage(), e);
+////        }
+////    }
+//
+//    /**
+//     * 更新数据库实时数据
+//     */
+//    @Scheduled(fixedDelay = 30000)
+//    public void syncRedisToMySQL() {
+//        String lockKey = "lock:vehicle-sync:syncRedisToMySQL";
+//        if (!tryLock(lockKey, 60)) {
+//            log.debug("获取锁失败，跳过本次执行: {}", lockKey);
+//            return;
+//        }
+//        try {
+//            doSyncRedisToMySQL();
+//        } finally {
+//            unlock(lockKey);
+//        }
+//    }
+//
+//    private void doSyncRedisToMySQL() {
+//        Set<String> activeKeys = stringRedisTemplate.opsForSet().members("DSB:active:devices");
+//        if (activeKeys == null || activeKeys.isEmpty()) return;
+//
+//        for (String redisKey : activeKeys) {
+//            try {
+//                Map<Object, Object> dataMap = stringRedisTemplate.opsForHash().entries(redisKey);
+//                if (dataMap == null || dataMap.isEmpty()) {
+//                    stringRedisTemplate.opsForSet().remove("DSB:active:devices", redisKey);
+//                    continue;
+//                }
+//
+//                String[] parts = redisKey.split(":", 3);
+//                if (parts.length != 3 || !"DSB".equals(parts[0])) {
+//                    log.warn("跳过非法 key: {}", redisKey);
+//                    continue;
+//                }
+//                String controllerId = parts[1];
+//
+//                try {
+//                    sysrealtimeService.createrealtime(controllerId);
+//                } catch (Exception e) {
+//                    log.error("创建表失败: {} | {}", controllerId, e.getMessage(), e);
+//                    continue;
+//                }
+//
+//                String createTime = getStringValue(dataMap, "createTime");
+//                String timestamp = getStringValue(dataMap, "timestamp");
+//                String deviceId = getStringValue(dataMap, "device_id");
+//                if (createTime == null || timestamp == null || deviceId == null) {
+//                    continue;
+//                }
+//
+//                List<String> existingKeys = sysrealtimeService.selectAllKeys(controllerId);
+//                Set<String> existingKeySet = existingKeys != null ? new HashSet<>(existingKeys) : Collections.emptySet();
+//
+//                for (Map.Entry<Object, Object> entry : dataMap.entrySet()) {
+//                    String fieldKey = entry.getKey().toString();
+//                    if ("createTime".equals(fieldKey) || "timestamp".equals(fieldKey) || "device_id".equals(fieldKey)) {
+//                        continue;
+//                    }
+//                    String fieldValue = getStringValue(dataMap, fieldKey);
+//                    if (fieldValue == null) continue;
+//
+//                    if (existingKeySet.contains(fieldKey)) {
+//                        sysrealtimeService.updatetables(controllerId, createTime, fieldValue, timestamp, fieldKey, deviceId);
+//                    } else {
+//                        sysrealtimeService.inserttables(controllerId, createTime, deviceId, timestamp, fieldKey, fieldValue);
+//                    }
+//                }
+//            } catch (RedisConnectionFailureException e) {
+//                log.error("Redis 连接失败: {} | {}", redisKey, e.getMessage());
+//            } catch (DataAccessException e) {
+//                log.error("数据库操作失败: {} | {}", redisKey, e.getMessage(), e);
+//            } catch (Exception e) {
+//                log.error("同步设备失败: {} | {}", redisKey, e.getMessage(), e);
+//            }
+//        }
+//    }
+//
+//    private String getStringValue(Map<Object, Object> map, String key) {
+//        Object val = map.get(key);
+//        return val == null ? null : val.toString().trim();
+//    }
 }