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

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java

@@ -43,4 +43,31 @@ public class MesPcn extends BaseBean {
     @ApiParam("工作中心")
     private String workCentreCode;
 
+    @Column(name="PCN_VERSION")
+    @ApiParam("PCN版本")
+    private String pcnVersion;
+
+    @Column(name="CONNECT_IP")
+    @ApiParam("连接IP")
+    private String connectIp;
+
+    @Column(name="CONNECT_COUNT")
+    @ApiParam("连接次数")
+    private Integer connectCount;
+
+    @Column(name="IS_CONNECT")
+    @ApiParam("是否连接")
+    private Integer isConnect;
+
+    @Column(name="CONNECT_TIME")
+    @ApiParam("连接时间")
+    private String connectTime;
+
+    public int getConnectCountVal() {
+        return this.connectCount == null ? 0 : this.connectCount;
+    }
+
+    public int getIsConnectVal() {
+        return this.isConnect == null ? 0 : this.isConnect;
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java

@@ -0,0 +1,53 @@
+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: yiming.gu
+ * @CreateDate:2019-04-22-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_CONNECT_LOG")
+@Api("PCN节点连接日志")
+public class MesPcnConnectLog extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN名称")
+    private String pcnName;
+
+    @Column(name="PCN_VERSION")
+    @ApiParam("PCN版本")
+    private String pcnVersion;
+
+    @Column(name="CONNECT_IP")
+    @ApiParam("连接IP")
+    private String connectIp;
+
+    @Column(name="IS_CONNECT")
+    @ApiParam("是否连接")
+    private Integer isConnect;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    private String Remark;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java

@@ -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.MesPcnConnectLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnConnectLogRepository extends BaseRepository<MesPcnConnectLog, Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java

@@ -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.MesPcn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnRepository extends BaseRepository<MesPcn, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java

@@ -0,0 +1,73 @@
+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:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-22-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN")
+@Api("PCN节点")
+public class MesPcn extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN名称")
+    private String pcnName;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域")
+    private String areaCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCentreCode;
+
+    @Column(name="PCN_VERSION")
+    @ApiParam("PCN版本")
+    private String pcnVersion;
+
+    @Column(name="CONNECT_IP")
+    @ApiParam("连接IP")
+    private String connectIp;
+
+    @Column(name="CONNECT_COUNT")
+    @ApiParam("连接次数")
+    private Integer connectCount;
+
+    @Column(name="IS_CONNECT")
+    @ApiParam("是否连接")
+    private Integer isConnect;
+
+    @Column(name="CONNECT_TIME")
+    @ApiParam("连接时间")
+    private String connectTime;
+
+    public int getConnectCountVal() {
+        return this.connectCount == null ? 0 : this.connectCount;
+    }
+
+    public int getIsConnectVal() {
+        return this.isConnect == null ? 0 : this.isConnect;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java

@@ -0,0 +1,53 @@
+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:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-22-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_CONNECT_LOG")
+@Api("PCN节点连接日志")
+public class MesPcnConnectLog extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN名称")
+    private String pcnName;
+
+    @Column(name="PCN_VERSION")
+    @ApiParam("PCN版本")
+    private String pcnVersion;
+
+    @Column(name="CONNECT_IP")
+    @ApiParam("连接IP")
+    private String connectIp;
+
+    @Column(name="IS_CONNECT")
+    @ApiParam("是否连接")
+    private Integer isConnect;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    private String Remark;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnConnectLogRepository.java

@@ -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.MesPcnConnectLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnConnectLogRepository extends BaseRepository<MesPcnConnectLog, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnRepository.java

@@ -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.MesPcn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnRepository extends BaseRepository<MesPcn, Long> {
+}