From 2d3e3be6f31d7379c6186b3e3fa72aed96d92c7b Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 9 Aug 2024 09:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=88=86=E9=A1=B5?= =?UTF-8?q?=202024=E5=B9=B48=E6=9C=889=E6=97=A509:41:59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IotThingModelController.java | 4 ++-- .../thing/model/param/DistributeModelParam.java | 2 ++ .../model/service/IotThingModelService.java | 2 +- .../service/impl/IotThingModelServiceImpl.java | 16 ++++++++-------- 4 files changed, 13 insertions(+), 11 deletions(-) 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 37d8d40..38f5602 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 @@ -151,8 +151,8 @@ public class IotThingModelController { @Parameter(name = "endTime",description ="结束时间"), @Parameter(name = "attrs",description ="属性编码集合") }) - public Result> getSequenceAttr(String entityCode,String attrs,Long startTime,Long endTime) { - return new Result>().ok(service.getSequenceAttr(entityCode,attrs,startTime,endTime)); + public Result> getSequenceAttr(String entityCode,String attrs,Long startTime,Long endTime,Integer page,Integer limit) { + return new Result>().ok(service.getSequenceAttr(entityCode,attrs,startTime,endTime,page,limit)); } @PostMapping("saveSequenceAttr") diff --git a/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java b/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java index 0e45e3b..31151af 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java +++ b/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java @@ -28,6 +28,8 @@ public class DistributeModelParam implements Serializable { private String code; @Schema(description = "是否网关: 0否1是") private String gateway; + @Schema(description = "租户内物存在类型，0虚拟 1真实") + private String realType; @Schema(description = "备注说明") private String remark; @Schema(description = "物模型：分配租户编码(分配企业功能参数)") 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 ace3851..251bf30 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 @@ -37,7 +37,7 @@ public interface IotThingModelService extends IBaseService Map status(); - List getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime); + PageData getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit); List latestData(String entityCode, String attrs, Long startTime, Long endTime); 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 1d58e49..eadad86 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 @@ -230,7 +230,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime) { + public PageData getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit) { Optional optional = findByCode(entityCode); if (optional.isEmpty()) { return null; @@ -240,13 +240,13 @@ public class IotThingModelServiceImpl extends BaseServiceImpl tskvList; + PageData tskvList; // 有时间参数：查历史值 if (!Objects.isNull(startTime) && !Objects.isNull(endTime) && CollectionUtils.isNotEmpty(attrList)) { - tskvList = tsKvService.findTsKvByCodeAndAttrs(entityCode, attrList, startTime, endTime, false); + tskvList = tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, startTime, endTime, false,page, limit); } else { // 没有时间参数：查最新值 - tskvList = tsKvService.findLatestByCodeAndAttrs(entityCode, attrList, false); + tskvList = tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, null,null, false,page, limit); } return tskvList; } @@ -292,7 +292,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl entitiesList = shareThingsToTenantCode(Collections.singletonList(code), dto.getTenantCodes()); Optional optional = findByCode(code); if (optional.isEmpty()) { - IotThingModelEntity modelEntity = buildIotThingModelEntity(code, dto.getRemark(), (long) CollectionUtils.size(entitiesList), null, dto.getGateway()); + IotThingModelEntity modelEntity = buildIotThingModelEntity(code, dto.getRemark(), (long) CollectionUtils.size(entitiesList), null, dto.getGateway(),dto.getRealType()); mapper.insert(modelEntity); } else { updateModelAuthNumByCodes(Collections.singletonList(code)); @@ -314,7 +314,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl entitiesList = shareThingsToTenantCode(Collections.singletonList(modelDTO.getCode()), dto.getTenantCodes()); IotThingModelEntity iotThingModelEntity = buildIotThingModelEntity(modelDTO.getCode(), dto.getRemark(), - (long) CollectionUtils.size(entitiesList), modelDTO.getToken(), gateway); + (long) CollectionUtils.size(entitiesList), modelDTO.getToken(), gateway,dto.getRealType()); iotThingModelEntity.setId(modelDTO.getId()); mapper.update(iotThingModelEntity, true); //更新缓存 @@ -408,7 +408,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl