From aab18be0e6f0846af4611b7fb6ad7fdae66302d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 13 Nov 2019 20:04:32 +0800 Subject: [PATCH] =?UTF-8?q?Lac=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=20OPC?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) 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; }