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

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

Browse Source
yun-zuoyi
许心洁 5 years ago
parent d94ccd5ac5 8b1ae09885
commit d5efd000b0
12 changed files with 103 additions and 65 deletions
Show Stats Download Patch File Download Diff File

31
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java
Unescape Escape View File

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import cn.estsh.i3plus.pojo.base.common.Pager;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @Description : 甘特图分页查询参数
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-22
* @Modify:
**/
@Data
@Api("甘特图分页查询参数")
public class GanttEventModel {
private Long[] resourceIds;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date begin;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date end;
}

43
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
Unescape Escape View File

@ -1,43 +0,0 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.List;
/**
* @Description : 甘特图分页查询参数
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-22
* @Modify:
**/
@Data
@Api("甘特图分页查询参数")
public class GanttPager extends Pager {
public static class SortData {
// 排序对象
private String field;
// 排序类型，1为升序，0为降序
private Boolean ascending;
public String getField() {
return field;
}
public void setField(String field) {
this.field = field;
}
public Boolean getAscending() {
return ascending;
}
public void setAscending(Boolean ascending) {
this.ascending = ascending;
}
}
private String filter;
private List<SortData> sorts;
}

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

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Description : 模块表单枚举类
@ -1973,7 +1972,7 @@ public class BlockFormEnumUtil {
}
private String getJDBCUrlMySQL(String database,String host,Integer port){
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true";
}
private String getJDBCUrlOracle(String database,String host,Integer port){
@ -1985,7 +1984,7 @@ public class BlockFormEnumUtil {
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true";
}
}

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

@ -223,7 +223,8 @@ public class LacEnumUtil {
public enum PARAM_VALUE_TYPE{
INTEGER(1,"整数"),
STRING(2,"字符串"),
FLOAT(3,"浮点");
FLOAT(3,"浮点"),
ORGIN(99,"原始数据");
private int value;
private String description;
@ -347,15 +348,17 @@ public class LacEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOGICAL_OPERATOR{
OR(10,"或"),
AND(20,"与");
OR(10,"或","||"),
AND(20,"与","&&");
private int value;
private String description;
private String operator;
LOGICAL_OPERATOR(int value, String description) {
LOGICAL_OPERATOR(int value, String description, String operator) {
this.value = value;
this.description = description;
this.operator = operator;
}
public int getValue() {
@ -376,6 +379,16 @@ public class LacEnumUtil {
return tmp;
}
public static String valueOfOperator(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].operator;
}
}
return tmp;
}
}
/**
@ -383,19 +396,21 @@ public class LacEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RELATIONAL_OPERATOR{
GT(10,">"),
LT(20,"<"),
EQ(20,"=="),
NE(20,"!="),
GE(20,">="),
LE(20,"<=");
GT(10,"大于",">"),
LT(20,"小于","<"),
EQ(30,"等于","=="),
NE(40,"不等于","!="),
GE(50,"大于等于",">="),
LE(60,"小于等于","<=");
private int value;
private String description;
private String operator;
RELATIONAL_OPERATOR(int value, String description) {
RELATIONAL_OPERATOR(int value, String description,String operator) {
this.value = value;
this.description = description;
this.operator = operator;
}
public int getValue() {
@ -416,6 +431,16 @@ public class LacEnumUtil {
return tmp;
}
public static RELATIONAL_OPERATOR valueOf(int val) {
RELATIONAL_OPERATOR tmp = EQ;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i];
}
}
return tmp;
}
}
/**

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

@ -9,6 +9,7 @@ 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;
@ -84,6 +85,9 @@ public class LacCommandStackStep extends BaseBean {
@ApiParam(value ="步骤任务列表")
private List<LacCommandStackStepTask> stepTaskList;
@Transient
@ApiParam(value ="步骤任务检查")
private List<LacTaskCheck> taskCheckList;
public LacCommandStackStep() {
}

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

@ -85,10 +85,10 @@ public class LacCommandStackStepTask extends BaseBean {
// @Column(name="STEP_NAME_RDD")
// @ApiParam(value ="步骤名称")
// private String stepNameRdd;
//
// @Column(name="STEP_CODE_RDD")
// @ApiParam(value ="步骤代码")
// private String stepCodeRdd;
@Column(name="STEP_CODE_RDD")
@ApiParam(value ="步骤代码")
private String stepCodeRdd;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID")
@ -99,7 +99,7 @@ public class LacCommandStackStepTask extends BaseBean {
@ApiParam(value ="步骤名称")
private String taskNameRdd;
@Column(name="STEP_CODE_RDD")
@Column(name="TASK_CODE_RDD")
@ApiParam(value ="任务代码")
private String taskCodeRdd;

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

@ -82,6 +82,7 @@ public class LacSuitTaskParam extends BaseBean {
@Column(name="PARAM_VALUE_TYPE")
@ApiParam(value ="参数值类型")
@AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class)
private Integer paramValueType;
@Column(name="PARAM_DEFAULT_VALUE")

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

@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -97,4 +98,11 @@ public class LacTaskCheck extends BaseBean {
@ApiParam(value ="目标步骤ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long targetStepId;
@Column(name="TARGET_STEP_NAME_RDD")
@ApiParam(value ="目标步骤名称")
private String targetStepNameRdd;
@Transient
private String value;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
import lombok.Data;
import org.slf4j.LoggerFactory;
@ -55,9 +56,13 @@ public class LacCommandStackModel {
this.recordId = commandStackRecord.getId();
}
public Object getTaskRequestParam(String taskCode){
public Object getTaskRequestParam(LacCommandStackStepTask stepTask){
for (Task task : this.getRequest().getTaskList()) {
if(task.getCode().equals(taskCode)){
// 步骤代码为空时匹配所有任务参数
if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) {
return task.getParamList();
} else if (task.getStepCode() != null && task.getStepCode().equals(stepTask.getStepCodeRdd())
&& task.getCode().equals(stepTask.getTaskCodeRdd())) {
return task.getParamList();
}
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.thoughtworks.xstream.annotations.XStreamAlias;
@ -68,6 +69,7 @@ public class BsSuitCaseParam extends BaseBean {
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class)
private Integer paramValTypeId;
@JsonIgnore
public int getParamValTypeIdVal() {
return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue();
}
@ -88,6 +90,7 @@ public class BsSuitCaseParam extends BaseBean {
@ApiParam(value = "参数值")
private Object paramValue;
@JsonIgnore
public String getParamValueStr() {
if (paramValue == null) {
return null;

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

@ -47,4 +47,8 @@ public class WmsContainerType extends BaseBean {
@ApiParam(value = "是否回收")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
private Integer isRecycle;
@Column(name = "LIMIT_UOM")
@ApiParam(value = "期限单位")
private String limitUom;
}

3
pom.xml
Unescape Escape View File

@ -15,7 +15,8 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-DEV-SNAPSHOT</version> <modules>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>
<module>modules/i3plus-pojo-model</module>

Write Preview
Loading…
Cancel
Save