修改pom文件为最新

yun-zuoyi
wynne1005 5 years ago
parent 7c9719f51e
commit 44696061ee

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-andon</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-aps</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,14 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-base</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>

@ -5,13 +5,15 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-hardswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>
<id>dev</id>

@ -5,13 +5,15 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-jobflow</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>
<id>dev</id>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-lac</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-mes-pcn</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-mes</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -0,0 +1,42 @@
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;
/**
* @author Wynne.Lu
* @date 2020/3/30 11:28
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_MODULE_GROUP")
@Api("工步集")
public class MesActionModuleGroup extends BaseBean implements Serializable {
private static final long serialVersionUID = 1876053661752102998L;
@Column(name = "AMG_ID")
@ApiParam("组件集编号")
private Long amgId;
@Column(name = "AM_CODE")
@ApiParam("组件集代码")
private String amCode;
@Column(name = "SEQ")
@ApiParam("执行顺序")
private Integer seq;
}

@ -42,6 +42,18 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
@ApiParam("工序代码")
private String processCode;
@Column(name = "SM_CODE")
@ApiParam("状态机代码")
private String smCode;
@Column(name = "STATUS_CODE")
@ApiParam("状态代码")
private String statusCode;
@Column(name = "AMG_ID")
@ApiParam("工步集代码")
private Long amgId;
@Column(name = "STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@ -62,6 +74,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
@ApiParam("工步参数值")
private String paramValue;
@Column(name = "IS_ACTIVE")
@ApiParam("是否执行 1=是 2=否")
private Integer isActive;
@Transient
@Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性")

@ -54,6 +54,10 @@ public class MesRouteProcess extends BaseBean implements Serializable {
@ApiParam("是否必须")
private Integer isNecessary;
@Column(name = "SM_CODE")
@ApiParam("状态机代码")
private String smCode;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
}

@ -0,0 +1,62 @@
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;
/**
* @author Wynne.Lu
* @date 2020/3/30 11:48
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SM_ROUTE_OPT_PARAM")
@Api("产品流程状态机配置操作参数表")
public class MesSmRouteOptParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -5466013923105175070L;
@Column(name = "PROD_ROUTE_CFG_ID")
@ApiParam("产品流程Id")
private Integer prodRouteCfgId;
@Column(name="ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@Column(name="STEP_SEQ")
@ApiParam("工步顺序")
private Integer stepSeq;
@Column(name="PARAM_TYPE")
private Integer paramType;
@Column(name="PARAM_CODE")
private String paramCode;
@Column(name="PARAM_VALUE")
private String paramValue;
@Column(name="IS_ACTION")
private Integer isAction;
}

@ -0,0 +1,48 @@
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.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/3/30 11:12
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_STATE_MACHINE")
@Api("MES状态机")
public class MesStateMachine extends BaseBean implements Serializable {
private static final long serialVersionUID = 6093522587973076640L;
@Column(name = "SM_CODE")
@ApiParam("状态机代码")
private String smCode;
@Column(name = "SM_NAME")
@ApiParam("状态机名称")
private String smName;
@Column(name = "SM_TYPE")
@ApiParam("状态机类型")
private String smType;
@Lob
@Column(name = "POSITION")
@ApiParam("GOJS的位置")
private String position;
}

@ -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.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 Wynne.Lu
* @date 2020/3/30 11:12
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_STATE_MACHINE_STATUS")
@Api("MES状态机步骤")
public class MesStateMachineStatus extends BaseBean implements Serializable {
private static final long serialVersionUID = 6093522587973076640L;
@Column(name = "SM_CODE")
@ApiParam("状态机代码")
private String smCode;
@Column(name = "STATUS_CODE")
@ApiParam("状态代码")
private String statusCode;
@Column(name = "NEXT_STATUS")
@ApiParam("下一状态")
private String nextStatus;
@Column(name = "STATUS_NAME")
@ApiParam("状态名称")
private String statusName;
@Column(name = "TRIGGER_TYPE")
@ApiParam("触发类型 10=内部触发 20=外部触发")
private Integer triggerType;
@Column(name = "TRIGGER_EVENT")
@ApiParam("触发事件")
private String triggerEvent;
@Column(name = "TRIGGER_WHERE")
@ApiParam("触发条件")
private String triggerWhere;
@Column(name = "ACTION_AMG_ID")
@ApiParam("触发调用")
private Integer actionAmgId;
@Column(name = "IN_AMG_ID")
@ApiParam("进入调用")
private Integer inAmgId;
@Column(name = "OUT_AMG_ID")
@ApiParam("离开调用")
private Integer outAmgId;
@Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0")
@ApiParam("状态类型 10=初始化状态")
private Integer statusType;
}

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-model</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-platform</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-ptl</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-report</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-sweb</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,14 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-wms</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

@ -5,13 +5,16 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-workflow</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>
<id>dev</id>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>
@ -221,5 +221,37 @@
<!--</plugin>-->
<!--</plugins>-->
<!--</build>-->
<profiles>
<profile>
<id>dev</id>
<properties>
<profileActive>DEV</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>test</id>
<properties>
<profileActive>TEST</profileActive>
</properties>
</profile>
<profile>
<id>docker</id>
<properties>
<profileActive>DOCKER</profileActive>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profileActive>PROD</profileActive>
</properties>
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
</build>
</project>
Loading…
Cancel
Save