|
@@ -128,6 +128,7 @@ public class DeviceSyncFullCardService extends SuperService {
|
|
|
BeanUtils.copyProperties(it, syncParam);
|
|
BeanUtils.copyProperties(it, syncParam);
|
|
|
|
|
|
|
|
List<String> gateWayIds = new ArrayList<>();
|
|
List<String> gateWayIds = new ArrayList<>();
|
|
|
|
|
+ List<String> gateWayNames = new ArrayList<>();
|
|
|
// 设备绑定的网关
|
|
// 设备绑定的网关
|
|
|
List<GateWay2Device> gateWay2Devices = new ArrayList<>();
|
|
List<GateWay2Device> gateWay2Devices = new ArrayList<>();
|
|
|
|
|
|
|
@@ -141,9 +142,15 @@ public class DeviceSyncFullCardService extends SuperService {
|
|
|
gateWayIds = gateWay2Devices.stream().map(it2 -> {
|
|
gateWayIds = gateWay2Devices.stream().map(it2 -> {
|
|
|
return it2.getGateWayInfo().getGateWayId();
|
|
return it2.getGateWayInfo().getGateWayId();
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
|
|
+ gateWayNames = gateWay2Devices.stream().map(it2 -> {
|
|
|
|
|
+ return it2.getGateWayInfo().getGateWayName();
|
|
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
// 所属网关ID结合
|
|
// 所属网关ID结合
|
|
|
syncParam.setGateWayId(String.join(",", gateWayIds));
|
|
syncParam.setGateWayId(String.join(",", gateWayIds));
|
|
|
|
|
+ syncParam.setGateWayName(String.join(",", gateWayNames));
|
|
|
// 项目code
|
|
// 项目code
|
|
|
syncParam.setProjectInfoCode(it.getProjectInfoCode());
|
|
syncParam.setProjectInfoCode(it.getProjectInfoCode());
|
|
|
|
|
|