Merge remote-tracking branch 'origin/acs_dev' into acs_dev
This commit is contained in:
@@ -218,10 +218,10 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
|
|||||||
int var18 = itemValues.length;
|
int var18 = itemValues.length;
|
||||||
|
|
||||||
for (int var19 = 0; var19 < var18; ++var19) {
|
for (int var19 = 0; var19 < var18; ++var19) {
|
||||||
ItemValue itemValue = var17[var19];
|
//ItemValue itemValue = var17[var19];
|
||||||
String code = itemValue.getItem_code();
|
//String code = itemValue.getItem_code();
|
||||||
Object value = itemValue.getItem_value();
|
//Object value = itemValue.getItem_value();
|
||||||
opcValueAccessor.setValue(code, value);
|
//opcValueAccessor.setValue(code, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,10 +274,10 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
|
|||||||
int var18 = itemValues.length;
|
int var18 = itemValues.length;
|
||||||
|
|
||||||
for (int var19 = 0; var19 < var18; ++var19) {
|
for (int var19 = 0; var19 < var18; ++var19) {
|
||||||
ItemValue itemValue = var17[var19];
|
//ItemValue itemValue = var17[var19];
|
||||||
String code = itemValue.getItem_code();
|
//String code = itemValue.getItem_code();
|
||||||
Object value = itemValue.getItem_value();
|
//Object value = itemValue.getItem_value();
|
||||||
opcValueAccessor.setValue(code, value);
|
//opcValueAccessor.setValue(code, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ public class OpcUtl {
|
|||||||
Map<Item, Integer> e = null;
|
Map<Item, Integer> e = null;
|
||||||
try {
|
try {
|
||||||
e = group.write(requests);
|
e = group.write(requests);
|
||||||
|
log.info("Group返回下发信号结果:" + String.valueOf(e));
|
||||||
// group.write(requests);
|
// group.write(requests);
|
||||||
} catch (Exception e1) {
|
} catch (Exception e1) {
|
||||||
e1.printStackTrace();
|
|
||||||
throw new BadRequestException("下发信号失败:" + e1.getMessage());
|
throw new BadRequestException("下发信号失败:" + e1.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user