日志开关

lac优化
OPC UA工具类

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -1128,7 +1128,6 @@ public class CommonEnumUtil {
         }
     }
 
-
     // 数据有效的静态常量
     public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();
     // 数据未删除的静态常量

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1023,7 +1023,8 @@ public class ImppEnumUtil {
         MAIL(3, "邮件配置"),
         CONTACT(4, "联系人"),
         BASIS(5, "基础"),
-        CONFIG(6, "系统配置");
+        CONFIG(6, "系统配置"),
+        LOG(7, "日志配置");
 
         private int value;
         private String description;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java

@@ -91,7 +91,7 @@ public class LacSuitTaskParamAdapter extends BaseBean {
 
     @Column(name="TRANSFER_PARAM_VALUE_TYPE")
     @ApiParam(value ="转换后参数值类型")
-    private String transferParamValueType;
+    private Integer transferParamValueType;
 
     @Column(name="DEFAULT_VALUE")
     @ApiParam(value ="参数默认值")

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -94,6 +94,8 @@ public class LacHqlPack {
 
     public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java

@@ -1,14 +1,12 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -57,7 +55,7 @@ public class SysConfig extends BaseBean {
     private String configValue;
 
     @Column(name="CONFIG_VALUE_OPTION")
-    @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}")
+    @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{\"key\":\"value\"}")
     private String configValueOption;
 
     @Column(name="CONFIG_DESCRIPTION")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -334,6 +334,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);