diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index f57bb8a..079130c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -299,8 +299,6 @@ if (ToolUtil.isEmpty(devCode)) { throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - Page> page = new PageFactory>().defaultPage(); - page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page)); - return new SuccessResponseData(super.packForBT(page)); + return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index f57bb8a..079130c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -299,8 +299,6 @@ if (ToolUtil.isEmpty(devCode)) { throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - Page> page = new PageFactory>().defaultPage(); - page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page)); - return new SuccessResponseData(super.packForBT(page)); + return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index b2c7f29..8bc3bbe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -74,5 +74,5 @@ Map selectLatestWaterMeter(@Param("devcode") String devcode); - List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page> page); + List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index f57bb8a..079130c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -299,8 +299,6 @@ if (ToolUtil.isEmpty(devCode)) { throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - Page> page = new PageFactory>().defaultPage(); - page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page)); - return new SuccessResponseData(super.packForBT(page)); + return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index b2c7f29..8bc3bbe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -74,5 +74,5 @@ Map selectLatestWaterMeter(@Param("devcode") String devcode); - List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page> page); + List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 134f880..ce04a34 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -162,9 +162,7 @@ * @param devCode 设备类型 * @param beginTime 设备安装开始时间 * @param endTime 设备安装结束时间 - * @param page 分页 * @return {@link Map} */ - List> selectDeviceData(String devCode, String beginTime, String endTime, Page> page); - + List> selectDeviceData(String devCode, String beginTime, String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index f57bb8a..079130c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -299,8 +299,6 @@ if (ToolUtil.isEmpty(devCode)) { throw new GunsException(GunsExceptionEnum.REQUEST_NULL); } - Page> page = new PageFactory>().defaultPage(); - page.setRecords(deviceService.selectDeviceData(devCode, beginTime, endTime, page)); - return new SuccessResponseData(super.packForBT(page)); + return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index b2c7f29..8bc3bbe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -74,5 +74,5 @@ Map selectLatestWaterMeter(@Param("devcode") String devcode); - List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("page") Page> page); + List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 134f880..ce04a34 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -162,9 +162,7 @@ * @param devCode 设备类型 * @param beginTime 设备安装开始时间 * @param endTime 设备安装结束时间 - * @param page 分页 * @return {@link Map} */ - List> selectDeviceData(String devCode, String beginTime, String endTime, Page> page); - + List> selectDeviceData(String devCode, String beginTime, String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 01bcbe3..d14da2f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -528,7 +528,7 @@ } @Override - public List> selectDeviceData(String devCode, String beginTime, String endTime, Page> page) { - return this.baseMapper.selectDeviceData(devCode, beginTime, endTime, page); + public List> selectDeviceData(String devCode, String beginTime, String endTime) { + return this.baseMapper.selectDeviceData(devCode, beginTime, endTime); } }