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 9819187..83879a7 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 @@ -69,7 +69,7 @@ public class IotThingModelController { @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,gateway,startTime, endTime); + List list = service.findList1(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 5186fda..33bedcd 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 @@ -23,6 +23,9 @@ public interface IotThingModelService extends IBaseService List findList(String orderField, String order, String code, String token,String origin,String status,String realType, String gateway,Long startTime,Long endTime); + List findList1(String orderField, String order, + String code, String token,String origin,String status,String realType, String gateway,Long startTime,Long endTime); + ModelDetailDTO findById(Long id); Optional findByCode(String code); 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 f05063a..6bd4515 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 @@ -117,7 +117,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl list = findList(orderField, order, code, token, origin, status, realType,gateway, startTime, endTime); + List list = findList1(orderField, order, code, token, origin, status, realType,gateway, startTime, endTime); if (CollectionUtils.isEmpty(list)) { return PageData.empty(); } @@ -126,6 +126,24 @@ public class IotThingModelServiceImpl extends BaseServiceImpl findList1(String orderField, String order, + String code, + String token, + String origin, + String status, + String realType, + String gateway, + Long startTime, + Long endTime) { + + List list = mapper.selectListByQueryAs(getWrapper(orderField, order, code, token, origin, + status, realType,gateway,startTime, endTime), IotThingModelDTO.class); + List modelList = JsonConverter.convertToJsonObjectListObjectNode(list); + return modelList; + } + + @Override public List findList(String orderField, String order, String code,