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/MesESOP.java

@@ -55,35 +55,8 @@ public class MesESOP extends BaseBean {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
-    @Column(name = "SOP_NAME")
+    @Column(name = "FILE_ID")
-    @ApiParam("SOP名称")
+    @ApiParam("文件id")
-    private String sopName;
+    private Long fileId;
 
-    @Column(name = "SOP_URL")
-    @ApiParam("SOP_URL")
-    private String sopUrl;
-
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
-    private String groupName;
-
-    @Column(name = "FILE_ORIGIN_NAME")
-    @ApiParam("FILE_ORIGIN_NAME")
-    private String fileOriginName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
-
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
-
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
-    private Integer syncTag = 0;
 }

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

@@ -0,0 +1,57 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FILE")
+@Api("文件表")
+public class MesFile extends BaseBean {
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+}

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

@@ -55,36 +55,8 @@ public class MesESOP extends BaseBean {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
-    @Column(name = "SOP_NAME")
+    @Column(name = "FILE_ID")
-    @ApiParam("SOP名称")
+    @ApiParam("文件id")
-    private String sopName;
+    private Long fileId;
-
-    @Column(name = "SOP_URL")
-    @ApiParam("SOP_URL")
-    private String sopUrl;
-
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
-    private String groupName;
-
-    @Column(name = "FILE_ORIGIN_NAME")
-    @ApiParam("FILE_ORIGIN_NAME")
-    private String fileOriginName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
-
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
-
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
-    private Integer syncTag = 0;
 
 }

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

@@ -0,0 +1,57 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FILE")
+@Api("文件表")
+public class MesFile extends BaseBean {
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -49,7 +49,7 @@ public class SysLogTaskTime extends BaseBean {
     @ApiParam(value ="调度服务器端口")
     private String schedulerServerPort;
 
-    @Column(name="TaskThreadId")
+    @Column(name="TASK_THREAD_ID")
     @ApiParam(value ="任务线程id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskThreadId;