diff --git a/das/src/main/java/com/das/common/constant/ProtocolTypeIds.java b/das/src/main/java/com/das/common/constant/ProtocolTypeIds.java index 6ca24904..12ceb68f 100644 --- a/das/src/main/java/com/das/common/constant/ProtocolTypeIds.java +++ b/das/src/main/java/com/das/common/constant/ProtocolTypeIds.java @@ -16,8 +16,14 @@ public interface ProtocolTypeIds { * MODBUS RTU 串口主协议 */ Integer MODBUS_RTU_MASTER = 12; + + Integer MODBUS_BECKHOFF = 80; + + Integer ADS_BECKHOFF = 81; /** * MODBUS TCP 主协议 */ Integer MODBUS_TCP_MASTER = 16; + + Integer MODBUS_TCP_SLAVER = 17; } diff --git a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java index b7ba3fd8..834ec466 100644 --- a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java +++ b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java @@ -146,10 +146,11 @@ public class SysNodeController { @PostMapping("/protocol/type") public R queryProtocolTypeList() { List typeVoList= new ArrayList<>(); - typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.IEC_104_MASTER,"IEC104主")); + //typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.IEC_104_MASTER,"IEC104主")); + typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.MODBUS_BECKHOFF,"倍福MODBUS")); + typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.ADS_BECKHOFF,"倍福ADS")); + typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.MODBUS_TCP_SLAVER,"MODBUS TCP从")); typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.IEC_104_SLAVER,"IEC104从")); - typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.MODBUS_RTU_MASTER,"MODBUS RTU主")); - typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.MODBUS_TCP_MASTER,"MODBUS TCP主")); return R.success(typeVoList); }