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

合并代码  有代码丢失或者文件丢失请排查此处

Browse Source 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
yun-zuoyi
wei.peng 5 years ago
parent 8e94cbb8fa 9ee8acae91
commit 6169542dbb
98 changed files with 3128 additions and 200 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-andon</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

60
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java
Unescape Escape View File

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 org.springframework.data.annotation.Transient;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE")
@EqualsAndHashCode(callSuper = true)
@Api("作业组件")
public class AndonActionModule extends BaseBean implements Serializable {
private static final long serialVersionUID = -8909733530761576575L;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
private String amCode;
@Column(name = "AM_NAME")
@ApiParam("组件名称")
private String amName;
@Column(name = "AM_DESC")
@ApiParam("组件描述")
private String amDesc;
@Column(name = "CALL_CLASS")
@ApiParam("实现类")
private String callClass;
@Column(name = "AM_TYPE")
@ApiParam("组件类型")
private Integer amType;
@Column(name = "INTERFACE_NO")
@ApiParam("界面编号")
private String interfaceNo;
@Transient
@ApiParam("执行顺序")
private Integer seq;
}

45
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java
Unescape Escape View File

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE_GROUP")
@EqualsAndHashCode(callSuper = true)
@Api("组件集")
public class AndonActionModuleGroup extends BaseBean implements Serializable {
private static final long serialVersionUID = -8905502301880084578L;
@Column(name = "AMG_ID")
@ApiParam("组件集编号")
private Long amgId;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
private String amCode;
@Column(name = "SEQ")
@ApiParam("执行顺序")
private Integer seq;
}

54
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java
Unescape Escape View File

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Api("组件参数")
public class AndonActionModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -8216680446587969610L;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
private String amCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private String paramType;
@Column(name = "DEFAULT_VALUE")
@ApiParam("默认值")
private String defaultValue;
}

50
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java
Unescape Escape View File

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/05/08 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_ROUTE")
@EqualsAndHashCode(callSuper = true)
@Api("作业流程")
public class AndonActionRoute extends BaseBean implements Serializable {
private static final long serialVersionUID = 917593748015715793L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "ROUTE_NAME")
@ApiParam("流程名称")
private String routeName;
@Column(name = "ROUTE_TYPE")
@ApiParam("流程类型")
private Integer routeType;
@Lob
@Column(name = "POSITION")
@ApiParam("GOJS位置")
private String position;
}

47
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java
Unescape Escape View File

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTOR")
@EqualsAndHashCode(callSuper = true)
@Api("ACTOR信息")
public class AndonActor extends BaseBean implements Serializable {
private static final long serialVersionUID = -1472090790204808649L;
@Column(name = "ACTOR_CODE")
@ApiParam("actor代码")
private String actorCode;
@Column(name = "ACTOR_NAME")
@ApiParam("actor名称")
private String actorName;
@Column(name = "ACTOR_Class")
@ApiParam("actor名称")
private String actorClass;
}

46
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTOR_RULE")
@EqualsAndHashCode(callSuper = true)
@Api("ACTOR消息获取规则")
public class AndonActorRule extends BaseBean implements Serializable {
private static final long serialVersionUID = 3244584643305867326L;
@Column(name = "ACTOR_CODE")
@ApiParam("actor代码")
private String actorCode;
@Column(name = "MT_CODE")
@ApiParam("消息类型代码")
private String mtCode;
@Column(name = "SPECIFIC_RULE")
@ApiParam("特定条件")
private String specificRule;
}

49
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java
Unescape Escape View File

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ALARM_ROUTE")
@EqualsAndHashCode(callSuper = true)
@Api("安灯作业流程配置")
public class AndonAlarmRoute extends BaseBean implements Serializable {
private static final long serialVersionUID = -7425423934619147746L;
@Column(name = "ALARM_CODE")
@ApiParam("安灯类型代码")
private String alarmCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "ROUTE_TYPE")
@ApiParam("流程类型")
private Integer routeType;
}

61
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java
Unescape Escape View File

@ -0,0 +1,61 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Api("安灯作业流程组件参数")
public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 6659953988053255710L;
@Column(name = "ALARM_ROUTE_ID")
@ApiParam("安灯流程ID")
private Long alarmRouteId;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "AMG_ID")
@ApiParam("组件集编号")
private Long amgId;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
private String amCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@ApiParam("参数值")
private String paramValue;
@Column(name = "STATUS_CODE")
@ApiParam("状态代码")
private String statusCode;
}

41
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java
Unescape Escape View File

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ALARM_TYPE")
@EqualsAndHashCode(callSuper = true)
@Api("安灯类型")
public class AndonAlarmType extends BaseBean implements Serializable {
private static final long serialVersionUID = -3286588436625932653L;
@Column(name = "ALARM_CODE")
@ApiParam("安灯类型代码")
private String alarmCode;
@Column(name = "ALARM_NAME")
@ApiParam("安灯类型名称")
private String alarmName;
}

26
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
Unescape Escape View File

@ -46,6 +46,18 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
private static final long serialVersionUID = 183865984747203897L;
@Transient
@ApiParam(value ="触发事件")
private String triggerEvent;
@Column(name = "ROUTE_CODE")
@ApiParam(value = "流程代码")
private String routeCode;
@Column(name = "ROUTE_STATUS_CODE")
@ApiParam(value = "状态点代码")
private String routeStatusCode;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
private Double seq;
@ -287,9 +299,13 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
/**
* 工位统计 构造函数
* @param workCenterCode
* @param workCenterNameRdd
* @param workCellCode
* @param workCellNameRdd
* @param equipmentCode
* @param equipmentNameRdd
* @param shiftCode
* @param shiftNameRdd
* @param alarmCode
* @param andonCount
*/
@ -308,12 +324,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
/**
* 原因统计 使用Java内存计算（获取原始数据）
* @param acCode
* @param acNameRdd
* @param workCenterCode
* @param workCenterNameRdd
* @param workCellCode
* @param workCellNameRdd
* @param alarmCode
* @param ecCodec
* @param ecCode
* @param ecNameRdd
* @param emCode
* @param emNameRdd
@ -340,6 +358,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
/**
* 人员统计 使用Java内存计算（获取原始数据）
* @param organizeCode
* @param workCenterNameRdd
* @param workCellCode
* @param workCellNameRdd
* @param resetUser
* @param alarmCode
* @param callTime
@ -360,6 +382,7 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
/**
* 统计分析柏拉图 使用JAVA内存计算（获取原始数据）
* @param workCenterNameRdd
* @param alarmCode
* @param ecCode
* @param ecNameRdd
@ -405,4 +428,5 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
e.printStackTrace();
}
}
}

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

@ -41,6 +41,14 @@ public class AndonManageRecord extends BaseManageQueue implements Serializable {
private static final long serialVersionUID = 4667499369694353351L;
@Column(name = "ROUTE_CODE")
@ApiParam(value = "流程代码")
private String routeCode;
@Column(name = "ROUTE_STATUS_CODE")
@ApiParam(value = "状态点代码")
private String routeStatusCode;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
private Double seq;

42
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java
Unescape Escape View File

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_MESSAGE_TYPE")
@EqualsAndHashCode(callSuper = true)
@Api("消息类型")
public class AndonMessageType extends BaseBean implements Serializable {
private static final long serialVersionUID = 6140381522677959027L;
@Column(name = "MT_CODE")
@ApiParam("消息类型代码")
private String mtCode;
@Column(name = "MT_NAME")
@ApiParam("消息类型名称")
private String mtName;
}

57
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java
Unescape Escape View File

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "PTL_ROUTE_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Api("流程组件参数")
public class AndonRouteModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -282175947799144290L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "AMG_ID")
@ApiParam("组件集编号")
private Long amgId;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
private String amCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@ApiParam("参数值")
private String paramValue;
@Column(name = "STATUS_CODE")
@ApiParam("状态代码")
private String statusCode;
}

91
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java
Unescape Escape View File

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ROUTE_STATUS")
@EqualsAndHashCode(callSuper = true)
@Api("流程状态")
public class AndonRouteStatus extends BaseBean implements Serializable {
private static final long serialVersionUID = 2091426896667989586L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "STATUS_CODE")
@ApiParam("状态代码")
private String statusCode;
@Column(name = "STATUS_NAME")
@ApiParam("状态名称")
private String statusName;
@Column(name = "NEXT_STATUS")
@ApiParam("下一状态")
private String nextStatus;
@Column(name = "TRIGGER_TYPE")
@ApiParam("触发类型")
private Integer triggerType;
@Column(name = "TRIGGER_EVENT")
@ApiParam("触发事件")
private String triggerEvent;
@Column(name = "TRIGGER_WHERE")
@ApiParam("触发条件（MVEL）")
private String triggerWhere;
@Column(name = "ACTION_AMG_ID")
@ApiParam("触发调用")
private Long actionAmgId;
@Column(name = "IN_AMG_ID")
@ApiParam("进入状态调用")
private Long inAmgId;
@Column(name = "OUT_AMG_ID")
@ApiParam("离开状态调用")
private Long outAmgId;
@Column(name = "STATUS_TYPE")
@ApiParam("状态类型")
private Integer statusType;
@Transient
@ApiParam("默认不缓存")
private boolean cacheFlag = false;
@Transient
@ApiParam("触发组件集默认未执行")
private boolean actionAmgIdFalg = false;
@Transient
@ApiParam("触发组件集默认未执行")
private boolean checkTriggerTypeFalg = false;
}

27
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java
Unescape Escape View File

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.andon.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author wangjie
* @date 2020/2/12 18:18
* @desc
*/
@Data
@ApiModel("作业组件model")
public class ActionModuleModel {
@ApiModelProperty("组件代码")
private String amCode;
@ApiModelProperty("调用类")
private String callClass;
@ApiModelProperty("是否完成")
private Boolean isComplete;
@ApiModelProperty("执行顺序")
private Integer seq;
}

84
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java
Unescape Escape View File

@ -0,0 +1,84 @@
package cn.estsh.i3plus.pojo.andon.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@ApiModel("状态点model")
public class AndonRouteStatusModel implements Serializable {
private static final long serialVersionUID = -6258870691272170423L;
@ApiParam("流程代码")
private String routeCode;
@ApiParam("状态代码")
private String statusCode;
@ApiParam("状态名称")
private String statusName;
@ApiParam("下一状态")
private String nextStatus;
@ApiParam("触发类型")
private Integer triggerType;
@ApiParam("触发事件")
private String triggerEvent;
@ApiParam("触发条件（MVEL）")
private String triggerWhere;
@ApiParam("触发调用")
private Long actionAmgId;
@ApiParam("进入状态调用")
private Long inAmgId;
@ApiParam("离开状态调用")
private Long outAmgId;
@ApiParam("状态类型")
private Integer statusType;
@ApiParam("安灯类型代码")
private String alarmCode;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("流程类型")
private Integer routeType;
public AndonRouteStatusModel() {
}
public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType,
String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId,
Integer statusType, String alarmCode, String workCenterCode, Integer routeType) {
this.routeCode = routeCode;
this.statusCode = statusCode;
this.statusName = statusName;
this.nextStatus = nextStatus;
this.triggerType = triggerType;
this.triggerEvent = triggerEvent;
this.triggerWhere = triggerWhere;
this.actionAmgId = actionAmgId;
this.inAmgId = inAmgId;
this.outAmgId = outAmgId;
this.statusType = statusType;
this.alarmCode = alarmCode;
this.workCenterCode = workCenterCode;
this.routeType = routeType;
}
}

46
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.andon.model;
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@ApiModel("通用数据传输对象")
public class CommonMsgModel implements Serializable {
private static final long serialVersionUID = -1772176070851992335L;
@ApiModelProperty("工厂")
private String organizeCode;
@ApiModelProperty("用户信息")
private String userInfo;
@ApiModelProperty("消息类型")
private String msgType;
@ApiModelProperty("消息数据")
private Map<String, Object> msgData;
@ApiModelProperty("流程状态集合")
private List<AndonRouteStatus> routeStatusList;
@ApiModelProperty("当前流程状态")
private AndonRouteStatus curRouteStatus;
@ApiModelProperty("外部触发事件")
private String triggerEvent;
}

16
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonActor;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : actor
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 11:13
* @Modify:
**/
@Repository
public interface IAndonActorRepository extends BaseRepository<AndonActor, Long> {
}

16
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : actor rule
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 11:13
* @Modify:
**/
@Repository
public interface IAndonActorRuleRepository extends BaseRepository<AndonActorRule, Long> {
}

1
modules/i3plus-pojo-aps/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-aps</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

1
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-base</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

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

@ -13,6 +13,100 @@ import org.apache.commons.lang3.StringUtils;
public class AndonEnumUtil {
/**
* 流程状态-触发类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_TRIGGER_TYPE {
INNER_TRIGGER(10, "内部触发"),
OUTER_TRIGGER(20, "外部触发");
private int value;
private String description;
ROUTE_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 组件状态类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_TYPE {
START(10, "START", "开始状态"),
EXECUTING(20, "EXECUTING", "执行中状态"),
TERMINATE(30, "TERMINATE", "中断状态"),
FINISH(40, "FINISH", "完成状态");
private int value;
private String code;
private String description;
ROUTE_STATUS_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
* 安灯作业组件-组件类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ACTION_MODULE_AM_TYPE {
METHOD_MODULE(10, "方法组件"),
INTERFACE_MODULE(20, "界面组件");
private int value;
private String description;
ACTION_MODULE_AM_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 安灯主界面产线或者站点运行状态
* 正常 = 10，故障 = 20
*/
@ -766,6 +860,15 @@ public class AndonEnumUtil {
return description;
}
public static ANDON_ACTION_TAG getByValue(int value) {
for (ANDON_ACTION_TAG actionTag : values()) {
if (actionTag.getValue() == value) {
return actionTag;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -924,6 +1027,15 @@ public class AndonEnumUtil {
return description;
}
public static ALARM_SOURCE_TYPE getByValue(String value) {
for (ALARM_SOURCE_TYPE sourceType : values()) {
if (sourceType.getValue().equals(value)) {
return sourceType;
}
}
return null;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

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

@ -19,60 +19,69 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_TYPE {
IMPP(1, 0, 0, "impp-platform", "IMPP平台"),
CORE(2, 8100, 4, "i3core", "i3业务平台"),
WMS(3, 8200, 10, "i3wms", "仓库管理软件"),
MES(4, 8300, 11, "i3mes", "生产管理软件"),
QMS(5, 0, 0, "i3qms", "质量管理软件"),
MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"),
SWEB(7, 8800, 19, "i3sweb", "供应商服务"),
PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"),
PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
FORM(20, 8900, 16, "block-form", "智能表单"),
REPORT(21, 8910, 17, "block-report", "智能报表"),
WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"),
JOBFLOW(23, 0, 0, "block-jobflow", "智能作业流"),
SOFTSWITCH(24, 8920, 18, "block-softswitch", "软件适配器"),
HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
LAC(26, 8600, 13, "lac", "连接适配器"),
ANDON(27, 8500, 14, "andon", "安灯"),
APS(28, 8400, 15, "i3aps", "高级计划与排产"),
MDM(29, 8150, 22, "i3mdm", "数据中心MDM"),
CENTER(99, 8000, 1, "icloud-server", "注册中心"),
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"),
CONSOLE(95, 8010, 2, "impp-console", "服务监控台"),
DEV(9999, 0000, 0, "Development", "系统调试");
/** WMS 服务 */
WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"),
SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"),
QMS(5, 0, 0, 0, "i3qms", "质量管理软件"),
/**
* 产品ID
*/
/** Mes 服务 */
MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"),
MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"),
/** PTL 服务 */
PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"),
PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
/** Block 服务 */
FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"),
REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"),
WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"),
JOBFLOW(23, 0, 0, 0, "block-jobflow", "智能作业流"),
SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"),
HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"),
/** LAC 服务 */
LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"),
/** 安灯服务 */
ANDON(27, 8500, 14, 110000000L, "andon", "安灯"),
/** 计划排产服务 */
APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"),
SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
/** 基础服务 */
IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"),
CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"),
GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"),
CLOUD(97, 0, 0, 0, "i3cloud", "微服务"),
CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"),
/** 平台服务 */
CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"),
/** 调试服务 */
DEV(9999, 0000, 0, 120000000L, "Development", "系统调试");
/** 产品ID */
private int value;
/**
* 应用默认端口
*/
private int prot;
/**
* 应用默认雪花DataBaseId(0-31)共32 个存储区
*/
/** 应用默认端口 */
private int port;
/** 应用默认雪花DataBaseId(0-31)共32 个存储区 */
private int snowflakeId;
/**
* 产品代码
*/
/** 产品代码 */
private String code;
/**
* 产品描述
*/
/** 顶级菜单代码 */
private long menuRootId;
/** 产品描述 */
private String description;
SOFT_TYPE(int value, int prot, int snowflakeId, String code, String description) {
SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) {
this.value = value;
this.prot = prot;
this.port = port;
this.snowflakeId = snowflakeId;
this.menuRootId = menuRootCode;
this.code = code;
this.description = description;
}
@ -89,14 +98,18 @@ public class CommonEnumUtil {
return description;
}
public int getProt() {
return prot;
public int getPort() {
return port;
}
public int getSnowflakeId() {
return snowflakeId;
}
public long getMenuRootId() {
return menuRootId;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -137,7 +150,6 @@ public class CommonEnumUtil {
}
public static SOFT_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
@ -146,6 +158,15 @@ public class CommonEnumUtil {
return null;
}
public static SOFT_TYPE valueOfMenuRootId(long id) {
for (int i = 0; i < values().length; i++) {
if (values()[i].menuRootId == id) {
return values()[i];
}
}
return null;
}
public static SOFT_TYPE codeOfDescription(String code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
@ -923,7 +944,9 @@ public class CommonEnumUtil {
public enum LOG_LOGIN_PLATFORM {
PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"),
PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"),
Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端");
Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"),
MES_PCN(40, "MES-PCN", "MES-PCN"),
PTL_PCN(50, "PTL-PCN", "PTL-PCN");
private int value;
private String name;
@ -2178,6 +2201,89 @@ public class CommonEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_STATUS {
CONN_SUCCESS(10, "验证成功", "验证成功"),
CONN_FAILURE(20, "验证失败", "验证失败");
// TIME_OUT(30, "连接超时", "连接超时"),
// AUTH_ERROR(40, "账号密码错误", "账号密码错误");
private int value;
private String code;
private String description;
private DATA_SOURCE_STATUS (int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static DATA_SOURCE_STATUS valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* PC自定义搜索-字段类型
* 10-文本，20-数字，30-下拉框，40，时间，50-开窗

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

@ -5768,4 +5768,267 @@ public class MesEnumUtil {
}
}
/**
* MES_产品颜色 类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_COLOR_TYPE {
PRODUCT_COLOR(10, "产品颜色"),
MATERIAL_COLOR(20, "物料颜色");
private int value;
private String description;
MES_COLOR_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* MES_车型散件配置清单 选配类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_OPTION_TYPE {
OPTION_PART(1, "选配件"),
BOM_DISASSEMBLY(2, "BOM拆解");
private int value;
private String description;
MES_OPTION_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 数据格式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_FORMAT {
STRING_FORMAT(1, "String", "字符串格式"),
INTEGER_FORMAT(2, "Integer", "整数格式"),
DOUBLE_FORMAT(3, "Double", "高精度浮点格式"),
DATE_FORMAT(4, "Date", "日期格式"),
FLOAT_FORMAT(5, "Float", "浮点格式"),
BOOL_FORMAT(6, "Boolean", "布尔格式"),
LONG_FORMAT(7, "LONG", "长整数格式");
private int value;
private String code;
private String description;
DATA_FORMAT(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 数据导入类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TEMPLATE_IMPORT_TYPE {
SINGLE_TABLE(10, "SINGLE_TABLE", "单表"),
MULTI_TABLE(20, "MULTI_TABLE", "多表");
private int value;
private String code;
private String description;
TEMPLATE_IMPORT_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 数据更新类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TEMPLATE_UPDATE_TYPE {
FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"),
DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"),
REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入");
private int value;
private String code;
private String description;
TEMPLATE_UPDATE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

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

@ -1809,8 +1809,10 @@ public class MesPcnEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");
// JIT_ORDER(50, "JIT工单");
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
REPAIR(70,"返修插单");
private int value;
private String description;
@ -2005,7 +2007,8 @@ public class MesPcnEnumUtil {
public enum QUEUE_ORDER_DETAIL_STATUS {
NORMAL(10, "正常"),
CLOSE(20, "关闭");
CLOSE(20, "关闭"),
FINISH(30, "完成");
private int value;
private String description;
@ -2541,10 +2544,11 @@ public class MesPcnEnumUtil {
TABLE("table", "表格"),
TEXT("text", "正常文本"),
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
FILE("file", "打印模板文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮"),
TABLES("tables", "多个表格"),
CUSTOM("custom", "定制页面"),
FORM("form", "文本按钮");
private String value;
@ -3243,6 +3247,7 @@ public class MesPcnEnumUtil {
public enum TABLE_COLOR {
GREEN("green", "绿色"),
RED("red", "红色"),
YELLOW("Yellow", "黄色");
private String code;
@ -3639,4 +3644,40 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* 生产队列 队列类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_QUEUE_TYPE {
PRODUCT_QUEUE(10, "生产队列"),
PRELOAD_QUEUE(20, "预装队列");
private int value;
private String description;
QUEUE_ORDER_QUEUE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -6906,4 +6906,64 @@ public class WmsEnumUtil {
return null;
}
}
/**
* 仓库健康指标等级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HEALTH_INDICATOR_LEVEL {
HEALTH(10, "HEALTH", "健康"),
SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
NO_HEALTH(30, "NO_HEALTH", "不健康");
private int value;
private String code;
private String description;
HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

1
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>

1
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-hardswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<profiles>
<profile>

1
modules/i3plus-pojo-ics/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-ics</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

1
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-jobflow</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<profiles>
<profile>

1
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-lac</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

1
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-mes-pcn</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

1
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-mes</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java
Unescape Escape View File

@ -63,10 +63,22 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
@ApiParam("更换结束时间")
private String endTime;
@Column(name = "REMIND_COUNT")
@ApiParam("提醒次数")
private Integer remindCount;
@Transient
@ApiParam("最大次数")
private Integer useCountMax;
@Transient
@ApiParam("按钮名称")
private String btnName;
@Transient
@ApiParam("按钮颜色")
private String btnColor;
public Integer getToolingType() {
return this.toolingType == null ? 0 : this.toolingType;
}

49
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java
Unescape Escape View File

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @Description:车型等级
* @Reference:
* @Author: adair.song
* @CreateDate: 2020\05\14 10:34
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MODEL_GRADE")
@Api("MES_车型等级")
public class MesModelGrade extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635747427364076L;
@Column(name = "GRADE_CODE")
@ApiParam("等级代码")
private String gradeCode;
@Column(name = "GRADE_NAME")
@ApiParam("等级名称")
private String gradeName;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "GRADE_FLAG_VALUE")
@ApiParam("等级标识值")
private String gradeFlagValue;
}

60
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java
Unescape Escape View File

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @Description:产品颜色
* @Reference:
* @Author: adair.song
* @CreateDate: 2020\05\14 10:34
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_COLOR")
@Api("MES_产品颜色")
public class MesPartColor extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412632727837364076L;
@Column(name = "COLOR_TYPE")
@ApiParam("类型")
private Integer colorType;
@Column(name = "COLOR_CODE")
@ApiParam("颜色代码")
private String colorCode;
@Column(name = "COLOR_NAME")
@ApiParam("颜色名称")
private String colorName;
@Column(name = "IF_COLOR_CODE")
@ApiParam("接口颜色代码")
private String ifColorCode;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "MODEL_YEAR")
@ApiParam("年度型")
private String modelYear;
}

84
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java
Unescape Escape View File

@ -0,0 +1,84 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @Description:产品车型配置
* @Reference:
* @Author: adair.song
* @CreateDate: 2020\05\14 15:34
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_MODEL_CFG")
@Api("MES_产品车型配置")
public class MesProdModelCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -5227132727837364076L;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "MODEL_YEAR")
@ApiParam("年度型")
private String modelYear;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "PART_NO")
@ApiParam("总成零件号")
private String partNo;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam("客户零件号")
private String customerPartNo;
@Column(name = "GRADE_CODE")
@ApiParam("等级代码")
private String gradeCode;
@Column(name = "MODEL_FLAG_VALUE")
@ApiParam("车型标志值")
private String modelFlagValue;
@Column(name = "MODEL_CFG_FLAG_VALUE")
@ApiParam("车型配置标志值")
private String modelCfgFlagValue;
@Column(name = "QC_FLAG_VALUE")
@ApiParam("质量标志值")
private String qcFlagValue;
@Column(name = "LABEL_DESC")
@ApiParam("条码标签描述")
private String labelDesc;
@Column(name = "CCC_CODE")
@ApiParam("3C认证编码")
private String cccCode;
@Column(name = "PROCESS_LABEL_TEMPLATE")
@ApiParam("过程标签模板")
private String processLabelTemplate;
}

75
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java
Unescape Escape View File

@ -0,0 +1,75 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:车型散件配置清单
* @Reference:
* @Author: adair.song
* @CreateDate: 2020\05\14 10:34
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCATTER_PART_CFG_BOM")
@Api("MES_车型散件配置清单")
public class MesScatterPartCfgBom extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635772834364076L;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "MODEL_YEAR")
@ApiParam("年度型")
private String modelYear;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "CUST_PART_NO")
@ApiParam("客户零件号")
private String custPartNo;
@Column(name = "PART_FLAG_LOCATION")
@ApiParam("零件标志位")
private Integer partFlagLocation;
@Column(name = "PART_FLAG_VALUE")
@ApiParam("零件标志值")
private String partFlagValue;
@Column(name = "QTY", columnDefinition = "decimal(18,3)")
@ColumnDefault("0")
@ApiParam(value = "用量", example = "0")
public Double qty;
@Column(name = "OPTION_TYPE")
@ApiParam("选配类型")
private Integer optionType;
}

149
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java
Unescape Escape View File

@ -0,0 +1,149 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @Description:散件零件生产配置
* @Reference:
* @Author: adair.song
* @CreateDate: 2020\05\14 10:34
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCATTER_PART_PROD_CFG")
@Api("MES_散件零件生产配置")
public class MesScatterPartProdCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412632727837782394L;
@Column(name = "CFG_ID")
@ApiParam("配置编号")
private String cfgId;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "MODEL_FLAG_VALUE")
@ApiParam("车型标志值")
private String modelFalgValue;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "GRADE_CODE")
@ApiParam("等级代码")
private String gradeCode;
@Column(name = "COLOR_CODE")
@ApiParam("颜色代码")
private String colorCode;
@Column(name = "PART_FLAG_LOCATION")
@ApiParam("标志位")
private Integer partFlagLocation;
@Column(name = "PART_FLAG_VALUE")
@ApiParam("标志值")
private String partFlagValue;
@Column(name = "POKE_YOKE_FIX")
@ApiParam("防错码")
private String pokeYokeFix;
@Column(name = "POKE_YOKE_FROM")
@ApiParam("防错码开始位")
private Integer pokeYokeFrom;
@Column(name = "POKE_YOKE_END")
@ApiParam("防错码结束位")
private Integer pokeYokeEnd;
@Column(name = "POKE_YOKE_LENGTH")
@ApiParam("防错码长度")
private Integer pokeYokeLength;
@Column(name = "PEST1")
@ApiParam("PEST编码1")
private Integer pest1;
@Column(name = "PEST2")
@ApiParam("PEST编码2")
private Integer pest2;
@Column(name = "PEST3")
@ApiParam("PEST编码3")
private Integer pest3;
@Column(name = "PEST4")
@ApiParam("PEST编码4")
private Integer pest4;
@Column(name = "PEST5")
@ApiParam("PEST编码5")
private Integer pest5;
@Column(name = "PEST6")
@ApiParam("PEST编码6")
private Integer pest6;
@Column(name = "PEST7")
@ApiParam("PEST编码7")
private Integer pest7;
@Column(name = "PEST8")
@ApiParam("PEST编码8")
private Integer pest8;
@Column(name = "TORQUE_NO")
@ApiParam("扭矩枪编号")
private String torqueNo;
@Column(name = "IS_PF")
@ApiParam("是否大枪")
private Integer isPf;
@Column(name = "POKE_TYKE_SEQ")
@ApiParam("防错顺序")
private Integer pokeTypeSeq;
@Column(name = "EFF_START_TIME")
@ApiParam("有效起始日期")
private String effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam("有效截至日期")
private String effEndTime;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
}

11
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -30,7 +31,7 @@ import java.io.Serializable;
public class MesTooling extends BaseBean implements Serializable {
private static final long serialVersionUID = -5033127912658757665L;
@Column(name = "TOOLING_CODE ")
@Column(name = "TOOLING_CODE")
@ApiParam("工装代码")
private String toolingCode ;
@ -49,4 +50,12 @@ public class MesTooling extends BaseBean implements Serializable {
@Column(name = "USE_TIME_MAX")
@ApiParam("最大使用时间")
private String useTimeMax;
@Column(name = "REMIND_COUNT")
@ApiParam("提醒次数")
private Integer remindCount;
@Transient
@ApiParam("使用次数")
private Integer useCount;
}

75
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java
Unescape Escape View File

@ -0,0 +1,75 @@
package cn.estsh.i3plus.pojo.mes.bean.template;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 导入模板信息
* @Reference :
* @Author : adair.song --复用--> siliter.yuan
* @CreateDate : 2020-05-18 16:49
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BAS_IMPORT_TEMPLATE")
@Api("导入模板信息")
public class BasImportTemplate extends BaseBean{
private static final long serialVersionUID = 9214639813072592889L;
@Column(name="TEMPLATE_CODE")
@ApiParam("模板代码")
private String templateCode;
@Column(name="TEMPLATE_NAME")
@ApiParam("模板名称")
private String templateName;
@Column(name="TEMPLATE_DESC")
@ApiParam("模板描述")
private String templateDesc;
@Column(name="GROUP_NAME")
@ApiParam("分组名称")
private String groupName;
/**
* 10-单表，20-多表
*/
@Column(name="IMPORT_TYPE")
@ApiParam(value = "导入类型", example = "0")
private Integer importType;
/**
* 10-全覆盖，20-差异更新，30-重复不导入
*/
@Column(name="UPDATE_TYPE")
@ApiParam(value = "更新类型", example = "0")
private Integer updateType;
@Column(name="SCRIPT_NO")
@ApiParam("脚本编号")
private String scriptNo;
@Column(name="START_ROW")
@ApiParam(value = "起始行", example = "0")
private Integer startRow;
@Transient
@ApiParam("模板明细列表")
private List<BasImportTemplateDetails> templateDetailsList;
}

117
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java
Unescape Escape View File

@ -0,0 +1,117 @@
package cn.estsh.i3plus.pojo.mes.bean.template;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 : 导入模板明细信息
* @Reference :
* @Author : adair.song --复用--> siliter.yuan
* @CreateDate : 2020-05-18 16:49
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BAS_IMPORT_TEMPLATE_DETAILS")
@Api("导入模板明细信息")
public class BasImportTemplateDetails extends BaseBean{
private static final long serialVersionUID = 9214639813072592999L;
@Column(name="TEMPLATE_CODE")
@ApiParam("模板代码")
private String templateCode;
@Column(name="TABLE_NAME")
@ApiParam("表名称")
private String tableName;
@Column(name="FIELD_CODE")
@ApiParam("字段英文名称")
private String fieldCode;
@Column(name="FIELD_ALIAS")
@ApiParam("字段别名")
private String fieldAlias;
@Column(name="LABEL_CODE")
@ApiParam("标签代码")
private String labelCode;
@Column(name="LABEL_NAME")
@ApiParam("标签名称")
private String labelName;
@Column(name="DEFAULT_VALUE")
@ApiParam("默认值")
private String defaultValue;
/**
* 数据格式 文本、整数、小数、日期
*/
@Column(name="DATA_FORAMT")
@ApiParam("数据格式")
private String dataFormat;
/**
* 1-是，2-否
*/
@Column(name="IS_REQUIRE")
@ApiParam(value = "是否必填", example = "0")
private Integer isRequire;
@Column(name="DECIMAIL_SPLIT")
@ApiParam("小数点分隔符")
private String decimalSplit;
@Column(name="THOUSANDS_SPLIT")
@ApiParam("千分位分隔符")
private String thousandsSplit;
// YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss
@Column(name="DATE_FORMAT")
@ApiParam("日期格式")
private String dateFormat;
@Column(name="REMARK")
@ApiParam("备注")
private String remark;
@Column(name="SEQ")
@ApiParam(value = "序号", example = "0")
private Integer seq;
@Column(name="MAX_LENGTH")
@ApiParam(value = "最大长度", example = "0")
private Integer maxLength;
@Column(name="RELATION_TABLE")
@ApiParam("关联表名")
private String relationTable;
@Column(name="RELATION_FIELD")
@ApiParam("关联字段")
private String relationField;
/**
* 是否主键 1-是，2-否
*/
@Column(name="IS_PK")
@ApiParam(value = "是否主键", example = "0")
private Integer isPk;
@Column(name="SHEET_NAME")
@ApiParam("工作薄名称")
private String sheetName;
}

39
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BasBeanFieldModel.java
Unescape Escape View File

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @description 数据库实例字段模型
* @author adair.song --复用--> siliter.yuan
* @CreateDate : 2020-05-18 16:49
*/
@Data
@Api("数据库实例字段模型")
public class BasBeanFieldModel {
@ApiParam("表名")
private String tableName;
@ApiParam("表描述")
private String tableDesc;
@ApiParam("字段英文名称")
private String fieldEnName;
@ApiParam("字段类型")
public String fieldType;
@ApiParam("字段描述")
private String fieldDesc;
@ApiParam("实例类名")
public String entityName;
@ApiParam("实例字段名称")
public String propertyName;
@ApiParam("实例类全名")
public String entityClassName;
}

23
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartStockScheduleModel.java
Unescape Escape View File

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.mes.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/5/18 5:10 下午
* @Modify:
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class PartStockScheduleModel {
private String partNo;
private Integer boxQty;
private Double qty;
}

17
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
import org.springframework.stereotype.Repository;
/**
* @Description : 导入模板明细数据操作仓库
* @Reference :
* @Author : adair.song --复用--> siliter.yuan
* @CreateDate : 2020-05-18 16:49
* @Modify:
**/
@Repository
public interface BasImportTemplateDetailsRepository extends BaseRepository<BasImportTemplateDetails, Long> {
}

17
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
import org.springframework.stereotype.Repository;
/**
* @Description : 导入模板数据操作仓库
* @Reference :
* @Author : adair.song --复用--> siliter.yuan
* @CreateDate : 2020-05-18 16:49
* @Modify:
**/
@Repository
public interface BasImportTemplateRepository extends BaseRepository<BasImportTemplate, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesModelGrade;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-05-15
* @Modify:
**/
@Repository
public interface MesModelGradeRepository extends BaseRepository<MesModelGrade, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartColor;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-05-15
* @Modify:
**/
@Repository
public interface MesPartColorRepository extends BaseRepository<MesPartColor, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesProdModelCfg;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-05-15
* @Modify:
**/
@Repository
public interface MesProdModelCfgRepository extends BaseRepository<MesProdModelCfg, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesScatterPartCfgBom;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-05-15
* @Modify:
**/
@Repository
public interface MesScatterPartCfgBomRepository extends BaseRepository<MesScatterPartCfgBom, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesScatterPartProdCfg;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-05-15
* @Modify:
**/
@Repository
public interface MesScatterPartProdCfgRepository extends BaseRepository<MesScatterPartProdCfg, Long> {
}

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

@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.mes.bean.*;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
import org.springframework.util.StringUtils;
@ -2720,4 +2722,169 @@ public class MesHqlPack {
}
return packBean;
}
/**
* MES 车型等级查询条件封装
*
* @param modelGrade
* @return
*/
public static DdlPackBean getMesModelGrade(MesModelGrade modelGrade, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(modelGrade, organizeCode);
if (!StringUtils.isEmpty(modelGrade.getGradeCode())) {
DdlPreparedPack.getStringEqualPack(modelGrade.getGradeCode(), "gradeCode", packBean);
}
if (!StringUtils.isEmpty(modelGrade.getGradeName())) {
DdlPreparedPack.getStringLikerPack(modelGrade.getGradeName(), "gradeName", packBean);
}
if (!StringUtils.isEmpty(modelGrade.getGradeFlagValue())) {
DdlPreparedPack.getStringLikerPack(modelGrade.getGradeFlagValue(), "gradeFlagValue", packBean);
}
if (!StringUtils.isEmpty(modelGrade.getProdCfgTypeCode())) {
DdlPreparedPack.getStringEqualPack(modelGrade.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
return packBean;
}
/**
* MES 产品颜色查询条件封装
*
* @param partColor
* @return
*/
public static DdlPackBean getMesPartColor(MesPartColor partColor, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(partColor, organizeCode);
if (!StringUtils.isEmpty(partColor.getColorCode())) {
DdlPreparedPack.getStringEqualPack(partColor.getColorCode(), "colorCode", packBean);
}
if (!StringUtils.isEmpty(partColor.getColorName())) {
DdlPreparedPack.getStringLikerPack(partColor.getColorName(), "colorName", packBean);
}
if (!StringUtils.isEmpty(partColor.getIfColorCode())) {
DdlPreparedPack.getStringEqualPack(partColor.getIfColorCode(), "ifColorCode", packBean);
}
if (!StringUtils.isEmpty(partColor.getProdCfgTypeCode())) {
DdlPreparedPack.getStringEqualPack(partColor.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
if (!StringUtils.isEmpty(partColor.getProduceCtgyCode())) {
DdlPreparedPack.getStringEqualPack(partColor.getProduceCtgyCode(), "produceCtgyCode", packBean);
}
if (!StringUtils.isEmpty(partColor.getModelYear())) {
DdlPreparedPack.getStringEqualPack(partColor.getModelYear(), "modelYear", packBean);
}
return packBean;
}
/**
* MES 产品车型配置
*
* @param prodModelCfg
* @return
*/
public static DdlPackBean getMesProdModelCfg(MesProdModelCfg prodModelCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodModelCfg, organizeCode);
if (!StringUtils.isEmpty(prodModelCfg.getProdCfgTypeCode())) {
DdlPreparedPack.getStringEqualPack(prodModelCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
if (!StringUtils.isEmpty(prodModelCfg.getProduceCtgyCode())) {
DdlPreparedPack.getStringEqualPack(prodModelCfg.getProduceCtgyCode(), "produceCtgyCode", packBean);
}
if (!StringUtils.isEmpty(prodModelCfg.getModelYear())) {
DdlPreparedPack.getStringLikerPack(prodModelCfg.getModelYear(), "modelYear", packBean);
}
if (!StringUtils.isEmpty(prodModelCfg.getPartNo())) {
DdlPreparedPack.getStringEqualPack(prodModelCfg.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(prodModelCfg.getGradeCode())) {
DdlPreparedPack.getStringEqualPack(prodModelCfg.getGradeCode(), "gradeCode", packBean);
}
return packBean;
}
/**
* MES 车型散件配置清单
*
* @param scatterPartCfgBom
* @return
*/
public static DdlPackBean getMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartCfgBom, organizeCode);
if (!StringUtils.isEmpty(scatterPartCfgBom.getProdCfgTypeCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
if (!StringUtils.isEmpty(scatterPartCfgBom.getProduceCtgyCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProduceCtgyCode(), "produceCtgyCode", packBean);
}
if (!StringUtils.isEmpty(scatterPartCfgBom.getModelYear())) {
DdlPreparedPack.getStringLikerPack(scatterPartCfgBom.getModelYear(), "modelYear", packBean);
}
if (!StringUtils.isEmpty(scatterPartCfgBom.getPartNo())) {
DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getPartNo(), "partNo", packBean);
}
return packBean;
}
/**
* MES 散件零件生产配置
*
* @param scatterPartProdCfg
* @return
*/
public static DdlPackBean getMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartProdCfg, organizeCode);
if (!StringUtils.isEmpty(scatterPartProdCfg.getCfgId())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getCfgId(), "cfgId", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getPartNo())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getPartName())) {
DdlPreparedPack.getStringLikerPack(scatterPartProdCfg.getPartName(), "partName", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getGradeCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getGradeCode(), "gradeCode", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getColorCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getColorCode(), "colorCode", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getProdCfgTypeCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
if (!StringUtils.isEmpty(scatterPartProdCfg.getProduceCtgyCode())) {
DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProduceCtgyCode(), "produceCtgyCode", packBean);
}
return packBean;
}
/**
* 导入模板信息分页查询条件
* @param template
* @return
*/
public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
getStringBuilderPack(template, result);
return result;
}
/**
* 导入模板明细信息分页查询条件
* @param details
* @return
*/
public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
getStringBuilderPack(details, result);
return result;
}
}

1
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-model</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

26
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java
Unescape Escape View File

@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.io.Serializable;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Objects;
@ -41,7 +40,7 @@ public class ImppLicense implements Serializable {
/* 基础信息 */
@ApiParam(value ="授权ID")
private Long Id; // ID
private Long id; // ID
@ApiParam(value ="授权应用ID")
private Long appId; // APP_ID
@ApiParam(value ="授权读取授权数据ID")
@ -70,6 +69,28 @@ public class ImppLicense implements Serializable {
@ApiParam(value ="深思授权信息")
private ImppLicenseSenseshield senseshield;
/* 备用预留字段 */
@ApiParam(value ="备用字段")
private String licenseSpare01;
@ApiParam(value ="备用字段")
private String licenseSpare02;
@ApiParam(value ="备用字段")
private String licenseSpare03;
@ApiParam(value ="备用字段")
private String licenseSpare04;
@ApiParam(value ="备用字段")
private String licenseSpare05;
@ApiParam(value ="备用字段")
private String licenseSpare06;
@ApiParam(value ="备用字段")
private String licenseSpare07;
@ApiParam(value ="备用字段")
private String licenseSpare08;
@ApiParam(value ="备用字段")
private String licenseSpare09;
@ApiParam(value ="备用字段")
private String licenseSpare10;
/* 业务人员信息 */
@ApiParam(value ="授权创建时间")
private Date licenseCreateDateTime; // 授权时间
@ -92,6 +113,7 @@ public class ImppLicense implements Serializable {
@ApiParam(value ="锁类型")
private String lockType;
/* 基础业务逻辑 */
@ApiParam(value ="到期时间")
private String maturityDateTime;

48
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanFieldInfoModel.java
Unescape Escape View File

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.model.mes;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description : Wms实体字段Model信息
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-04-24 09:53
* @Modify:
**/
@Data
@NoArgsConstructor
public class BasBeanFieldInfoModel implements Serializable {
private static final long serialVersionUID = -6376845639646448895L;
@ApiParam(value = "表名称")
public String tableName;
@ApiParam(value = "表字段名称")
private String fieldName;
@ApiParam(value = "表字段描述")
private String fieldDesc;
@ApiParam(value = "表字段类型")
private String fieldType;
@ApiParam(value = "主键")
private String isFieldPrimaryKey;
@ApiParam(value = "非空")
private String isFieldNull;
@ApiParam(value = "外键")
private String isFieldForeignKey;
@ApiParam(value = "唯一约束")
private String isFieldUnique;
@ApiParam(value = "自增")
private String isFieldGeneric;
}

38
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java
Unescape Escape View File

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.model.mes;
import cn.estsh.i3plus.pojo.model.mes.BasBeanFieldInfoModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @Description : Wms实体字段Model信息
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-04-24 09:53
* @Modify:
**/
@Data
@NoArgsConstructor
public class BasBeanInfoModel implements Serializable {
private static final long serialVersionUID = -6376845639646448495L;
@ApiParam(value = "系统名称")
public String systemName;
@ApiParam(value = "实体名称")
public String entityName;
@ApiParam(value = "数据表名称")
private String tableName;
@ApiParam(value = "数据表描述")
private String tableDesc;
@ApiParam(value = "字段列表数据")
private List<BasBeanFieldInfoModel> fieldInfoModelList;
}

3
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java
Unescape Escape View File

@ -43,4 +43,7 @@ public class ExcelImportModel<T> implements Serializable {
@ApiParam("导入进度")
private String importSpeed;
@ApiParam("Sheet名称")
private String sheetName;
}

41
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java
Unescape Escape View File

@ -1,41 +0,0 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
/**
* @Author: siliter.yuan
* @CreateDate: 2020/4/21 9:19 AM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("导入结果model")
public class ExcelImportModel implements Serializable {
private static final long serialVersionUID = 1444427447244864339L;
@ApiParam("结果")
private boolean result;
@ApiParam("成功行数量")
private int successRowNum;
@ApiParam("工作薄名称")
private String sheetName;
@ApiParam("导入数据集合")
private List<ConcurrentHashMap<String, Object>> excelList;
@ApiParam("错误信息集合")
private List<ImportErrorModel> ImportErrorModels;
}

41
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java
Unescape Escape View File

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicator;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @Description : Wms健康指标模型
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-05-14 09:53
* @Modify:
**/
@Data
@NoArgsConstructor
public class WmsHealthIndicatorModel implements Serializable {
private static final long serialVersionUID = -6376849949646448495L;
@ApiParam(value = "模块名称")
public String groupName;
@ApiParam(value = "指标代码")
public String indicatorCode;
@ApiParam(value = "指标名称")
public String indicatorName;
@ApiParam(value = "开始时间")
public String startDateTime;
@ApiParam(value = "结束时间")
public String endDateTime;
@ApiParam(value = "健康指标集合")
public List<WmsHealthIndicator> healthIndicatorList;
}

36
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java
Unescape Escape View File

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @Description : Wms健康指标报表模型
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-05-15 09:53
* @Modify:
**/
@Data
@NoArgsConstructor
public class WmsHealthIndicatorReportModel implements Serializable {
private static final long serialVersionUID = -6376850049646448495L;
@ApiParam(value = "图表标题名称")
public String titleName;
@ApiParam(value = "图例集合")
public Set<String> legendList;
@ApiParam(value = "X轴数据集合")
public List<String> xAxisList;
@ApiParam(value = "图表数据集合")
public List<Map<String, Object>> seriesDataList;
}

39
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java
Unescape Escape View File

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description : Wms健康变量参数
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-05-14 09:53
* @Modify:
**/
@Data
@NoArgsConstructor
public class WmsHealthVariableParamsModel implements Serializable {
private static final long serialVersionUID = -6376849939646448495L;
@ApiParam(value = "开始时间")
public String startDateTime;
@ApiParam(value = "结束时间")
public String endDateTime;
@ApiParam(value = "适应存储区")
private String applyArea;
@ApiParam(value = "适应物料组")
private String applyPartGroup;
@ApiParam(value = "变量参数")
private String variableParam;
@ApiParam(value = "工厂代码")
private String organizeCode;
}

45
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java
Unescape Escape View File

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description : Wms健康变量参数
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-05-14 09:53
* @Modify:
**/
@Data
@NoArgsConstructor
public class WmsHealthVariableResultModel implements Serializable {
private static final long serialVersionUID = -6376849949646448495L;
@ApiParam(value = "订单号")
public String orderNo;
@ApiParam(value = "供应商名称")
public String vendorName;
@ApiParam(value = "需求数量")
private Double qty;
@ApiParam(value = "物料号")
private String partNo;
@ApiParam(value = "物料名称")
private String partNameRdd;
@ApiParam(value = "计划到货日期")
private String planDateTime;
@ApiParam(value = "实际到货日期")
private String actDateTime;
@ApiParam(value = "物料组编号")
private String partGroupNo;
}

1
modules/i3plus-pojo-platform/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-platform</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

88
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java
Unescape Escape View File

@ -0,0 +1,88 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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 : 数据对象
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2019-02-27 10:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_DATA_SOURCE")
@Api(value="数据对象")
public class SysDataSource extends BaseBean {
private static final long serialVersionUID = -3116421427693381484L;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="SOURCE_NAME")
@ApiParam(value ="数据源名称")
private String sourceName;
@Column(name="SOURCE_CODE")
@ApiParam(value ="数据源编码")
private String sourceCode;
@Column(name="SOURCE_STATUS")
@ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在")
private Integer sourceStatus;
public String getSourceStatusTxt() {
return softType == null ? null : CommonEnumUtil.DATA_SOURCE_STATUS.valueOfDescription(sourceStatus);
}
@Column(name="SOURCE_TYPE")
@ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
private Integer sourceType;
public String getSourceTypeTxt() {
return softType == null ? null : CommonEnumUtil.DATA_SOURCE_TYPE.valueOfDescription(sourceType);
}
@Column(name="SOURCE_HOST")
@ApiParam(value ="数据源连接地址")
private String sourceHost;
@Column(name="SOURCE_PORT")
@ApiParam(value ="数据源端口")
private Integer sourcePort;
@Column(name="SOURCE_DATA_BASE_NAME")
@ApiParam(value ="数据库名称")
private String sourceDataBaseName;
@Column(name="SOURCE_USER_NAME")
@ApiParam(value ="数据库用户名称")
private String sourceUserName;
@Column(name="SOURCE_PASSWORD")
@ApiParam(value ="数据库用户密码")
private String sourcePassword;
@Column(name="SOURCE_DESCRIPTION")
@ApiParam(value ="数据源描述")
private String sourceDescription;
}

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

@ -68,4 +68,12 @@ public class SysDepartment extends BaseBean {
@ApiParam(value ="子集列表")
private List<SysDepartment> childList;
public SysDepartment() {
}
public SysDepartment(String departmentCode, Long parentId, Long organizeId) {
this.departmentCode = departmentCode;
this.parentId = parentId;
this.organizeId = organizeId;
}
}

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

@ -113,4 +113,10 @@ public class SysMenu extends BaseBean {
@ApiParam(value ="子集列表")
private List<SysMenu> childList = new ArrayList<>();
public SysMenu() {
}
public SysMenu(String menuCode) {
this.menuCode = menuCode;
}
}

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
Unescape Escape View File

@ -80,4 +80,13 @@ public class SysOrganize extends BaseBean {
@ApiParam(value ="子集ID列表")
private List<Long> childIdList;
public SysOrganize() {
}
public SysOrganize(String organizeCode, Integer organizeType, Long parentId, Integer organizeStatus) {
this.organizeCode = organizeCode;
this.organizeType = organizeType;
this.parentId = parentId;
this.organizeStatus = organizeStatus;
}
}

17
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java
Unescape Escape View File

@ -26,13 +26,14 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_POJO_VERSION")
@Table(name="SYS_POJO_VERSION",indexes = {
@Index(name="index_sys_pojo_version_ref_id",columnList = "REF_ID"),
@Index(name="index_sys_pojo_version_ref_class",columnList = "REF_CLASS"),
})
@Api(value="对象历史")
public class SysPojoVersion extends BaseBean {
private static final long serialVersionUID = -2456588444446248239L;
private static final long serialVersionUID = -2265406135818649545L;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
@ -41,6 +42,11 @@ public class SysPojoVersion extends BaseBean {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="PLAN_ID")
@ApiParam(value ="对象计划id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long planId;
@Column(name="REF_ID")
@ApiParam(value ="对象id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -79,4 +85,7 @@ public class SysPojoVersion extends BaseBean {
@ApiParam(value ="用户部门信息")
private SysPojoVersionDetail versionDetail;
@Transient
@ApiParam(value ="操作对象本身")
private String bean;
}

3
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java
Unescape Escape View File

@ -32,8 +32,7 @@ import javax.persistence.Table;
@Api(value="对象历史")
public class SysPojoVersionDetail extends BaseBean {
private static final long serialVersionUID = -2456588444446248239L;
private static final long serialVersionUID = 5385530381442176242L;
@Column(name="POJO_VERSION_ID")
@ApiParam(value ="对象id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

2
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java
Unescape Escape View File

@ -29,7 +29,7 @@ import javax.persistence.Table;
@Api(value="对象历史")
public class SysPojoVersionPlan extends BaseBean {
private static final long serialVersionUID = -1120504360281638917L;
private static final long serialVersionUID = -3125272220108497862L;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;

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

@ -59,4 +59,11 @@ public class SysPosition extends BaseBean {
@ApiParam(value ="子部门列表")
private List<SysPosition> childList;
public SysPosition() {
}
public SysPosition(String positionCode, Long parentId) {
this.positionCode = positionCode;
this.parentId = parentId;
}
}

17
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
Unescape Escape View File

@ -11,10 +11,8 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.List;
/**
* @Description : 用户登陆表
@ -53,4 +51,15 @@ public class SysRole extends BaseBean {
@ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1")
private Integer roleStatus;
@Transient
@ApiParam(value ="角色拥有功能权限信息")
private transient List<Long> menuIdList;
public SysRole() {
}
public SysRole(String name, Integer roleStatus) {
this.name = name;
this.roleStatus = roleStatus;
}
}

5
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
Unescape Escape View File

@ -247,4 +247,9 @@ public class SysUserInfo extends BaseBean {
@ApiParam(value = "岗位信息")
@AnnoOutputColumn(hidden = true)
private SysPosition position;
@Transient
@ApiParam(value = "图像信息")
@AnnoOutputColumn(hidden = true)
private String imageFileUrl;
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -35,7 +36,10 @@ public class SysLogConsole extends BaseBean {
/******** 服务器信息 ********/
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品名称")
private String softType;
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="LOG_HOST")
@ApiParam(value ="服务器IP")

13
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
Unescape Escape View File

@ -34,17 +34,12 @@ public class SysLogException extends BaseBean {
private static final long serialVersionUID = -2844455884020022321L;
//CommonEnumUtil.SOFT_TYPE
@Indexed
@Column(name="EXC_MODULE_ID")
@Column(name="SOFT_TYPE")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer excModule;
private String excModuleName;
public String getExcModuleName(){
if(this.excModule != null){
return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule);
}
return excModuleName;
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="EXC_CLASS_NAME")

23
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
Unescape Escape View File

@ -36,17 +36,12 @@ public class SysLogOperate extends BaseBean {
private static final long serialVersionUID = 1515035521283176727L;
@Indexed
@Column(name="OPERATE_MODULE")
@Column(name="SOFT_TYPE")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer operateModule;
private String operateModuleName;
public String getOperateModuleName(){
if(this.operateModule != null){
return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule);
}
return operateModuleName;
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Indexed
@ -55,8 +50,8 @@ public class SysLogOperate extends BaseBean {
@AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
private Integer operateType;
public String getOperateTypeName(){
return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType);
public String getOperateTypeTxt(){
return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType);
}
@Column(name="OPERATE_MESSAGE")
@ -75,9 +70,9 @@ public class SysLogOperate extends BaseBean {
@ApiParam(value ="请求路径" , access ="请求路径")
private String requestUrl;
@Column(name="HTTP_METHOD")
@ApiParam(value ="http请求方法" , access ="http请求方法")
private String httpMethod;
// @Column(name="HTTP_METHOD")
// @ApiParam(value ="http请求方法" , access ="http请求方法")
// private String httpMethod;
@Column(name="LOG_ARGS")
@ApiParam(value ="方法入参" , access ="方法入参")

10
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
Unescape Escape View File

@ -40,12 +40,18 @@ public class SysLogSystem extends BaseBean {
@ApiParam(value ="日志级别" , example ="1")
@AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name")
private Integer logLevel;
public String getLogLevelTxt() {
return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel);
}
@Indexed
@Column(name="LOG_MODULE_ID")
@Column(name="SOFT_TYPE")
@ApiParam(value ="系统模块（枚举）", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
private Integer logModuleId;
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="REMOTE_IP")
@ApiParam(value ="请求IP" , access ="请求IP")

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
Unescape Escape View File

@ -64,9 +64,12 @@ public class SysLogTaskTime extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long taskPlanId;
@Column(name = "TASK_SOFT_TYPE_RDD")
@ApiParam(value = "任务所属模块")
private Integer taskSoftTypeRdd;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品名称")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="TASK_CYCLE_NAME_RDD")
@ApiParam(value ="任务周期名称")

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysDataSource;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-5-11 上午11:05
* @Modify:
**/
public interface SysDataSourceRepository extends BaseRepository<SysDataSource, Long> {
}

89
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -141,7 +141,7 @@ public class CoreHqlPack {
DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode());
// 查询参数封装
// DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
// String Like
DdlPreparedPack.getStringLikerPack(position.getName(),"name",result);
DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
@ -167,6 +167,21 @@ public class CoreHqlPack {
/**
* 岗位复杂查询
* @param bean
* @return
*/
public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){
DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
// 查询参数封装
DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result);
return result;
}
/**
* 组织复杂查询
* @param organize
* @return
@ -189,13 +204,22 @@ public class CoreHqlPack {
}
public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List<Long> idList){
HqlPack.getOrderDefault(organize);
DdlPackBean result = DdlPackBean.getDdlPackBean(organize);
// String Like
DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result);
// 查询参数封装
if(organize.getChildIdList() != null){
DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result);
}
// Number In
DdlPreparedPack.getInPackList(idList,"id",result);
return result;
}
@ -214,6 +238,7 @@ public class CoreHqlPack {
* @param department
* @return
*/
@Deprecated
public static String packHqlSysDepartment(SysDepartment department){
StringBuffer result = new StringBuffer();
@ -236,34 +261,15 @@ public class CoreHqlPack {
DdlPackBean result = DdlPackBean.getDdlPackBean(department);
DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result);
DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result);
DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
DdlPreparedPack.getInPackList(idList,"id",result);
result.setOrderByStr(department.orderBy());
return result;
}
/**
* 系统权限复杂查询
* @param menu
* @return
*/
public static String packHqlSysMenu(SysMenu menu){
StringBuffer result = new StringBuffer();
// 查询参数封装
HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(menu.getMenuType(),"menuType",result);
HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
HqlPack.getStringLikerPack(menu.getName(),"name",result);
HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
// 添加默认排序
HqlPack.getOrderDefault(menu);
return result.toString();
}
public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List<Long> idList){
DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
@ -1021,7 +1027,7 @@ public class CoreHqlPack {
* @return
*/
public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){
DdlPackBean packBean = new DdlPackBean();
DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary);
DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean);
DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean);
@ -1033,4 +1039,37 @@ public class CoreHqlPack {
return packBean;
}
/**
* 按条件查询字典
* @param bean
* @return
*/
public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){
DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean);
DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean);
DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean);
DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean);
DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean);
DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean);
return packBean;
}
public static DdlPackBean packSysDataSource(SysDataSource bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getSourceName(), "sourceName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getSourceCode(), "sourceCode", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getSourceType(), "sourceType", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getSourceStatus(), "sourceStatus", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getSoftType(), "softType", ddlPackBean);
return ddlPackBean;
}
}

1
modules/i3plus-pojo-ptl/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-ptl</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

13
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -75,5 +76,17 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
@ApiParam("状态类型")
private Integer statusType;
@Transient
@ApiParam("默认不缓存")
private boolean cacheFlag = false;
@Transient
@ApiParam("触发组件集默认未执行")
private boolean actionAmgIdFalg = false;
@Transient
@ApiParam("触发组件集默认未执行")
private boolean checkTriggerTypeFalg = false;
}

3
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
Unescape Escape View File

@ -49,4 +49,7 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("当前流程状态")
private PtlRouteStatus curRouteStatus;
@ApiModelProperty("外部触发事件")
private String triggerEvent;
}

1
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-report</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>

8
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
Unescape Escape View File

@ -114,13 +114,13 @@ public class ReportHqlPack {
* @param brLayout
* @return
*/
public static String packHqlBrLayout(BrLayout brLayout){
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBrLayout(BrLayout brLayout){
DdlPackBean result = DdlPackBean.getDdlPackBean(brLayout);
// 查询参数封装
HqlPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result);
DdlPreparedPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result);
return result.toString();
return result;
}
/**

1
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>

1
modules/i3plus-pojo-sweb/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-sweb</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

1
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-wms</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<dependencies>
<dependency>

24
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
Unescape Escape View File

@ -10,9 +10,7 @@ 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;
import javax.persistence.*;
/**
* @Description : 仓库健康度指标
@ -23,7 +21,10 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_HEALTH_INDICATOR")
@Table(name="WMS_HEALTH_INDICATOR", indexes = {
@Index(columnList = "INDICATOR_CODE"),
@Index(columnList = "GROUP_NAME")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@ -51,4 +52,19 @@ public class WmsHealthIndicator extends BaseBean {
@ApiParam(value = "指标测算公式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String calcFormula;
@Transient
@ApiParam(value = "指标等级")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String indicatorGrade;
@Transient
@ApiParam(value = "指标颜色")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String indicatorColor;
@Transient
@ApiParam(value = "指标测算值")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double indicatorCalcValue;
}

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -23,7 +24,9 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_HEALTH_INDICATOR_LEVEL")
@Table(name="WMS_HEALTH_INDICATOR_LEVEL", indexes = {
@Index(columnList = "INDICATOR_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

9
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java
Unescape Escape View File

@ -10,10 +10,7 @@ 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.*;
/**
* @Description : 仓库健康度指标结果
@ -24,7 +21,9 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_HEALTH_INDICATOR_RESULT")
@Table(name="WMS_HEALTH_INDICATOR_RESULT", indexes = {
@Index(columnList = "INDICATOR_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
Unescape Escape View File

@ -56,7 +56,7 @@ public class WmsHealthVariable extends BaseBean {
@Column(name = "LAST_CALC_TIME")
@ApiParam(value = "末次计算时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String LastCalcTime;
private String lastCalcTime;
@Column(name = "NEXT_CALC_TIME")
@ApiParam(value = "下次计算时间")
@ -85,6 +85,11 @@ public class WmsHealthVariable extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String sqlStatement;
@Column(name = "CLASS_PATH")
@ApiParam(value = "调用类名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String className;
@Column(name = "FUNCTION_NAME")
@ApiParam(value = "方法名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
@ -94,4 +99,9 @@ public class WmsHealthVariable extends BaseBean {
@ApiParam(value = "脚本编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String scriptNo;
@Column(name = "CALC_WAYS")
@ApiParam(value = "测算方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String calcWays;
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class WmsHealthVariableResult extends BaseBean {
@Column(name = "VARIABLE_VALUE")
@ApiParam(value = "变量测算值")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
private Double variableValue;
private Integer variableValue;
@Lob
@Column(name = "VARIABLE_DETAILS")

53
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java
Unescape Escape View File

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
/**
* @Description : 零件自动采购单信息
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-05-18
* @Modify:
**/
@Data
@Api("收货追踪地图信息")
public class WmsAutoPurchasePartModel {
@ApiParam("合同号")
private String orderNo;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam(value = "单位")
private String unit;
@ApiParam("物料数量")
private Double qty;
@ApiParam("Erp库存地")
private String erpWarehouse;
@ApiParam("供应商编码")
private String vendorNo;
@ApiParam("供应商名称")
private String vendorName;
public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse) {
this.partNo = partNo;
this.partName = partName;
this.qty = qty;
this.erpWarehouse = warehouse;
}
public WmsAutoPurchasePartModel() {
}
}

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -3261,7 +3261,8 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result);
DdlPreparedPack.getStringEqualPack(healthIndicator.getGroupName(), "groupName", result);
DdlPreparedPack.getStringLikerPack(healthIndicator.getIndicatorName(), "indicatorName", result);
DdlPreparedPack.getStringLikerPack(healthIndicator.getGroupName(), "groupName", result);
getStringBuilderPack(healthIndicator, result);
return result;
}
@ -3286,6 +3287,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result);
DdlPreparedPack.getStringLikerPack(wmsHealthVariable.getVariableName(), "variableName", result);
getStringBuilderPack(wmsHealthVariable, result);
return result;
}
@ -3298,6 +3300,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result);
DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getCreateDatetime(), "createDatetime", result);
getStringBuilderPack(healthIndicatorResult, result);
return result;
}

1
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<artifactId>i3plus-pojo-workflow</artifactId>
<packaging>jar</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<profiles>
<profile>

2
sonar-project.properties
Unescape Escape View File

@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
sonar.projectVersion=1.0-TEST-SNAPSHOT
sonar.projectVersion=1.0-DEV-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Write Preview
Loading…
Cancel
Save