mes设备通知

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 设备任务通知人员model
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class EquTaskNotifyUserModel extends BaseBean {
+
+    @ApiParam(value ="人员ID")
+    private Long userId;
+
+    @Column(name="USER_NAME_RDD")
+    @ApiParam(value ="用户名称" , access ="账号名称")
+    private String userName;
+
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="登陆名称" , access ="登陆名称")
+    private String userLoginName;
+
+    @Column(name="USER_EMAIL")
+    @ApiParam(value ="邮箱" , access ="邮箱")
+    private String userEmail;
+
+    @Column(name="USER_PHONE")
+    @ApiParam(value ="手机号" , access ="手机号")
+    private String userPhone;
+
+    @Column(name="USER_STATUS")
+    @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
+    private Integer userStatus;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java

@@ -8,6 +8,9 @@ import java.io.Serializable;
 @Data
 public class MesEquTaskNotifyModel implements Serializable {
 
+    @ApiParam("id")
+    private Long id;
+
     @ApiParam("作业任务编号")
     private String taskNo;
 
@@ -73,7 +76,8 @@ public class MesEquTaskNotifyModel implements Serializable {
 
     }
 
-    public MesEquTaskNotifyModel(String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, Integer notifyFlag, String relateTask, Integer notifyType, Integer notifyCondition, String notifyObjectCode, Integer notifyPattern, String notifyObjectValue, String organizeCode) {
+    public MesEquTaskNotifyModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, Integer notifyFlag, String relateTask, Integer notifyType, Integer notifyCondition, String notifyObjectCode, Integer notifyPattern, String notifyObjectValue, String organizeCode) {
+        this.id = id;
         this.taskNo = taskNo;
         this.taskType = taskType;
         this.taskStatus = taskStatus;