diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index be98ac7..d64eb01 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -62,7 +62,8 @@ public class LacEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HARDWARE_TYPE { OPC_READ(10, "读OPC"), - OPC_WRITE(20, "写OPC"); + OPC_WRITE(20, "写OPC"), + OPC_SUBSCRIPTION(30, "订阅OPC"); private int value; private String description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index 8471c44..e9cacb4 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -77,7 +77,7 @@ public class LacCommandStackStep extends BaseBean { private Double stepExecCond; @Column(name="STEP_DESCRIPTION") - @ApiParam(value ="步骤执行条件") + @ApiParam(value ="步骤描述") private String stepDescription; @Transient diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index e39f612..6bb3a32 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -67,6 +67,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean); + return ddlPackBean; }