|
@@ -138,7 +138,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
|
|
for (int j = 0; j < deviceAnalogVariableList.size(); j++) {
|
|
for (int j = 0; j < deviceAnalogVariableList.size(); j++) {
|
|
if (deviceList.get(i).getId().equals(deviceAnalogVariableList.get(j).getMonitoringEquipment())) {
|
|
if (deviceList.get(i).getId().equals(deviceAnalogVariableList.get(j).getMonitoringEquipment())) {
|
|
DeviceAnalogVariableList deviceAnalogVariableListThree = new DeviceAnalogVariableList();
|
|
DeviceAnalogVariableList deviceAnalogVariableListThree = new DeviceAnalogVariableList();
|
|
- deviceAnalogVariableListThree.setVariableCoding(deviceAnalogVariableList.get(j).getVariableCoding()+"_"+deviceAnalogVariableList.get(j).getId());
|
|
|
|
|
|
+ deviceAnalogVariableListThree.setVariableCoding(deviceAnalogVariableList.get(j).getVariableCoding()+"_"+deviceList.get(i).getId());
|
|
deviceAnalogVariableListThree.setVariableName(deviceAnalogVariableList.get(j).getVariableName());
|
|
deviceAnalogVariableListThree.setVariableName(deviceAnalogVariableList.get(j).getVariableName());
|
|
deviceAnalogVariableListThree.setId(deviceAnalogVariableList.get(j).getId());
|
|
deviceAnalogVariableListThree.setId(deviceAnalogVariableList.get(j).getId());
|
|
deviceAnalogVariableListTwo.add(deviceAnalogVariableListThree);
|
|
deviceAnalogVariableListTwo.add(deviceAnalogVariableListThree);
|