yun-zuoyi
Ye-Bu 3 years ago
commit bff48cf946

@ -4,16 +4,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.annotation.Transient;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -25,7 +21,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE")
@Table(name = "ANDON_ACTION_MODULE", indexes = {
@Index(columnList = "AM_CODE"),
@Index(columnList = "AM_NAME")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("作业组件")

@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE_GROUP")
@Table(name = "ANDON_ACTION_MODULE_GROUP", indexes = {
@Index(columnList = "AMG_ID"),
@Index(columnList = "AM_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("组件集")

@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,11 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_MODULE_PARAM")
@Table(name = "ANDON_ACTION_MODULE_PARAM", indexes = {
@Index(columnList = "AM_CODE"),
@Index(columnList = "PARAM_CODE"),
@Index(columnList = "AM_CODE, PARAM_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("组件参数")

@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +21,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTION_ROUTE")
@Table(name = "ANDON_ACTION_ROUTE", indexes = {
@Index(columnList = "ROUTE_CODE"),
@Index(columnList = "ROUTE_NAME")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("作业流程")

@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTOR")
@Table(name = "ANDON_ACTOR", indexes = {
@Index(columnList = "ACTOR_CODE"),
@Index(columnList = "ACTOR_NAME")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ACTOR信息")

@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ACTOR_RULE")
@Table(name = "ANDON_ACTOR_RULE", indexes = {
@Index(columnList = "ACTOR_CODE"),
@Index(columnList = "MT_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("ACTOR消息类型配置")

@ -6,15 +6,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,12 @@ import java.io.Serializable;
**/
@Data
@Entity
@Table(name="ANDON_ALARM_DETAIL_TYPE")
@Table(name = "ANDON_ALARM_DETAIL_TYPE", indexes = {
@Index(columnList = "ALARM_CODE"),
@Index(columnList = "ALARM_DETAIL_CODE"),
@Index(columnList = "ALARM_DETAIL_NAME"),
@Index(columnList = "ALARM_CODE, ALARM_DETAIL_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +21,13 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ALARM_ROUTE")
@Table(name = "ANDON_ALARM_ROUTE", indexes = {
@Index(columnList = "ROUTE_CODE"),
@Index(columnList = "ALARM_CODE"),
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "ROUTE_CODE, ALARM_CODE"),
@Index(columnList = "ROUTE_CODE, ALARM_CODE, WORK_CENTER_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯作业流程配置")

@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,11 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM")
@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM", indexes = {
@Index(columnList = "ALARM_ROUTE_ID"),
@Index(columnList = "ROUTE_CODE"),
@Index(columnList = "ALARM_ROUTE_ID, ROUTE_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯作业流程组件参数")

@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +21,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ALARM_TYPE")
@Table(name = "ANDON_ALARM_TYPE", indexes = {
@Index(columnList = "ALARM_CODE"),
@Index(columnList = "ALARM_NAME")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("安灯类型")

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -12,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
@ -27,7 +25,10 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="ANDON_AREA")
@Table(name = "ANDON_AREA", indexes = {
@Index(columnList = "AREA_CODE"),
@Index(columnList = "AREA_NAME")
})
@Api("安灯区域")
public class AndonArea extends BaseBean implements Serializable {

@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -25,7 +21,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_AREA_ALARM_TYPE")
@Table(name = "ANDON_AREA_ALARM_TYPE", indexes = {
@Index(columnList = "AREA_CODE"),
@Index(columnList = "ALARM_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("区域安灯类型")

@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -28,7 +24,11 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name="ANDON_CONFIG")
@Table(name = "ANDON_CONFIG", indexes = {
@Index(columnList = "CONFIG_CODE"),
@Index(columnList = "CONFIG_CODE, CONFIG_KEY"),
@Index(columnList = "CONFIG_CODE, CONFIG_KEY, CONFIG_GROUP")
})
@Api(value="系统配置")
public class AndonConfig extends BaseBean implements Serializable {

@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_MESSAGE_TYPE")
@Table(name = "ANDON_MESSAGE_TYPE", indexes = {
@Index(columnList = "MT_CODE"),
@Index(columnList = "MT_NAME")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("消息类型")

@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +22,10 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ROUTE_MODULE_PARAM")
@Table(name = "ANDON_ROUTE_MODULE_PARAM", indexes = {
@Index(columnList = "ROUTE_CODE"),
@Index(columnList = "ROUTE_CODE, AMG_ID, AM_CODE, STATUS_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("流程组件参数")

@ -5,16 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -27,7 +22,9 @@ import java.io.Serializable;
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_ROUTE_STATUS")
@Table(name = "ANDON_ROUTE_STATUS", indexes = {
@Index(columnList = "ROUTE_CODE")
})
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("流程状态")

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -11,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
@ -26,7 +24,12 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "ANDON_WORK_CELL")
@Table(name = "ANDON_WORK_CELL", indexes = {
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE"),
@Index(columnList = "WORK_CELL_NAME"),
@Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE")
})
@Api("安灯工作单元")
public class AndonWorkCell extends BaseBean implements Serializable {

@ -24,7 +24,12 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "ANDON_WORK_CENTER")
@Table(name = "ANDON_WORK_CENTER", indexes = {
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CENTER_NAME"),
@Index(columnList = "AREA_CODE"),
@Index(columnList = "AREA_CODE, WORK_CENTER_CODE")
})
@Api("安灯工作中心")
public class AndonWorkCenter extends BaseBean implements Serializable {
@ -38,7 +43,6 @@ public class AndonWorkCenter extends BaseBean implements Serializable {
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;

@ -69,7 +69,4 @@ public class FsmModel implements Serializable {
@ApiParam("进入触发方法时默认不需要校验外部触发")
private boolean checkTriggerTypeFalg = false;
@ApiParam("下个触发事件")
private String nextTriggerEvent;
}

@ -0,0 +1,63 @@
package cn.estsh.i3plus.pojo.andon.model;
import io.swagger.annotations.Api;
import lombok.Data;
@Data
@Api("组件返回信息")
public class ModuleResult {
private boolean isCompleted;
private String msg;
private String nextTriggerEvent;
public static ModuleResult getNonComplete() {
return new ModuleResult(false, "");
}
public static ModuleResult getNonComplete(String msg) {
return new ModuleResult(false, msg);
}
public static ModuleResult getCustomNonComplete(String nextTriggerEvent) {
return new ModuleResult(false, "", nextTriggerEvent);
}
public static ModuleResult getCustomNonComplete(String msg, String nextTriggerEvent) {
return new ModuleResult(false, msg, nextTriggerEvent);
}
public static ModuleResult getSuccessComplete() {
return new ModuleResult(true, "");
}
public static ModuleResult getSuccessComplete(String msg) {
return new ModuleResult(true, msg);
}
public static ModuleResult getCustomSuccessComplete(String nextTriggerEvent) {
return new ModuleResult(true, "", nextTriggerEvent);
}
public static ModuleResult getCustomSuccessComplete(String msg, String nextTriggerEvent) {
return new ModuleResult(true, msg, nextTriggerEvent);
}
private ModuleResult() {
}
private ModuleResult(boolean isCompleted, String msg) {
this.isCompleted = isCompleted;
this.msg = msg;
}
public ModuleResult(boolean isCompleted, String msg, String nextTriggerEvent) {
this.isCompleted = isCompleted;
this.msg = msg;
this.nextTriggerEvent = nextTriggerEvent;
}
}

@ -21,7 +21,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ
public String toString() {
return "StationRequestBean{" +
"actorReceiveStrategyClass='" + get(actorReceiveStrategyClass) + '\'' +
", stationRequestBeanAbClass='" + get(stationRequestBeanAbClass) + '\'' +
", actorClass='" + get(actorClass) + '\'' +
", fsmCachedKey='" + get(fsmCachedKey) + '\'' +
", organizeCode='" + get(organizeCode) + '\'' +
", userInfo='" + get(userInfo) + '\'' +

@ -23,8 +23,8 @@ public abstract class StationRequestBeanAb implements Serializable {
@ApiParam("ACTOR接收策略类名")
public String actorReceiveStrategyClass;
@ApiParam("工位请求bean子类")
public String stationRequestBeanAbClass;
@ApiParam("ACTOR类名")
public String actorClass;
@ApiParam("缓存数据KEY")
public String fsmCachedKey;

@ -1276,5 +1276,18 @@ public class AndonHqlPack {
return packBean;
}
/**
* Andon
* @param workCenter
* @return
*/
public static DdlPackBean getAllCenter(AndonWorkCenter workCenter) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(workCenter.getOrganizeCode());
DdlPreparedPack.getStringLikerPack(workCenter.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(workCenter.getWorkCenterName(), "workCenterName", packBean);
DdlPreparedPack.getStringEqualPack(workCenter.getAreaCode(), "areaCode", packBean);
return packBean;
}
}

@ -147,6 +147,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("回冲标识")
private String jisBackflushStatus;
@Column(name = "QC_STATUS")
@ApiParam("质量状态")
private String qcStatus;
@Transient
@ApiParam("Vin")
private String vinCode;

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author ns
* @create 2022/5/17 0017 15:38
* andon model
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("andon 调用core查询的model")
public class AndonQueryUserModel {
@ApiModelProperty(value ="工厂代码" , access ="工厂代码")
private String organizeCode;
@ApiModelProperty(value ="账号登录名" , access ="账号登录名")
private String userLoginName;
@ApiModelProperty(value ="用户名称" , access ="用户名称")
private String userName;
@ApiModelProperty(value ="部门名称" , access ="部门名称")
private String department;
}

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author ns
* @create 2022/5/17 0017 15:39
* andon model
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("根据条件查询数据返回给andon的结果")
public class AndonQueryUserResultModel {
@ApiModelProperty(value ="用户账号id" , access ="用户账号id")
private Long userId;
@ApiModelProperty(value ="用户信息id" , access ="用户信息id")
private Long userInfoId;
@ApiModelProperty(value ="账号登录名" , access ="账号登录名")
private String loginName;
@ApiModelProperty(value ="用户名称" , access ="用户名称")
private String userName;
@ApiModelProperty(value ="部门名称" , access ="部门名称")
private String department;
}

@ -19,7 +19,9 @@ import java.util.List;
public class DingSendBatchRequestModel {
@ApiModelProperty(value ="手机号" , access ="手机号")
private List<String> phoneNumberList ;
private List<String> phoneNumberList;
@ApiModelProperty(value ="账号登录名列表" , access ="账号登录名列表")
private List<String> userLoginNameList ;
@ApiModelProperty(value ="消息标题" , access ="消息标题")
private String title ;
@ApiModelProperty(value ="消息内容" , access ="消息内容")

Loading…
Cancel
Save