Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
commit
f2b19055d4
@ -0,0 +1,37 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.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;
|
||||
|
||||
/**
|
||||
* @Description :工序
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PROCESS")
|
||||
@Api("工序")
|
||||
public class MesProcess extends BaseBean {
|
||||
@Column(name = "PROCESS_CODE")
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@Column(name = "PROCESS_NAME")
|
||||
@ApiParam("工序名称")
|
||||
private String processName;
|
||||
}
|
@ -0,0 +1,41 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.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;
|
||||
|
||||
/**
|
||||
* @Description :流程表
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_ROUTE")
|
||||
@Api("流程表")
|
||||
public class MesRoute extends BaseBean {
|
||||
@Column(name = "ROUTE_CODE")
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@Column(name = "ROUTE_NAME")
|
||||
@ApiParam("流程名称")
|
||||
private String routeName;
|
||||
|
||||
@Column(name = "POSITION")
|
||||
@ApiParam("GOJS位置")
|
||||
private String position;
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcess;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProcessRepository extends BaseRepository<MesProcess, Long> {
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRoute;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesRouteRepository extends BaseRepository<MesRoute, Long> {
|
||||
}
|
@ -0,0 +1,59 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :PLC设备信息配置表
|
||||
* @Reference :
|
||||
* @Author : Crish
|
||||
* @CreateDate : 2019-05-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PLC_CONFIGURE")
|
||||
@Api("PLC设备信息配置表")
|
||||
public class MesPLCConfigure extends BaseBean {
|
||||
@Column(name="IP")
|
||||
@ApiParam("设备ip")
|
||||
private String ipAddress;
|
||||
|
||||
@Column(name="CHANNEL_NAME")
|
||||
@ApiParam("通道名称")
|
||||
private String channelName;
|
||||
|
||||
@Column(name="DEVICE_NAME")
|
||||
@ApiParam("设备地址")
|
||||
private String deviceName;
|
||||
|
||||
@Column(name="TAG_NAME")
|
||||
@ApiParam("标签地址")
|
||||
private String tagName;
|
||||
|
||||
@Column(name="AREA_CODE")
|
||||
@ApiParam("区域代码")
|
||||
private String areaCode;
|
||||
|
||||
@Column(name="WORK_CELL_CODE")
|
||||
@ApiParam("工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name="WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
}
|
@ -0,0 +1,80 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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: yiming.gu
|
||||
* @CreateDate:2019-05-30-17:32
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PCN_SYNC_CFG")
|
||||
@Api("MES_PCN_同步配置")
|
||||
public class MesPcnSyncCfg extends BaseBean {
|
||||
@Column(name="PCN_CODE")
|
||||
@ApiParam("PCN代码")
|
||||
private String pcnCode;
|
||||
|
||||
@Column(name="OBJECT_CODE")
|
||||
@ApiParam("对象代码")
|
||||
private String objectCode;
|
||||
|
||||
@Column(name="OBJECT_NAME")
|
||||
@ApiParam("对象名称")
|
||||
private String objectName;
|
||||
|
||||
@Column(name="OBJECT_KEY")
|
||||
@ApiParam("对象主键")
|
||||
private String objectKey;
|
||||
|
||||
@Column(name="SYNC_FREQUENCY")
|
||||
@ApiParam("同步频率")
|
||||
private Integer syncFrequency;
|
||||
|
||||
@Column(name="SYNC_TIME")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam(value ="同步时间")
|
||||
private String syncTime;
|
||||
|
||||
@Column(name="SYNC_PATTERN")//2、新增 1、修改
|
||||
@ApiParam("同步方式")
|
||||
private Integer syncPattern;
|
||||
|
||||
@Column(name="SYNC_TYPE")//1\pcn获取mes数据 2、pcn推送数据至mes
|
||||
@ApiParam("同步类型")
|
||||
private Integer syncType;
|
||||
|
||||
@Column(name="LAST_SYNC_TIME")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam(value ="上一同步时间")
|
||||
private String lastSyncTime;
|
||||
|
||||
public int getSyncFrequencyVal() {
|
||||
return this.syncFrequency == null ? 0 : this.syncFrequency;
|
||||
}
|
||||
|
||||
public int getSyncTypeVal() {
|
||||
return this.syncType == null ? 0 : this.syncType;
|
||||
}
|
||||
|
||||
public int getSyncPatternVal() {
|
||||
return this.syncPattern == null ? 0 : this.syncPattern;
|
||||
}
|
||||
}
|
@ -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.MesPLCConfigure;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigure, Long> {
|
||||
}
|
@ -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.MesPcnSyncCfg;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: yiming.gu
|
||||
* @CreateDate:2019-04-24-17:13
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPcnSyncCfgRepository extends BaseRepository<MesPcnSyncCfg, Long> {
|
||||
}
|
Loading…
Reference in New Issue