luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备信息

Browse Source
This commit is contained in:
zhumeixiao 2024-11-28 09:27:48 +08:00
parent f91997de6e
commit 45c7d57b00
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceBreakdownController.java
View File

@ -106,8 +106,8 @@ public class DeviceBreakdownController extends BaseController
*/ */
@GetMapping("/statistics") @GetMapping("/statistics")
@ApiOperation("查询故障列表") @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));
} }
} }

17
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java
View File

@ -3,6 +3,8 @@ package com.fastbee.data.controller.aaScreenAgricultural;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult; 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.domain.DeviceRealtimedataWorms;
import com.fastbee.deviceData.mapper.*; import com.fastbee.deviceData.mapper.*;
import org.redisson.config.BaseConfig; import org.redisson.config.BaseConfig;
@ -39,21 +41,24 @@ public class DeviceHistoryDataController extends BaseController {
/** /**
* 获取虫情设备历史数据 * 获取虫情设备历史数据
*/ */
@GetMapping("/worms/{deviceId}") @GetMapping("/worms")
public AjaxResult getWormsHistoryData(String deviceId){ public TableDataInfo getWormsHistoryData(DeviceRealtimedataWorms deviceRealtimedataWorms){
startPage();
//虫害图片 //虫害图片
List<DeviceRealtimedataWorms> list = new LambdaQueryChainWrapper<>(deviceRealtimedataWormsMapper) List<DeviceRealtimedataWorms> list = new LambdaQueryChainWrapper<>(deviceRealtimedataWormsMapper)
.eq(DeviceRealtimedataWorms::getDeviceAddr,deviceId).list(); .eq(DeviceRealtimedataWorms::getDeviceAddr,deviceRealtimedataWorms.getDeviceAddr()).list();
//虫害列表 //虫害列表
return success(list); return getDataTable(list);
} }
/** /**
* 获取墒情设备历史数据 * 获取墒情设备历史数据
*/ */
@GetMapping("/moisture/{deviceId}") @GetMapping("/moisture/{deviceId}")
public AjaxResult getMoistureHistoryData(String deviceId){ public AjaxResult getMoistureHistoryData(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic){
return null; List<DeviceRealtimedataPhotovoltaic> list = new LambdaQueryChainWrapper<>(deviceRealtimedataPhotovoltaicMapper)
.eq(DeviceRealtimedataPhotovoltaic::getDeviceId,deviceRealtimedataPhotovoltaic.getDeviceId()).list();
return success(list);
} }
/** /**
* 获取气象设备历史数据 * 获取气象设备历史数据

2
fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/IDeviceBreakdownService.java
View File

@ -66,5 +66,5 @@ public interface IDeviceBreakdownService
* @param CreateTimeValue * @param CreateTimeValue
* @return * @return
*/ */
public List<IotDeviceBreakdown> getFaultStatistics(String TypeValue,String CreateTimeValue); public List<IotDeviceBreakdown> getFaultStatistics(String TypeValue,String CreateTimeValue, String EndTimeValue);
} }

7
fastbee-service/fastbee-device-service/src/main/java/com/fastbee/breakdown/service/impl/DeviceBreakdownServiceImpl.java
View File

@ -106,17 +106,18 @@ public class DeviceBreakdownServiceImpl implements IDeviceBreakdownService
* @return * @return
*/ */
@Override @Override
public List<IotDeviceBreakdown> getFaultStatistics(String TypeValue, String CreateTimeValue){ public List<IotDeviceBreakdown> getFaultStatistics(String TypeValue, String CreateTimeValue,String EndTimeValue){
QueryWrapper<DeviceBreakdown> queryWrapper = new QueryWrapper<>(); QueryWrapper<DeviceBreakdown> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("Type", TypeValue) 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") .select("count(*) as id", "fault_name", "create_time","Type")
.groupBy("fault_name"); .groupBy("fault_name");
List<IotDeviceBreakdown> breakdown = new ArrayList<>(); List<IotDeviceBreakdown> breakdown = new ArrayList<>();
QueryWrapper<DeviceBreakdown> query = new QueryWrapper<>(); QueryWrapper<DeviceBreakdown> query = new QueryWrapper<>();
query.eq("Type",TypeValue); query.eq("Type",TypeValue);
QueryWrapper<DeviceBreakdown> queryTime = new QueryWrapper<>(); QueryWrapper<DeviceBreakdown> 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)) { if ((deviceBreakdownMapper.selectCount(query) <=0)||(deviceBreakdownMapper.selectCount(queryTime)<=0)) {
return breakdown; return breakdown;
} }