From 45c7d57b00ca5fa261ce3f2f0691ccd0bbd95a32 Mon Sep 17 00:00:00 2001 From: zhumeixiao <3313492479@qq.com> Date: Thu, 28 Nov 2024 09:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceBreakdownController.java | 4 ++-- .../DeviceHistoryDataController.java | 17 +++++++++++------ .../service/IDeviceBreakdownService.java | 2 +- .../impl/DeviceBreakdownServiceImpl.java | 7 ++++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceBreakdownController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceBreakdownController.java index b9ffd71..2298224 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceBreakdownController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceBreakdownController.java @@ -106,8 +106,8 @@ public class DeviceBreakdownController extends BaseController */ @GetMapping("/statistics") @ApiOperation("查询故障列表") - public AjaxResult getFaultStatistics(String TypeValue, String CreateTimeValue) + public AjaxResult getFaultStatistics(String TypeValue, String CreateTimeValue,String EndTimeValue) { - return success(deviceBreakdownService.getFaultStatistics(TypeValue, CreateTimeValue)); + return success(deviceBreakdownService.getFaultStatistics(TypeValue, CreateTimeValue,EndTimeValue)); } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java index fdc6c87..7481241 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java @@ -3,6 +3,8 @@ package com.fastbee.data.controller.aaScreenAgricultural; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.common.core.page.TableDataInfo; +import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic; import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; import com.fastbee.deviceData.mapper.*; import org.redisson.config.BaseConfig; @@ -39,21 +41,24 @@ public class DeviceHistoryDataController extends BaseController { /** * 获取虫情设备历史数据 */ - @GetMapping("/worms/{deviceId}") - public AjaxResult getWormsHistoryData(String deviceId){ + @GetMapping("/worms") + public TableDataInfo getWormsHistoryData(DeviceRealtimedataWorms deviceRealtimedataWorms){ + startPage(); //虫害图片 List list = new LambdaQueryChainWrapper<>(deviceRealtimedataWormsMapper) - .eq(DeviceRealtimedataWorms::getDeviceAddr,deviceId).list(); + .eq(DeviceRealtimedataWorms::getDeviceAddr,deviceRealtimedataWorms.getDeviceAddr()).list(); //虫害列表 - return success(list); + return getDataTable(list); } /** * 获取墒情设备历史数据 */ @GetMapping("/moisture/{deviceId}") - public AjaxResult getMoistureHistoryData(String deviceId){ + public AjaxResult getMoistureHistoryData(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic){ - return null; + List list = new LambdaQueryChainWrapper<>(deviceRealtimedataPhotovoltaicMapper) + .eq(DeviceRealtimedataPhotovoltaic::getDeviceId,deviceRealtimedataPhotovoltaic.getDeviceId()).list(); + return success(list); } /** * 获取气象设备历史数据 diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/IDeviceBreakdownService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/IDeviceBreakdownService.java index a096b12..18cdaaa 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/IDeviceBreakdownService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/IDeviceBreakdownService.java @@ -66,5 +66,5 @@ public interface IDeviceBreakdownService * @param CreateTimeValue * @return */ - public List getFaultStatistics(String TypeValue,String CreateTimeValue); + public List getFaultStatistics(String TypeValue,String CreateTimeValue, String EndTimeValue); } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/impl/DeviceBreakdownServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/impl/DeviceBreakdownServiceImpl.java index 2f3b262..43a6bf4 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/impl/DeviceBreakdownServiceImpl.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/impl/DeviceBreakdownServiceImpl.java @@ -106,17 +106,18 @@ public class DeviceBreakdownServiceImpl implements IDeviceBreakdownService * @return */ @Override - public List getFaultStatistics(String TypeValue, String CreateTimeValue){ + public List getFaultStatistics(String TypeValue, String CreateTimeValue,String EndTimeValue){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("Type", TypeValue) - .le("create_time",CreateTimeValue) + .ge("create_time",CreateTimeValue) + .le("create_time",EndTimeValue) .select("count(*) as id", "fault_name", "create_time","Type") .groupBy("fault_name"); List breakdown = new ArrayList<>(); QueryWrapper query = new QueryWrapper<>(); query.eq("Type",TypeValue); QueryWrapper queryTime = new QueryWrapper<>(); - queryTime.le("create_time",CreateTimeValue); + queryTime.le("create_time",EndTimeValue).ge("create_time",CreateTimeValue); if ((deviceBreakdownMapper.selectCount(query) <=0)||(deviceBreakdownMapper.selectCount(queryTime)<=0)) { return breakdown; }