diff --git a/modules/thing/src/main/java/com/thing/thing/cache/service/CacheInit.java b/modules/thing/src/main/java/com/thing/thing/cache/service/CacheInit.java index 8f863b5..150a9a7 100644 --- a/modules/thing/src/main/java/com/thing/thing/cache/service/CacheInit.java +++ b/modules/thing/src/main/java/com/thing/thing/cache/service/CacheInit.java @@ -12,7 +12,6 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import java.util.List; @@ -21,6 +20,7 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; @@ -52,13 +52,13 @@ public class CacheInit { //物模型的初始化 cacheModel(); //定时打印缓存 - // notificationsConsumerExecutor.scheduleAtFixedRate(thingCache::printStats, 0, 3000, TimeUnit.SECONDS); + notificationsConsumerExecutor.scheduleAtFixedRate(thingCache::printStats, 0, 5, TimeUnit.MINUTES); log.info("thing 【物模型:物实体:物指标】 cache init end"); } private void cacheModel() { modelService.findList(CacheNameEnum.ModelField.THING_MODEL_CREATE_DATE.getField(), - Constant.DESC, null, null, null, null, null, null, null); + Constant.DESC, null, null, null, null, null, null, null,null); //物实体的初始化 cacheEntity(); } diff --git a/modules/thing/src/main/java/com/thing/thing/context/service/ThingManageContextService.java b/modules/thing/src/main/java/com/thing/thing/context/service/ThingManageContextService.java index bb40744..3d03af8 100644 --- a/modules/thing/src/main/java/com/thing/thing/context/service/ThingManageContextService.java +++ b/modules/thing/src/main/java/com/thing/thing/context/service/ThingManageContextService.java @@ -22,7 +22,7 @@ public interface ThingManageContextService { /** 查询 Model 接口 **/ Optional> findAllModel(String orderField, String order, - String code, String token,String origin,String status,String realType,Long startTime,Long endTime); + String code, String token,String origin,String status,String realType,String gateway,Long startTime,Long endTime); Optional> findModelByCodes(Collection codes); diff --git a/modules/thing/src/main/java/com/thing/thing/context/service/impl/ThingManageContextServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/context/service/impl/ThingManageContextServiceImpl.java index c9a2ce4..685f164 100644 --- a/modules/thing/src/main/java/com/thing/thing/context/service/impl/ThingManageContextServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/context/service/impl/ThingManageContextServiceImpl.java @@ -68,8 +68,8 @@ public class ThingManageContextServiceImpl implements ThingManageContextService @Override public Optional> findAllModel(String orderField, String order, - String code, String token,String origin,String status,String realType,Long startTime,Long endTime) { - return Optional.ofNullable(modelService.findList(orderField,order,code,token,origin,status,realType,startTime,endTime)); + String code, String token,String origin,String status,String realType,String gateway,Long startTime,Long endTime) { + return Optional.ofNullable(modelService.findList(orderField,order,code,token,origin,status,realType,gateway,startTime,endTime)); } @Override diff --git a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java index eee14fa..37d8d40 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java +++ b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java @@ -49,9 +49,10 @@ public class IotThingModelController { @Parameter(name = "origin", description = "数据来源") @RequestParam(required = false) String origin, @Parameter(name = "status", description = "在线离线状态,0离线 1在线 2错误 3未接入") @RequestParam(required = false) String status, @Parameter(name = "realType", description = "真实/虚拟类型") @RequestParam(required = false) String realType, + @Parameter(name = "gateway", description = "网关") @RequestParam(required = false) String gateway, @Parameter(name = "startTime", description = "开始时间") @RequestParam(required = false) Long startTime, @Parameter(name = "endTime", description = "结束时间") @RequestParam(required = false) Long endTime) { - PageData pageList = service.pageList(page,limit,orderField,order,code,token,origin,status,realType,startTime,endTime); + PageData pageList = service.pageList(page,limit,orderField,order,code,token,origin,status,realType,gateway,startTime,endTime); return new Result>().ok(pageList); } @@ -65,9 +66,10 @@ public class IotThingModelController { @Parameter(name = "origin", description = "数据来源") @RequestParam(required = false) String origin, @Parameter(name = "status", description = "在线离线状态,0离线 1在线 2错误 3未接入") @RequestParam(required = false) String status, @Parameter(name = "realType", description = "在线离线状态,0离线 1在线 2错误 3未接入") @RequestParam(required = false) String realType, + @Parameter(name = "gateway", description = "网关") @RequestParam(required = false) String gateway, @Parameter(name = "startTime", description = "开始时间") @RequestParam(required = false) Long startTime, @Parameter(name = "endTime", description = "结束时间") @RequestParam(required = false) Long endTime) { - List list = service.findList(orderField, order, code, token, origin, status, realType,startTime, endTime); + List list = service.findList(orderField, order, code, token, origin, status, realType,gateway,startTime, endTime); return new Result>().ok(list); } diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java index b0f2e35..ace3851 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java @@ -18,10 +18,10 @@ import java.util.Optional; public interface IotThingModelService extends IBaseService { PageData pageList(Integer page,Integer limit,String orderField,String order, - String code,String token,String origin,String status,String realType,Long startTime,Long endTime); + String code,String token,String origin,String status,String realType,String gateway,Long startTime,Long endTime); List findList(String orderField, String order, - String code, String token,String origin,String status,String realType,Long startTime,Long endTime); + String code, String token,String origin,String status,String realType, String gateway,Long startTime,Long endTime); ModelDetailDTO findById(Long id); diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java index 92c4938..1d58e49 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java @@ -87,6 +87,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl list = findList(orderField, order, code, token, origin, status, realType, startTime, endTime); + List list = findList(orderField, order, code, token, origin, status, realType,gateway, startTime, endTime); if (CollectionUtils.isEmpty(list)) { return PageData.empty(); } @@ -130,12 +133,13 @@ public class IotThingModelServiceImpl extends BaseServiceImpl modelList = cache.getTopicMap(CacheNameEnum.THING_MODEL); if (CollectionUtils.isEmpty(modelList)) { List list = mapper.selectListByQueryAs(getWrapper(orderField, order, null, null, null, - null, null, null, null), IotThingModelDTO.class); + null, null,null,null, null), IotThingModelDTO.class); modelList = JsonConverter.convertToJsonObjectListObjectNode(list); //更新缓存 CacheInit.modelMap(modelList, cache); @@ -145,7 +149,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl comparator = CompareUtils.getComparator(order, finalOrderField);//封装参数 - List> pairs = buildParam(code, token, origin, status, realType); + List> pairs = buildParam(code, token, origin, status, realType,gateway); return modelList.stream().filter(jsonObject -> JacksonUtil.filter(jsonObject, pairs, finalOrderField, startTime, endTime)) .sorted(comparator.thenComparing(obj -> obj.get(CacheNameEnum.ModelField.THING_MODEL_ID.getField()).asLong())).toList(); } @@ -213,7 +217,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl findAllOrigin() { List modelList = findList(CacheNameEnum.ModelField.THING_MODEL_CREATE_DATE.getField(), - Constant.DESC, null, null, null, null, null, null, null); + Constant.DESC, null, null, null, null, null, null, null,null); if (CollectionUtil.isEmpty(modelList)) { return Lists.newArrayList(); } @@ -439,7 +443,8 @@ public class IotThingModelServiceImpl extends BaseServiceImpl> filterList = new ArrayList<>(); if (StringUtils.isNotBlank(code)) { filterList.add(Pair.of(CacheNameEnum.ModelField.THING_MODEL_CODE.getField(), code)); @@ -456,6 +461,9 @@ public class IotThingModelServiceImpl extends BaseServiceImpl