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:
wyw
2024-08-16 02:32:02 +08:00
parent 0d42fc0785
commit 0388cd8aba
6 changed files with 137 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
View File

@ -133,6 +133,9 @@ public class DeviceServiceImpl implements IDeviceService {
@Override
public Device selectDeviceByDeviceId(Long deviceId) {
Device device = deviceMapper.selectDeviceByDeviceId(deviceId);
if (device == null) {
return null;
}
List<ValueItem> list = itslValueCache.getCacheDeviceStatus(device.getProductId(), device.getSerialNumber());
if (list != null && list.size() > 0) {
// redis中获取设备状态（物模型值）
@ -1600,12 +1603,10 @@ public class DeviceServiceImpl implements IDeviceService {
ArrayList<Map<String, Object>> resultList = new ArrayList<>();
devices.setProductId(136L);
List<Device> deviceList = selectDeviceList(devices);
for (Device device : deviceList) {
HashMap<String, Object> itemMap = new HashMap<>();
resultList.add(itemMap);
Integer integer = 0;
itemMap.put("device",device);
if (device.getStatus() != null) {
if (device.getStatus().equals(4)) {
@ -1613,7 +1614,6 @@ public class DeviceServiceImpl implements IDeviceService {
}
}
itemMap.put("online",integer);
}
return resultList;
}

12
fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java
View File

@ -202,9 +202,9 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
List<String> time = new ArrayList<>();
List<String> sumFlow = new ArrayList<>();
List<String> sumEle = new ArrayList<>();
HashMap<String, Object> sumFlowtMap = new HashMap<>();
sumFlowtMap.put("name", "累计水量");
sumFlowtMap.put("unit", "m³");
// HashMap<String, Object> sumFlowtMap = new HashMap<>();
// sumFlowtMap.put("name", "累计水量");
// sumFlowtMap.put("unit", "m³");
HashMap<String, Object> sumEletMap = new HashMap<>();
sumEletMap.put("name", "累计电量");
sumEletMap.put("unit", "度");
@ -213,11 +213,11 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
sumFlow.add(record.getSumflow());
sumEle.add(record.getSumele());
}
sumFlowtMap.put("time", time);
sumFlowtMap.put("data", sumFlow);
// sumFlowtMap.put("time", time);
// sumFlowtMap.put("data", sumFlow);
sumEletMap.put("time", time);
sumEletMap.put("data", sumEle);
list.add(sumFlowtMap);
// list.add(sumFlowtMap);
list.add(sumEletMap);
// map.put("time", time);
// map.put("sumFlow", sumFlow);