|
@@ -22,10 +22,11 @@ public class DemoController {
|
|
|
@Autowired
|
|
|
SendDao sendDao;
|
|
|
@GetMapping("/getBaseInfo")
|
|
|
- public void countPlanDevice(){
|
|
|
- //sendDao.selectOne();
|
|
|
+ public void countPlanDevice(Integer id){
|
|
|
+
|
|
|
WaterMeterBaseEntity waterMeterBaseEntity=new WaterMeterBaseEntity();
|
|
|
- List<Map<String, Object>> meterInfor = receiveDao.getMeterInfor(waterMeterBaseEntity);
|
|
|
+ waterMeterBaseEntity.setRegionId(id+"");
|
|
|
+ List<Map<String, Object>> meterInfor = receiveDao.getMeterInfor(waterMeterBaseEntity);
|
|
|
|
|
|
System.out.println(meterInfor);
|
|
|
|
|
@@ -45,9 +46,9 @@ public class DemoController {
|
|
|
|
|
|
List<MeterDataEntity>datas=new ArrayList<>();
|
|
|
MeterDataEntity meterDataEntity=new MeterDataEntity();
|
|
|
- meterDataEntity.setReleationId("1");
|
|
|
+ meterDataEntity.setReleationId("MT72CDB3A8842D51BF85D8F1CBFA7454");
|
|
|
meterDataEntity.setCurrentReading(12.05f);
|
|
|
- meterDataEntity.setCurrentReadDate("2020-12-29 12:15:16");
|
|
|
+ meterDataEntity.setCurrentReadDate("2021-01-05 12:15:16");
|
|
|
datas.add(meterDataEntity);
|
|
|
UploadWaterMeterDataEntity uploadWaterMeterDataEntity=new UploadWaterMeterDataEntity();
|
|
|
uploadWaterMeterDataEntity.setTaskId(taskEntity.getTaskId());
|