I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
陈思洁 6 years ago
parent 3ef115bbe2 23f0503454
commit d69e863959
14 changed files with 237 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
Unescape Escape View File

@ -667,7 +667,7 @@ public class AndonEnumUtil {
QUALITY("QUALITY_ALARM", 111020006, "质量"),
EQUIP("EQUMENT_ALARM", 111020007, "设备"),
PROCESS("ROUTING_ALARM", 111020008, "工艺"),
CHECK("OTHER_ALARM", 111020009, "其他"),
CHECK("OTHER_ALARM", 111020009, "自处理"),
FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
private String value;

10
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java
Unescape Escape View File

@ -141,9 +141,13 @@ public class LacEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STACK_STATUS{
RUNNING(1,"运行中"),
PAUSE(2,"暂停"),
FINISH(3,"完成");
INIT(10,"初始化"),
WAIT(20,"等待中"),
RUNNING(30,"运行中"),
PAUSE(40,"手动暂停"),
FINISH(100,"执行完成"),
RUN_ERROR(101,"运行异常"),
RUN_STOP(102,"手动结束");
private int value;
private String description;

33
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -1900,4 +1900,37 @@ public class MesPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {
PLC("PLC", "PLC"),
DB("DB", "DB");
private String value;
private String description;
ONLINE_SEND_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

6
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java
Unescape Escape View File

@ -83,7 +83,7 @@ public class LacCommandStackRecord extends BaseBean {
@Column(name="STACK_SPEND")
@ApiParam(value ="执行耗时")
private Integer stackSpend;
private Long stackSpend;
@Column(name="STACK_STATUS")
@ApiParam(value ="执行状态")
@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean {
private String executionDescription;
@Transient
@ApiParam(value ="指令集模板")
private LacCommandStackTemplate template;
@Transient
@ApiParam(value ="步骤列表")
private List<LacCommandStackStep> stepList;

8
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
Unescape Escape View File

@ -79,4 +79,12 @@ public class LacCommandStackStep extends BaseBean {
@Transient
@ApiParam(value ="步骤任务列表")
private List<LacCommandStackStepTask> stepTaskList;
public LacCommandStackStep() {
}
public LacCommandStackStep(Long templateId) {
this.templateId = templateId;
}
}

16
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
Unescape Escape View File

@ -73,6 +73,10 @@ public class LacCommandStackStepTask extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
/**
* 不建议使用
*/
@Deprecated
@Column(name="TASK_INSTANCE_ID")
@ApiParam(value ="任务实例ID")
@JsonSerialize(using = ToStringSerializer.class)
@ -102,7 +106,19 @@ public class LacCommandStackStepTask extends BaseBean {
@Column(name="IS_CRUX")
@ApiParam(value ="是否关键")
private Integer isCrux;
@Transient
@ApiParam(value ="适配任务")
private LacSuitTask lacSuitTask;
@Transient
@ApiParam(value ="适配任务记录")
private LacLogTask logTask;
public LacCommandStackStepTask() {
}
public LacCommandStackStepTask(Long templateId) {
this.templateId = templateId;
}
}

40
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
Unescape Escape View File

@ -10,10 +10,8 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.List;
/**
* @Description :
@ -32,6 +30,12 @@ import javax.persistence.Table;
public class LacLogTask extends BaseBean {
private static final long serialVersionUID = 674009105885048131L;
@Column(name="COMMAND_STACK_RECORD_ID")
@ApiParam(value ="指令集记录ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackRecordId;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -50,6 +54,10 @@ public class LacLogTask extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="COMMAND_STACK_TYPE_NAME_RDD")
@ApiParam(value ="指令集类型名称")
private String commandStackTypeNameRdd;
@Column(name="STEP_ID")
@ApiParam(value ="步骤ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -61,7 +69,7 @@ public class LacLogTask extends BaseBean {
@Column(name="STEP_SEQUENCE")
@ApiParam(value ="步骤顺序")
private String stepSequence;
private Integer stepSequence;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@ -72,16 +80,25 @@ public class LacLogTask extends BaseBean {
@ApiParam(value ="任务名称")
private String taskNameRdd;
@Column(name="TASK_NAME_TYPE")
@Column(name="TASK_TYPE_ID")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskNameType;
private Long taskTypeId;
@Column(name="TASK_TYPE_NAME_RDD")
@ApiParam(value ="任务类型")
private String taskTypeNameRdd;
@Column(name="adapterId")
@ApiParam(value ="适配器ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long adapterId;
@Column(name="TASK_DETAIL_ID")
@ApiParam(value ="任务执行记录明细" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskDetailId;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
@ -97,10 +114,17 @@ public class LacLogTask extends BaseBean {
@Column(name="TASK_SPEND")
@ApiParam(value ="任务耗时")
private Integer taskSpend;
private Long taskSpend;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务状态")
private Integer taskStatus;
@Column(name="EXECUTION_DESCRIPTION")
@ApiParam(value ="执行说明")
private String executionDescription;
@Transient
@ApiParam(value ="步骤列表")
private List<LacLogTaskDetail> detailList;
}

25
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
Unescape Escape View File

@ -33,6 +33,12 @@ public class LacLogTaskDetail extends BaseBean {
private static final long serialVersionUID = -4918694502072594064L;
@Column(name="COMMAND_STACK_RECORD_ID")
@ApiParam(value ="指令集记录ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackRecordId;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -48,11 +54,21 @@ public class LacLogTaskDetail extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
@Column(name="LOG_TASK_ID")
@ApiParam(value ="任务实例ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long logTaskId;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_TYPE_ID")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskTypeId;
@Column(name="TASK_NAME_TYPE")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
@ -71,6 +87,10 @@ public class LacLogTaskDetail extends BaseBean {
@ApiParam(value ="任务结束时间")
private String taskEndTime;
@Column(name="TASK_SPEND")
@ApiParam(value ="任务耗时")
private Long taskSpend;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
@ -91,4 +111,9 @@ public class LacLogTaskDetail extends BaseBean {
@ApiParam(value ="任务出参处理后")
private String outputParameterBody;
@Lob
@Column(name="OUTPUT_PARAMETER_BODY")
@ApiParam(value ="任务执行异常信息")
private String errorMessage;
}

7
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
Unescape Escape View File

@ -1,15 +1,12 @@
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;
@ -76,6 +73,10 @@ public class LacSuitCase extends BaseBean {
@ApiParam(value ="硬件类型")
private Integer hardwareType;
@Column(name="SOFTWARE_SUIT_CODE")
@ApiParam(value ="软适配代码")
private String softwareSuitCode;
@Column(name="RETURN_METHOD")
@ApiParam(value ="返回类型")
private Integer returnMethod;

10
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java
Unescape Escape View File

@ -119,6 +119,8 @@ public class LacSuitTask extends BaseBean {
@ApiParam(value ="任务描述")
private String taskDescription;
/********************************** 虚拟字段 **********************************/
@Transient
@ApiParam(value ="适配套件")
private LacSuitCase lacSuitCase;
@ -128,10 +130,6 @@ public class LacSuitTask extends BaseBean {
private Long taskInstanceId;
@Transient
@ApiParam(value ="适配参数")
private List<LacSuitTaskParam> lacSuitTaskParamList;
@Transient
@ApiParam(value ="适配原始参数")
private Object orginParam;
@ -148,6 +146,10 @@ public class LacSuitTask extends BaseBean {
private Object transMessage;
@Transient
@ApiParam(value ="适配参数")
private List<LacSuitTaskParam> lacSuitTaskParamList;
@Transient
@ApiParam(value ="入参适配")
private List<LacSuitTaskParamAdapter> inputParamAdapterList;

71
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.lac.bean.*;
import java.util.List;
/**
* @Description :
* @Reference :
@ -32,6 +34,75 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacLogTask(LacLogTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List<Long> idList) {
DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ;
DdlPreparedPack.getInPackList(idList,"id",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List<Long> taskIdList) {
DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean);
DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List<Long> taskIdList) {
DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean);
DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
return ddlPackBean;
}

32
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -432,15 +432,11 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (!StringUtils.isEmpty(mesConfig.getCfgCode())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
}
if (!StringUtils.isEmpty(mesConfig.getCfgName())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
}
if (mesConfig.getIsValid() != null) {
DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
}
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
DdlPreparedPack.getStringEqualPack(mesConfig.getCfgKey(), "cfgKey", packBean);
DdlPreparedPack.getStringEqualPack(mesConfig.getCfgType(), "cfgType", packBean);
DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
return packBean;
}
@ -1399,8 +1395,9 @@ public class MesHqlPack {
}
/**
<<<<<<< Updated upstream
* <<<<<<< Updated upstream
* MES 缺陷查询条件封装
*
* @param mesDefect
* @param organizeCode
* @return
@ -1421,6 +1418,7 @@ public class MesHqlPack {
/**
* MES 产品类型图片查询条件封装
*
* @param mesProduceCtgyPicture
* @param organizeCode
* @return
@ -1440,7 +1438,9 @@ public class MesHqlPack {
}
/** 设备通知对象配置 查询条件封装
/**
* 设备通知对象配置 查询条件封装
*
* @param mesEquNotifyObjectCfg
* @param organizeCode
* @return
@ -1462,7 +1462,9 @@ public class MesHqlPack {
return packBean;
}
/** 设备作业通知配置 查询条件封装
/**
* 设备作业通知配置 查询条件封装
*
* @param mesEquTaskNotifyCfg
* @param organizeCode
* @return
@ -1489,6 +1491,7 @@ public class MesHqlPack {
/**
* MES 类型信息查询条件封装
*
* @param mesTypeCfg
* @param organizeCode
* @return
@ -1512,6 +1515,7 @@ public class MesHqlPack {
/**
* MES 缺陷原因查询条件封装
*
* @param mesDefectCause
* @param organizeCode
* @return
@ -1532,6 +1536,7 @@ public class MesHqlPack {
/**
* 按条件分页查询mes设备点检保养维修作业
*
* @param mesEquTaskDetail
* @param organizeCode
* @return
@ -1555,6 +1560,7 @@ public class MesHqlPack {
/**
* 按条件分页查询首检件配置信息
*
* @param mesFiCfg
* @param organizeCode
* @return
@ -1575,6 +1581,7 @@ public class MesHqlPack {
/**
* 维修记录
*
* @param mesEquTaskRepairRecord
* @param organizeCode
* @return
@ -1589,6 +1596,7 @@ public class MesHqlPack {
/**
* 点检或保养记录
*
* @param mesEquTaskStandardRecord
* @param organizeCode
* @return

7
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.util.List;
@ -25,4 +26,10 @@ public class LacSuitRequest {
*/
private List<Task> taskList;
/**
* 指令集代码
*/
@XStreamCDATA
private String paramList;
}

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@ -16,5 +17,6 @@ public class Task {
private String code;
@XStreamCDATA
private Object paramList;
}

Write Preview
Loading…
Cancel
Save