diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
index 6a0a0d2..eddecd7 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
@@ -21,4 +21,5 @@ public @interface FieldAnnotation {
int pric() default 2; // 对于浮点型，界面显示的精度
boolean mainkey() default false; // 是否为主键
String defaultValue() default ""; // 字段的默认值
+ boolean popSearch() default false; // 弹出选择对象时是否显示
}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
index f302131..aedbbcd 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
@@ -44,6 +44,10 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="类型名称")
private String typeName;
+ @Column(name="TYPE_FULL_NAME")
+ @ApiParam(value ="类型全名称包含路径")
+ private String typeFullName;
+
@Column(name="CUSTOMIZE")
@ApiParam(value ="是否为自定义字段")
private Boolean customize;
@@ -84,6 +88,10 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="字段默认值")
private String defaultValue;
+ @Column(name="POP_SEARCH")
+ @ApiParam(value ="弹出选择时是否显示")
+ private Boolean popSearch;
+
@ApiParam(value ="枚举项内容")
private transient Enum[] enumItems;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
index 70f77de..261164e 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
@@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@@ -29,4 +30,9 @@ public class SysParam extends BaseAPS {
@Column(name="MAX_INTERRUPT_COUNT")
@ApiParam(value ="最大中断次数")
private Integer maxInterruptCount;
+
+ @Column(name="RULE_GROUP_ID")
+ @ApiParam(value ="规则组id")
+ @FieldAnnotation(display = false)
+ private Long ruleGroupId;
}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
index b434092..0cb563a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
@@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.common;
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -18,10 +19,12 @@ import javax.persistence.MappedSuperclass;
public abstract class BaseCode extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="编码")
+ @FieldAnnotation(popSearch = true)
private String code;
@Column(name="NAME")
@ApiParam(value ="名称")
+ @FieldAnnotation(popSearch = true)
private String name;
@Column(name="REMARK")
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
new file mode 100644
index 0000000..84fb49f
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+
+/**
+ * @Description :
+ *
+ *
create table LacInstructionSetStep(
+ *
templateId bigint null,
+ *
templateNameRdd varchar(50) null,
+ *
templateCode varchar(50) null,
+ *
stepName varchar(50) null,
+ *
stepSort int null,
+ *
stepExecCond double null,
+ *
stepDescription varchar(255) null
+ *
);
+ *
+ *
comment on table LacInstructionSetStep is'指令集模板步骤';
+ *
comment on column LacInstructionSetStep.templateId is'模板id';
+ *
comment on column LacInstructionSetStep.templateNameRdd is'模板名称';
+ *
comment on column LacInstructionSetStep.templateCode is'模板代码';
+ *
comment on column LacInstructionSetStep.stepName is'步骤名称';
+ *
comment on column LacInstructionSetStep.stepSort is'步骤顺序';
+ *
comment on column LacInstructionSetStep.stepExecCond is'步骤执行条件';
+ *
comment on column LacInstructionSetStep.stepDescription is'步骤描述';
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-25 下午5:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_COMMAND_STACK_STEP")
+@Api(value="指令集模板",description = "指令集模板信息")
+public class LacCommandStackStep extends BaseBean {
+
+ @Column(name="TEMPLATE_ID")
+ @ApiParam(value ="模板ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long templateId;
+
+ @Column(name="STEP_NAME")
+ @ApiParam(value ="模板名称")
+ private String stepName;
+
+ @Column(name="STEP_CODE")
+ @ApiParam(value ="模板代码")
+ private String stepCode;
+
+ @Column(name="STEP_SORT")
+ @ApiParam(value ="步骤顺序")
+ private Integer stepSort;
+
+ @Column(name="STEP_EXEC_COND")
+ @ApiParam(value ="步骤执行条件")
+ private Integer stepExecCond;
+
+ @Column(name="STEP_DESCRIPTION")
+ @ApiParam(value ="步骤执行条件")
+ private String stepDescription;
+
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
new file mode 100644
index 0000000..a0aac59
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
@@ -0,0 +1,102 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+
+/**
+ * @Description :
+ *
+ *
create table LacInstructionSetStepTask(
+ *
templateId bigint null,
+ *
templateNameRdd varchar(50) null,
+ *
templateCode varchar(50) null,
+ *
stepId bigint null,
+ *
stepNameRdd varchar(50) null,
+ *
taskId bigint null,
+ *
taskNameRdd varchar(50) null,
+ *
taskCode varchar(50) null,
+ *
isCrux int null
+ *
);
+ *
+ *
comment on table LacInstructionSetStepTask is'指令集模板步骤任务';
+ *
comment on column LacInstructionSetStepTask.templateId is'模板id';
+ *
comment on column LacInstructionSetStepTask.templateNameRdd is'模板名称';
+ *
comment on column LacInstructionSetStepTask.templateCode is'模板代码';
+ *
comment on column LacInstructionSetStepTask.stepId is'步骤id';
+ *
comment on column LacInstructionSetStepTask.stepNameRdd is'步骤名称';
+ *
comment on column LacInstructionSetStepTask.taskId is'任务id';
+ *
comment on column LacInstructionSetStepTask.taskNameRdd is'任务名称';
+ *
comment on column LacInstructionSetStepTask.taskCode is'任务代码';
+ *
comment on column LacInstructionSetStepTask.isCrux is'是否关键';
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-25 下午6:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_COMMAND_STACK_STEP_TASK")
+@Api(value="步骤任务",description = "步骤任务信息")
+public class LacCommandStackStepTask extends BaseBean {
+
+ @Column(name="TEMPLATE_ID")
+ @ApiParam(value ="模板ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long templateId;
+
+// @Column(name="TEMPLATE_NAME_RDD")
+// @ApiParam(value ="模板名称")
+// private String templateNameRdd;
+//
+// @Column(name="TEMPLATE_CODE_RDD")
+// @ApiParam(value ="模板代码")
+// private String templateCodeRdd;
+
+
+ @Column(name="STEP_ID")
+ @ApiParam(value ="步骤ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long stepId;
+//
+// @Column(name="STEP_NAME_RDD")
+// @ApiParam(value ="步骤名称")
+// private String stepNameRdd;
+//
+// @Column(name="STEP_CODE_RDD")
+// @ApiParam(value ="步骤代码")
+// private String stepCodeRdd;
+
+ @Column(name="TASK_ID")
+ @ApiParam(value ="任务ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long taskId;
+
+ @Column(name="STEP_NAME_RDD")
+ @ApiParam(value ="步骤名称")
+ private String taskNameRdd;
+
+ @Column(name="STEP_CODE_RDD")
+ @ApiParam(value ="任务代码")
+ private String taskCodeRdd;
+
+
+ @Column(name="IS_CRUX")
+ @ApiParam(value ="是否关键")
+ private Integer isCrux;
+
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java
new file mode 100644
index 0000000..11ff867
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java
@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+
+/**
+ * @Description :
+ *
+ *
create table instructionSetTemplate(
+ *
templateName varchar(50) null,
+ *
templateCode varchar(50) null,
+ *
templateTypeId bigint null,
+ *
templateTypeNameRdd varchar(50) null,
+ *
templateDescription varchar(50) null,
+ *
templateStepNum int null
+ *
);
+ *
+ *
comment on table instructionSetTemplate is'指令集模板';
+ *
comment on column instructionSetTemplate.templateName is'模板名称';
+ *
comment on column instructionSetTemplate.templateCode is'模板代码';
+ *
comment on column instructionSetTemplate.templateTypeId is'模板大类id';
+ *
comment on column instructionSetTemplate.templateTypeNameRdd is'模板大类名称';
+ *
comment on column instructionSetTemplate.templateDescription is'模板描述';
+ *
comment on column instructionSetTemplate.templateStepNum is'模板步骤';
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-25 下午5:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_COMMAND_STACK_TEMPLATE")
+@Api(value="指令集模板",description = "指令集模板信息")
+public class LacCommandStackTemplate extends BaseBean {
+
+ @Column(name="TEMPLATE_NAME")
+ @ApiParam(value ="模板名称")
+ private String templateName;
+
+ @Column(name="TEMPLATE_CODE")
+ @ApiParam(value ="模板代码")
+ private String templateCode;
+
+ @Column(name="STACK_TYPE_ID")
+ @ApiParam(value ="指令集类型")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long stackTypeId;
+
+ @Column(name="STACK_TYPE_NAME_RDD")
+ @ApiParam(value ="类型名称")
+ private String stackTypeNameRdd;
+
+ @Column(name="TYPE_DESCRIPTION")
+ @ApiParam(value ="模板大类名称")
+ private String typeDescription;
+
+ @Column(name="TEMPLATE_NUM")
+ @ApiParam(value ="适配器使用数量")
+ private Integer templateNum;
+
+ @Column(name="TEMPLATE_DESCRIPTION")
+ @ApiParam(value ="模板描述")
+ private String templateDescription;
+
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
new file mode 100644
index 0000000..af6e6fb
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+
+/**
+ * @Description :
+ *
+ *
create table LacSuitCase(
+ *
sutiCaseId bigint null,
+ *
sutiCaseNameRdd varchar(50) null,
+ *
suitCaseCode varchar(50) null,
+ *
sutiType int null,
+ *
hardwareType int null,
+ *
returnMethod int null,
+ *
timeout int null,
+ *
retryNum int null,
+ *
successNum int null,
+ *
failNum int null,
+ *
countNum int null,
+ *
sutiCaseStatus int null
+ *
);
+ *
+ *
comment on table LacSuitCase is'适配器';
+ *
comment on column LacSuitCase.sutiCaseId is'适配器id'; 不推荐使用ID绑定，数据库调整会有变动，推荐使用Code 绑定
+ *
comment on column LacSuitCase.sutiCaseNameRdd is'适配器名称';
+ *
comment on column LacSuitCase.suitCaseCode is'适配器代码';
+ *
comment on column LacSuitCase.sutiType is'适配器类型（枚举）';
+ *
comment on column LacSuitCase.hardwareType is'硬件类型（枚举）';
+ *
comment on column LacSuitCase.returnMethod is'返回方式（枚举）';
+ *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中
+ *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中
+ *
comment on column LacSuitCase.successNum is'成功次数'; -> 移至 任务当中
+ *
comment on column LacSuitCase.failNum is'失败次数'; -> 移至 任务当中
+ *
comment on column LacSuitCase.countNum is'总次数'; -> 移至 任务当中
+ *
comment on column LacSuitCase.sutiCaseStatus is'适配器状态';
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-25 下午6:08
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_SUIT_CASE")
+@Api(value="适配器",description = "适配器信息")
+public class LacSuitCase extends BaseBean {
+
+ @Column(name="SUTI_CASE_NAME_RDD")
+ @ApiParam(value ="适配器名称")
+ private String sutiCaseNameRdd;
+
+ @Column(name="SUIT_CASE_CODE_RDD")
+ @ApiParam(value ="适配器代码")
+ private String suitCaseCodeRdd;
+
+ @Column(name="SUTI_TYPE")
+ @ApiParam(value ="适配器类型")
+ private Integer sutiType;
+
+ @Column(name="HARDWARE_TYPE")
+ @ApiParam(value ="硬件类型")
+ private Integer hardwareType;
+
+ @Column(name="RETURN_METHOD")
+ @ApiParam(value ="返回类型")
+ private Integer returnMethod;
+
+ @Column(name="SUTI_CASE_STATUS")
+ @ApiParam(value ="适配器状态")
+ private Integer sutiCaseStatus;
+
+ @Column(name="SUIT_CASE_DESCRIPTION")
+ @ApiParam(value ="适配器描述")
+ private String suitCaseDescription;
+
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java
new file mode 100644
index 0000000..d9af1a4
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java
@@ -0,0 +1,116 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+
+/**
+ * @Description :
+ *
+ *
create table LacSuitTask(
+ *
taskName varchar(50) null,
+ *
taskCode varchar(50) null,
+ *
taskTypeId bigint null,
+ *
taskTypeNameRdd varchar(50) null,
+ *
suitCaseId bigint null,
+ *
suitCaseCode varchar(50) null,
+ *
suitCaseNameRdd varchar(50) null,
+ *
successNum int null,
+ *
failNum int null,
+ *
countNum int null,
+ *
taskDescription varchar(255) null
+ *
);
+ *
comment on table LacSuitTask is'适配任务';
+ *
comment on column LacSuitTask.taskName is'任务名称';
+ *
comment on column LacSuitTask.taskCode is'任务代码';
+ *
comment on column LacSuitTask.taskTypeId is'任务大类id';
+ *
comment on column LacSuitTask.taskTypeNameRdd is'任务大类名称';
+ *
comment on column LacSuitTask.suitCaseId is'适配器id';
+ *
comment on column LacSuitTask.suitCaseCode is'适配器代码';
+ *
comment on column LacSuitTask.suitCaseNameRdd is'适配器名称';
+ *
comment on column LacSuitTask.successNum is'成功次数';
+ *
comment on column LacSuitTask.failNum is'适配次数';
+ *
comment on column LacSuitTask.countNum is'总次数';
+ *
comment on column LacSuitTask.taskDescription is'任务描述';
+ *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中
+ *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-25 下午6:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_SUIT_TASK")
+@Api(value="调度任务",description = "调度任务信息")
+public class LacSuitTask extends BaseBean {
+
+ @Column(name="TASK_NAME")
+ @ApiParam(value ="适配器名称")
+ private String taskName;
+
+ @Column(name="TASK_CODE")
+ @ApiParam(value ="适配器代码")
+ private String taskCode;
+
+ @Column(name="TASK_TIMEOUT")
+ @ApiParam(value ="超时时间")
+ private Integer taskTimeout;
+
+ @Column(name="TASK_RETRY_NUM")
+ @ApiParam(value ="重试次数")
+ private Integer taskRetryNum;
+
+ @Column(name="TASK_TYPE_ID")
+ @ApiParam(value ="任务类型")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long taskTypeId;
+
+ @Column(name="TASK_TYPE_NAME_RDD")
+ @ApiParam(value ="任务类型名称")
+ private String taskTypeNameRdd;
+
+ @Column(name="SUIT_CASE_ID")
+ @ApiParam(value ="适配器ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long suitCaseId;
+
+ @Column(name="SUTI_CASE_NAME_RDD")
+ @ApiParam(value ="适配器名称")
+ private String suitCaseNameRdd;
+
+ @Column(name="SUIT_CASE_CODE_RDD")
+ @ApiParam(value ="适配器代码")
+ private String suitCaseCodeRdd;
+
+ @Column(name="NUM_SUCCESS")
+ @ApiParam(value ="执行成功次数")
+ private Integer numSuccess = 0;
+
+ @Column(name="NUM_FAIL")
+ @ApiParam(value ="执行失败次数")
+ private Integer numFail = 0;
+
+ @Column(name="NUM_COUNT")
+ @ApiParam(value ="执行次数")
+ private Integer numCount = 0;
+
+ @Column(name="TASK_DESCRIPTION")
+ @ApiParam(value ="任务描述")
+ private String taskDescription;
+
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
new file mode 100644
index 0000000..2b4b3af
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+
+/**
+ * @Description :
+ *
+ *
create table LacSuitTaskParam(
+ *
suitTaskId bigint null,
+ *
suitTaskName varchar(50) null,
+ *
suitTaskCode varchar(50) null,
+ *
paramName varchar(50) null,
+ *
paramType int null,
+ *
paramValueType int null,
+ *
defaultValue varchar(50) null,
+ *
paramDescrition varchar(255) null
+ *
);
+ *
comment on table LacSuitTaskParam is'适配任务参数';
+ *
comment on column LacSuitTaskParam.suitTaskId is'适配任务id';
+ *
comment on column LacSuitTaskParam.suitTaskName is'适配任务名称';
+ *
comment on column LacSuitTaskParam.suitTaskCode is'适配任务代码';
+ *
comment on column LacSuitTaskParam.paramName is'参数名称';
+ *
comment on column LacSuitTaskParam.paramType is'参数类型(枚举)';
+ *
comment on column LacSuitTaskParam.paramValueType is'参数值类型(枚举)';
+ *
comment on column LacSuitTaskParam.defaultValue is'默认值';
+ *
comment on column LacSuitTaskParam.paramDescrition is'参数描述';
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-25 下午6:49
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_SUIT_TASK_PARAM")
+@Api(value="调度任务参数",description = "调度任务参数信息")
+public class LacSuitTaskParam extends BaseBean {
+
+ @Column(name="TASK_ID")
+ @ApiParam(value ="任务ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long taskId;
+
+ @Column(name="TASK_NAME_RDD")
+ @ApiParam(value ="任务名称")
+ private String taskNameRdd;
+
+ @Column(name="TASK_CODE_RDD")
+ @ApiParam(value ="任务代码")
+ private String taskCodeRdd;
+
+ @Column(name="PARAM_NAME")
+ @ApiParam(value ="参数名称")
+ private String paramName;
+
+ @Column(name="PARAM_CODE")
+ @ApiParam(value ="参数编码")
+ private String paramCode;
+
+ @Column(name="PARAM_TYPE")
+ @ApiParam(value ="参数类型")
+ private Integer paramType;
+
+ @Column(name="PARAM_VALUE_TYPE")
+ @ApiParam(value ="参数值类型")
+ private Integer paramValueType;
+
+ @Column(name="PARAM_DEFAULT_VALUE")
+ @ApiParam(value ="参数默认值")
+ private String paramDefaultValue;
+
+ @Column(name="PARAM_DESCRIPTION")
+ @ApiParam(value ="参数描述")
+ private String paramDescription;
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java
new file mode 100644
index 0000000..b44528b
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java
@@ -0,0 +1,100 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+
+/**
+ * @Description :
+ *
+ *
create table LacSuitTaskParamAdapter(
+ *
sutiTaskId bigint null,
+ *
suitTaskCode varchar(50) null,
+ *
suitTaskNameRdd varchar(50) null,
+ *
paramId bigint null,
+ *
paramName varchar(50) null,
+ *
paramType int null,
+ *
paramValueType int null,
+ *
defaultValue varchar(50) null,
+ *
transferParamName varchar(50) null,
+ *
transferParamValueType int null
+ *
);
+ *
comment on table LacSuitTaskParamAdapter is'适配任务参数转换';
+ *
comment on column LacSuitTaskParamAdapter.sutiTaskId is'适配任务id';
+ *
comment on column LacSuitTaskParamAdapter.suitTaskCode is'适配任务代码';
+ *
comment on column LacSuitTaskParamAdapter.suitTaskNameRdd is'适配任务名称';
+ *
comment on column LacSuitTaskParamAdapter.paramId is'参数id';
+ *
comment on column LacSuitTaskParamAdapter.paramName is'参数名称';
+ *
comment on column LacSuitTaskParamAdapter.paramType is'参数类型(枚举)';
+ *
comment on column LacSuitTaskParamAdapter.paramValueType is'参数值类型(枚举)';
+ *
comment on column LacSuitTaskParamAdapter.defaultValue is'默认值';
+ *
comment on column LacSuitTaskParamAdapter.transferParamName is'转换后参数名称';
+ *
comment on column LacSuitTaskParamAdapter.transferParamValueType is'转换后参数值类型';
+ *
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-25 下午1:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="LAC_SUIT_TASK_PARAM_ADAPTER")
+@Api(value="调度任务参数转换",description = "调度任务参数转换信息")
+public class LacSuitTaskParamAdapter extends BaseBean {
+
+ @Column(name="TASK_ID")
+ @ApiParam(value ="任务ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long taskId;
+
+ @Column(name="TASK_NAME_RDD")
+ @ApiParam(value ="任务名称")
+ private String taskNameRdd;
+
+ @Column(name="TASK_CODE_RDD")
+ @ApiParam(value ="任务代码")
+ private String taskCodeRdd;
+
+ @Column(name="PARAM_ID")
+ @ApiParam(value ="参数ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long paramId;
+
+ @Column(name="PARAM_NAME")
+ @ApiParam(value ="参数名称")
+ private String paramName;
+
+ @Column(name="PARAM_TYPE")
+ @ApiParam(value ="参数类型")
+ private Integer paramType;
+
+ @Column(name="PARAM_VALUE_TYPE")
+ @ApiParam(value ="参数值类型")
+ private Integer paramValueType;
+
+ @Column(name="TRANSFER_PARAM_NAME")
+ @ApiParam(value ="转换后参数名称")
+ private String transferParamName;
+
+ @Column(name="TRANSFER_PARAM_VALUE_TYPE")
+ @ApiParam(value ="转换后参数值类型")
+ private String transferParamValueType;
+
+ @Column(name="DEFAULT_VALUE")
+ @ApiParam(value ="参数默认值")
+ private String defaultValue;
+
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java
new file mode 100644
index 0000000..8df6834
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-28 下午2:55
+ * @Modify:
+ **/
+public interface LacCommandStackStepRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java
new file mode 100644
index 0000000..4db8217
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-28 下午2:55
+ * @Modify:
+ **/
+public interface LacCommandStackStepTaskRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java
new file mode 100644
index 0000000..6aa60e8
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-28 下午2:56
+ * @Modify:
+ **/
+public interface LacCommandStackTemplateRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java
new file mode 100644
index 0000000..c4d52d5
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitCase;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-28 下午2:56
+ * @Modify:
+ **/
+public interface LacSuitCaseRepository extends BaseRepository {
+}
+
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java
new file mode 100644
index 0000000..887c5b6
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-28 下午3:19
+ * @Modify:
+ **/
+public interface LacSuitTaskParamAdapterRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java
new file mode 100644
index 0000000..d1026e0
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-28 下午3:19
+ * @Modify:
+ **/
+public interface LacSuitTaskParamRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java
new file mode 100644
index 0000000..c65e6c7
--- /dev/null
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.lac.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-10-28 下午3:19
+ * @Modify:
+ **/
+public interface LacSuitTaskRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
index 1928952..c8316cc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
@@ -50,5 +50,8 @@ public class MesButtonFlagModel implements Serializable {
@ApiParam("关闭按钮-提醒")
private boolean closeButtonNoticeFlag;
+ @ApiParam("维修任务按钮")
+ private boolean repairButton;
+
}