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

1、刷卡记录从php获取

Browse Source
This commit is contained in:
wyw
2024-08-15 23:27:52 +08:00
parent 30b310e4c8
commit efafc02865
4 changed files with 104 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaWatereleRecordController.java
View File

@ -46,9 +46,9 @@ public class MaWatereleRecordController extends BaseController {
@GetMapping("/list")
@ApiOperation("查询水电双计数据记录列表")
public TableDataInfo list(MaWatereleRecord maWatereleRecord) {
startPage();
List<MaWatereleRecord> list = maWatereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
return getDataTable(list);
// startPage();
TableDataInfo tableDataInfo = maWatereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
return tableDataInfo;
}
/**
@ -70,7 +70,8 @@ public class MaWatereleRecordController extends BaseController {
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, MaWatereleRecord maWatereleRecord) {
List<MaWatereleRecord> list = maWatereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
TableDataInfo tableDataInfo= maWatereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
List<MaWatereleRecord> list = (List<MaWatereleRecord>) tableDataInfo.getRows();
ExcelUtil<MaWatereleRecord> util = new ExcelUtil<MaWatereleRecord>(MaWatereleRecord.class);
util.exportExcel(response, list, "水电双计数据记录数据");
}

2
fastbee-open-api/src/main/java/com/fastbee/data/service/gis/impl/GisDeviceServiceImpl.java
View File

@ -228,7 +228,7 @@ public class GisDeviceServiceImpl implements IGisDeviceService {
//获取累计水量和累计电量的前20条数据记录
MaWatereleRecord watereleRecord = new MaWatereleRecord();
watereleRecord.setDevSn(device.getSerialNumber());
List<MaWatereleRecord> maWatereleRecords = watereleRecordService.selectMaWatereleRecordList(watereleRecord);
List<MaWatereleRecord> maWatereleRecords = (List<MaWatereleRecord>) watereleRecordService.selectMaWatereleRecordList(watereleRecord).getRows();
if(maWatereleRecords.size() > 20){
maWatereleRecords = maWatereleRecords.subList(0, 20);
}