chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化APP设备列表查询速度

Browse Source
This commit is contained in:
磷叶 2024-11-06 17:59:11 +08:00
parent 41eef23439
commit 791a919280
3 changed files with 93 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java
View File

@ -16,6 +16,8 @@ import java.util.Date;
@Data @Data
@Builder @Builder
public class IotDeviceInfo { public class IotDeviceInfo {
private String mac;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date at; // 时间 private Date at; // 时间

14
smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotConverterImpl.java
View File

@ -33,21 +33,29 @@ public class IotConverterImpl implements IotConverter {
List<CurrentDatastream> ds1 = data1 == null ? data2.getDatastreams() : data1.getDatastreams(); List<CurrentDatastream> ds1 = data1 == null ? data2.getDatastreams() : data1.getDatastreams();
List<CurrentDatastream> ds2 = data2 == null ? data1.getDatastreams() : data2.getDatastreams(); List<CurrentDatastream> ds2 = data2 == null ? data1.getDatastreams() : data2.getDatastreams();
String mac = null;
try {
mac = data1.getTitle();
} catch (Exception e) {
mac = data2.getTitle();
}
if (CollectionUtils.isNotEmptyElement(ds1)) { if (CollectionUtils.isNotEmptyElement(ds1)) {
return this.toIotDeviceInfo(ds1, ds2); return this.toIotDeviceInfo(ds1, ds2, mac);
} else if (CollectionUtils.isNotEmptyElement(ds2)) { } else if (CollectionUtils.isNotEmptyElement(ds2)) {
return this.toIotDeviceInfo(ds2, ds1); return this.toIotDeviceInfo(ds2, ds1, mac);
} }
return null; return null;
} }
private IotDeviceInfo toIotDeviceInfo(List<CurrentDatastream> ds1, List<CurrentDatastream> ds2) { private IotDeviceInfo toIotDeviceInfo(List<CurrentDatastream> ds1, List<CurrentDatastream> ds2, String mac) {
if (CollectionUtils.isEmptyElement(ds1) && CollectionUtils.isEmptyElement(ds2)) { if (CollectionUtils.isEmptyElement(ds1) && CollectionUtils.isEmptyElement(ds2)) {
return null; return null;
} }
IotDeviceInfo device = IotDeviceInfo.newDefaultInstance(); IotDeviceInfo device = IotDeviceInfo.newDefaultInstance();
device.setMac(mac);
for (CurrentDatastream stream : ds1) { for (CurrentDatastream stream : ds1) {
String id = stream.getId(); // 数据点ID String id = stream.getId(); // 数据点ID

19
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
View File

@ -1029,13 +1029,27 @@ public class DeviceServiceImpl implements DeviceService
// 拼接正在使用中的订单数量 // 拼接正在使用中的订单数量
deviceAssembler.assembleUsingBillCount(list); deviceAssembler.assembleUsingBillCount(list);
// todo 列表根据产品ID分组
Map<String, List<DeviceVO>> group = list.stream().collect(Collectors.groupingBy(DeviceVO::getModelProductId));
for (Map.Entry<String, List<DeviceVO>> entry : group.entrySet()) {
List<DeviceVO> deviceList = entry.getValue();
List<String> macList = CollectionUtils.map(deviceList, DeviceVO::getMac);
macList.addAll(CollectionUtils.map(deviceList, DeviceVO::getMac2));
List<IotDeviceInfo> iotList = iotService.getDeviceInfo(macList, entry.getKey());
for (DeviceVO device : list) { for (DeviceVO device : list) {
try { try {
if (StringUtils.isAnyBlank(device.getMac(), device.getModelProductId())) { if (StringUtils.isAnyBlank(device.getMac(), device.getModelProductId())) {
continue; continue;
} }
// 获取数据点信息 // 获取数据点信息
IotDeviceInfo deviceInfo = iotService.getDeviceInfo(device); // IotDeviceInfo deviceInfo = iotService.getDeviceInfo(device);
IotDeviceInfo deviceInfo = iotList.stream()
.filter(item -> Objects.equals(device.getMac(), item.getMac()) || Objects.equals(device.getMac2(), item.getMac()))
.findFirst().orElse(null);
// 更新设备信息 // 更新设备信息
device.setDeviceId(device.getDeviceId()); device.setDeviceId(device.getDeviceId());
@ -1104,7 +1118,8 @@ public class DeviceServiceImpl implements DeviceService
this.updateIotInfo(device); this.updateIotInfo(device);
} catch (Exception e) { } catch (Exception e) {
log.error("更新设备信息失败，deviceId:{}", device.getDeviceId(), e); log.error("更新设备信息失败，deviceId:{}, {}", device.getDeviceId(), e.getMessage());
}
} }
} }
} }