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:
童丽然
2025-01-02 14:12:48 +08:00
parent 24344e870a
commit 17dadbf393
18 changed files with 405 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgFlowDeviceDataController.java
View File

@ -3,6 +3,7 @@ package com.fastbee.data.controller.userRecharge;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.fastbee.iot.domain.dto.NgFlowDeviceDataDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -41,10 +42,10 @@ public class NgFlowDeviceDataController extends BaseController
// @PreAuthorize("@ss.hasPermi('rechargecard:data:list')")
@GetMapping("/list")
@ApiOperation("查询流量计设备数据列表")
public TableDataInfo list(NgFlowDeviceData ngFlowDeviceData)
public TableDataInfo list(NgFlowDeviceDataDto ngFlowDeviceData)
{
startPage();
List<NgFlowDeviceData> list = ngFlowDeviceDataService.selectNgFlowDeviceDataList(ngFlowDeviceData);
List<NgFlowDeviceData> list = ngFlowDeviceDataService.selectNgFlowDeviceDataListByTime(ngFlowDeviceData);
return getDataTable(list);
}
@ -54,9 +55,9 @@ public class NgFlowDeviceDataController extends BaseController
@ApiOperation("导出流量计设备数据列表")
// @PreAuthorize("@ss.hasPermi('rechargecard:data:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, NgFlowDeviceData ngFlowDeviceData)
public void export(HttpServletResponse response, NgFlowDeviceDataDto ngFlowDeviceData)
{
List<NgFlowDeviceData> list = ngFlowDeviceDataService.selectNgFlowDeviceDataList(ngFlowDeviceData);
List<NgFlowDeviceData> list = ngFlowDeviceDataService.selectNgFlowDeviceDataListByTime(ngFlowDeviceData);
ExcelUtil<NgFlowDeviceData> util = new ExcelUtil<NgFlowDeviceData>(NgFlowDeviceData.class);
util.exportExcel(response, list, "流量计设备数据数据");
}

24
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgWaterPumpUsageRecordsController.java
View File

@ -1,8 +1,11 @@
package com.fastbee.data.controller.userRecharge;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.fastbee.rechargecard.domain.dto.NgWaterPumpUsageRecordsChartsDto;
import com.fastbee.rechargecard.domain.dto.NgWaterPumpUsageRecordsDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -38,16 +41,27 @@ public class NgWaterPumpUsageRecordsController extends BaseController
@Autowired
private INgWaterPumpUsageRecordsService ngWaterPumpUsageRecordsService;
/**
* 灌溉控制器瞬时流量的图表
*/
// @PreAuthorize("@ss.hasPermi('rechargecard:records:list')")
@GetMapping("/charts/insFlow")
@ApiOperation("灌溉控制器瞬时流量的图表")
public AjaxResult insFlowCharts(@RequestBody NgWaterPumpUsageRecordsChartsDto ngWaterPumpUsageRecordsChartsDto)
{
return success(ngWaterPumpUsageRecordsService.selectNgWaterPumpUsageRecordsInsFlowCharts(ngWaterPumpUsageRecordsChartsDto.getDeviceNumber(),ngWaterPumpUsageRecordsChartsDto.getStartTime(),ngWaterPumpUsageRecordsChartsDto.getEndTime()));
}
/**
* 查询水泵设备使用记录列表
*/
// @PreAuthorize("@ss.hasPermi('rechargecard:records:list')")
@GetMapping("/list")
@ApiOperation("查询水泵设备使用记录列表")
public TableDataInfo list(NgWaterPumpUsageRecords ngWaterPumpUsageRecords)
public TableDataInfo list(NgWaterPumpUsageRecordsDto ngWaterPumpUsageRecords)
{
startPage();
List<NgWaterPumpUsageRecords> list = ngWaterPumpUsageRecordsService.selectNgWaterPumpUsageRecordsList(ngWaterPumpUsageRecords);
List<NgWaterPumpUsageRecords> list = ngWaterPumpUsageRecordsService.selectNgWaterPumpUsageRecordsListByTime(ngWaterPumpUsageRecords);
return getDataTable(list);
}
@ -55,11 +69,11 @@ public class NgWaterPumpUsageRecordsController extends BaseController
* 导出水泵设备使用记录列表
*/
@ApiOperation("导出水泵设备使用记录列表")
@PreAuthorize("@ss.hasPermi('rechargecard:records:export')")
//@PreAuthorize("@ss.hasPermi('rechargecard:records:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, NgWaterPumpUsageRecords ngWaterPumpUsageRecords)
public void export(HttpServletResponse response, NgWaterPumpUsageRecordsDto ngWaterPumpUsageRecords)
{
List<NgWaterPumpUsageRecords> list = ngWaterPumpUsageRecordsService.selectNgWaterPumpUsageRecordsList(ngWaterPumpUsageRecords);
List<NgWaterPumpUsageRecords> list = ngWaterPumpUsageRecordsService.selectNgWaterPumpUsageRecordsListByTime(ngWaterPumpUsageRecords);
ExcelUtil<NgWaterPumpUsageRecords> util = new ExcelUtil<NgWaterPumpUsageRecords>(NgWaterPumpUsageRecords.class);
util.exportExcel(response, list, "水泵设备使用记录数据");
}

6
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java
View File

@ -84,7 +84,7 @@ public class UserIrrigationRecordController extends BaseController
userIrrigationRecord.setSearchEndTime(calendar.getTime());
}
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
List<UserIrrigationRecordListDto> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
return getDataTable(list);
}
@ -159,9 +159,9 @@ public class UserIrrigationRecordController extends BaseController
userIrrigationRecord.setSearchEndTime(calendar.getTime());
}
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
List<UserIrrigationRecordListDto> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
//List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordList(userIrrigationRecord);
ExcelUtil<UserIrrigationRecord> util = new ExcelUtil<UserIrrigationRecord>(UserIrrigationRecord.class);
ExcelUtil<UserIrrigationRecordListDto> util = new ExcelUtil<UserIrrigationRecordListDto>(UserIrrigationRecordListDto.class);
util.exportExcel(response, list, "灌溉记录数据");
}