root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:tosize添加

Browse Source
This commit is contained in:
lishuai
2023-12-19 09:39:07 +08:00
parent 0b764880ad
commit 6560d294f8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
View File

@@ -476,7 +476,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
String to_putpoint = device.getExtraValue().get("address").toString(); String to_putpoint = device.getExtraValue().get("address").toString();
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("inflatableShaftVersion", applyManipulatorActionResponse.getVersion()); map.put("inflatableShaftVersion", applyManipulatorActionResponse.getVersion());
// map.put("to_size", applyManipulatorActionResponse.getSize()); map.put("to_size", applyManipulatorActionResponse.getSize());
map.put("to_command", 3); map.put("to_command", 3);
map.put("to_putpoint", Integer.parseInt(to_putpoint)); map.put("to_putpoint", Integer.parseInt(to_putpoint));
this.writing(map); this.writing(map);

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java
View File

@@ -56,6 +56,8 @@ public class ItemProtocol {
//是否套轴 //是否套轴
public static String item_is_wrapped = "is_wrapped"; public static String item_is_wrapped = "is_wrapped";
public static String item_to_size = "to_size";
private IndoorManipulatorDeviceDriver driver; private IndoorManipulatorDeviceDriver driver;
@@ -213,6 +215,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB200.W18")); list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB200.W18"));
list.add(new ItemDto(item_tube_num, "套管数量", "DB200.W20")); list.add(new ItemDto(item_tube_num, "套管数量", "DB200.W20"));
list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB200.W22")); list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB200.W22"));
list.add(new ItemDto(item_to_size, "尺寸", "DB200.W24"));
return list; return list;
} }