diff --git a/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java b/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java index d4492611..cde01e8d 100644 --- a/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java +++ b/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java @@ -86,6 +86,10 @@ public class DeviceInfo implements Owned { private Long createAt; + public boolean isOnline() { + return state != null && state.isOnline(); + } + @Data @NoArgsConstructor @AllArgsConstructor @@ -100,6 +104,7 @@ public class DeviceInfo implements Owned { @Data @NoArgsConstructor @AllArgsConstructor + @Builder public static class State { private boolean online; diff --git a/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/Product.java b/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/Product.java index 17317f3e..24938e0a 100644 --- a/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/Product.java +++ b/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/product/Product.java @@ -60,6 +60,11 @@ public class Product extends TenantModel implements Id, Serializable { */ private String locateUpdateType; + /** + * 保活时长（秒） + */ + private Long keepAliveTime; + private Long createAt; public boolean isTransparent() { diff --git a/iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java b/iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java index 0f68f07d..7e4433bc 100644 --- a/iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java +++ b/iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java @@ -35,6 +35,14 @@ public interface IDeviceInfoData extends IOwnedData { */ Map getProperties(String deviceId); + /** + * 获取设备属性更新时间 + * + * @param deviceId 设备id + * @return timestamp + */ + long getPropertyUpdateTime(String deviceId); + /** * 根据设备ID取设备信息 * @@ -68,7 +76,7 @@ public interface IDeviceInfoData extends IOwnedData { * @param subUid 子账号id * @param productKey 产品key * @param groupId 设备分组 - * @param online 是否在线:true在线,false离线 + * @param online 是否在线:true在线,false离线 * @param keyword 关键字 * @param page 页码 * @param size 分页大小 diff --git a/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java b/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java index 303300a9..d04cc106 100644 --- a/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java +++ b/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java @@ -20,6 +20,9 @@ import cc.iotkit.model.device.DeviceInfo; import cc.iotkit.model.device.message.DevicePropertyCache; import cc.iotkit.model.stats.DataItem; import com.fasterxml.jackson.core.type.TypeReference; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.annotation.Autowired; @@ -94,7 +97,9 @@ public class DeviceInfoDataCache implements IDeviceInfoData, SmartInitializingSi public void saveProperties(String deviceId, Map properties) { Map old = getProperties(deviceId); old.putAll(properties); - redisTemplate.opsForValue().set(getPropertyCacheKey(deviceId), JsonUtils.toJsonString(old)); + redisTemplate.opsForValue().set(getPropertyCacheKey(deviceId), + JsonUtils.toJsonString(new PropertyCacheInfo(System.currentTimeMillis(), old)) + ); } /** @@ -106,14 +111,23 @@ public class DeviceInfoDataCache implements IDeviceInfoData, SmartInitializingSi @Override public Map getProperties(String deviceId) { + return getPropertyCacheInfo(deviceId).getProperties(); + } + + private PropertyCacheInfo getPropertyCacheInfo(String deviceId) { String json = redisTemplate.opsForValue().get(getPropertyCacheKey(deviceId)); if (StringUtils.isBlank(json)) { - return new HashMap<>(); + return new PropertyCacheInfo(0, new HashMap<>()); } return JsonUtils.parseObject(json, new TypeReference<>() { }); } + @Override + public long getPropertyUpdateTime(String deviceId) { + return getPropertyCacheInfo(deviceId).getUpdateTime(); + } + @Override @Cacheable(value = Constants.CACHE_DEVICE_INFO, key = "#root.method.name+#deviceId", unless = "#result == null") public DeviceInfo findByDeviceId(String deviceId) { @@ -304,4 +318,15 @@ public class DeviceInfoDataCache implements IDeviceInfoData, SmartInitializingSi List subDeviceIds = deviceInfoData.findSubDeviceIds(parentId); deviceInfoCachePut.findSubDeviceIds(parentId, subDeviceIds); } + + @Data + @NoArgsConstructor + @AllArgsConstructor + private static class PropertyCacheInfo { + + private long updateTime; + + private Map properties; + + } } diff --git a/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java b/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java index 68cdd2f3..6289b1d9 100644 --- a/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java +++ b/iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java @@ -100,6 +100,11 @@ public class DeviceInfoPropertyDataCache implements IDeviceInfoData { return deviceInfoData.getProperties(deviceId); } + @Override + public long getPropertyUpdateTime(String deviceId) { + return deviceInfoData.getPropertyUpdateTime(deviceId); + } + @Override public DeviceInfo findByDeviceId(String deviceId) { DeviceInfo deviceInfo = deviceInfoData.findByDeviceId(deviceId); diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java index 26dce687..0c28061a 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java @@ -71,12 +71,15 @@ public class TbProduct implements TenantAware { @ApiModelProperty(value = "是否透传,true/false") private Boolean transparent; - @ApiModelProperty(value="是否开启设备定位,true/false") + @ApiModelProperty(value = "是否开启设备定位,true/false") private Boolean isOpenLocate; - @ApiModelProperty(value="定位更新方式") + @ApiModelProperty(value = "定位更新方式") private String locateUpdateType; + @ApiModelProperty(value = "保活时长（秒）") + private Long keepAliveTime; + @ApiModelProperty(value = "创建时间") private Long createAt; diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java index b05c0071..83b2bd3b 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java @@ -84,6 +84,11 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData(); } + @Override + public long getPropertyUpdateTime(String deviceId) { + return 0; + } + @Override public DeviceInfo findByDeviceId(String deviceId) { TbDeviceInfo tbDeviceInfo = deviceInfoRepository.findByDeviceId(deviceId); @@ -96,9 +101,9 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData findAll(PageRequest pageRequest) { Page ret = deviceInfoRepository.findAll(PageBuilder.toPageable(pageRequest)); - return new Paging<>(ret.getTotalElements(), MapstructUtils.convert(ret.getContent(), DeviceInfo.class)); + List list = new ArrayList<>(); + for (TbDeviceInfo deviceInfo : ret.getContent()) { + list.add(fillDeviceInfo(deviceInfo.getDeviceId(), deviceInfo, MapstructUtils.convert(deviceInfo, DeviceInfo.class))); + } + return new Paging<>(ret.getTotalElements(), list); } @Override diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java index 75893d33..b48d42c8 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java @@ -5,6 +5,8 @@ import cc.iotkit.model.product.Product; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; @@ -59,4 +61,9 @@ public class ProductBo extends BaseDto { @Size(max = 255, message = "产品密钥长度不正确") private String productSecret; + @ApiModelProperty(value = "保活时长") + @NotBlank(message = "保活时长不能为空") + @Min(value = 10, message = "保活时长(秒)必须大于10") + private Long keepAliveTime; + } diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/product/ProductVo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/product/ProductVo.java index 5d276a85..8fb7f360 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/product/ProductVo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/product/ProductVo.java @@ -67,4 +67,8 @@ public class ProductVo implements Serializable { @ExcelProperty(value = "用户ID") private String uid; + @ApiModelProperty(value = "保活时长（秒）") + @ExcelProperty(value = "保活时长（秒）") + private Long keepAliveTime; + } diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java index da5b1afa..f51cd912 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java @@ -9,16 +9,71 @@ */ package cc.iotkit.manager.service; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.api.Paging; +import cc.iotkit.data.manager.IDeviceInfoData; +import cc.iotkit.data.manager.IProductData; +import cc.iotkit.model.device.DeviceInfo; +import cc.iotkit.model.product.Product; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.util.concurrent.TimeUnit; + /** * 设备状态检查定时任务 */ +@Slf4j @Component public class DeviceStateCheckTask { + @Autowired + @Qualifier("deviceInfoDataCache") + private IDeviceInfoData deviceInfoData; - private void checkClientStateFromEmq() { + @Autowired + @Qualifier("productDataCache") + private IProductData productData; + @Scheduled(fixedDelay = 10, initialDelay = 20, timeUnit = TimeUnit.SECONDS) + public void syncState() { + int pn = 1; + Paging all; + while (true) { + //取出数据库中所有在线设备 + all = deviceInfoData.findByConditions("","","","",true,"",pn,1000); + //判断属性更新时间是否大于产品定义保活时长 + for (DeviceInfo device : all.getRows()) { + Product product = productData.findByProductKey(device.getProductKey()); + Long keepAliveTime = product.getKeepAliveTime(); + if (keepAliveTime == null) { + continue; + } + String deviceId = device.getDeviceId(); + long updateTime = deviceInfoData.getPropertyUpdateTime(deviceId); + //最后更新时间超时保活时长1.1倍认为设备离线了 + if (System.currentTimeMillis() - updateTime > keepAliveTime * 1000 * 1.1) { + DeviceInfo realTimeDevice = deviceInfoData.findByDeviceId(deviceId); + if (!realTimeDevice.isOnline()) { + continue; + } + log.info("device state check offline,{}", deviceId); + //更新为离线 + DeviceInfo.State state = realTimeDevice.getState(); + state.setOnline(false); + state.setOfflineTime(System.currentTimeMillis()); + deviceInfoData.save(realTimeDevice); + } + } + + if (all.getRows().size() < 1000) { + break; + } + pn++; + } } + } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java index 54270cd9..79460f2c 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java @@ -46,7 +46,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { private final ISysOssConfigData baseData; @Scheduled(fixedRate = 10, timeUnit = TimeUnit.SECONDS) - private void keepAlive() { + private void checkOssConfig() { String configKey = RedisUtils.getCacheObject(OssConstant.DEFAULT_CONFIG_KEY); if(configKey==null){ init(); diff --git a/iot-starter/src/main/java/cc/iotkit/config/SchedulerConfig.java b/iot-starter/src/main/java/cc/iotkit/config/SchedulerConfig.java new file mode 100644 index 00000000..4b902bd9 --- /dev/null +++ b/iot-starter/src/main/java/cc/iotkit/config/SchedulerConfig.java @@ -0,0 +1,31 @@ +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2024 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.config; + + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +@Configuration +@EnableScheduling +public class SchedulerConfig { + + @Bean + public ThreadPoolTaskScheduler threadPoolTaskScheduler() { + ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); + scheduler.setPoolSize(10); // 设置线程池大小 + scheduler.setThreadNamePrefix("spring-scheduled-"); // 设置线程名前缀 + scheduler.initialize(); + return scheduler; + } + +} \ No newline at end of file