I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安灯类型 查 表 已从表改为枚举

Browse Source 
安灯动作		查询				表		  已从表改为枚举
安灯状态		 查询						   已从表改为枚举		ANDON_STATUS
通知方式		 查询						   已从表改为枚举
重要度			  查							已从表改为枚举
yun-zuoyi
wei.peng 6 years ago
parent 65ddc6f57a
commit b7a7eb29ae
13 changed files with 377 additions and 398 deletions
Show Stats Download Patch File Download Diff File

76
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java
Unescape Escape View File

@ -1,38 +1,38 @@
package cn.estsh.i3plus.pojo.andon.bean; //package cn.estsh.i3plus.pojo.andon.bean;
//
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; //import io.swagger.annotations.ApiParam;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; //import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; //import org.hibernate.annotations.DynamicUpdate;
//
import javax.persistence.Column; //import javax.persistence.Column;
import javax.persistence.Entity; //import javax.persistence.Entity;
import javax.persistence.Table; //import javax.persistence.Table;
//
/** ///**
* @Description : ANDON_动作 // * @Description : ANDON_动作
* @Reference : // * @Reference :
* @Author : hansen.ke // * @Author : hansen.ke
* @CreateDate : 2019-05-13 9:47 // * @CreateDate : 2019-05-13 9:47
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@Entity //@Entity
@Table(name="ANDON_ACTION") //@Table(name="ANDON_ACTION")
@DynamicInsert //@DynamicInsert
@DynamicUpdate //@DynamicUpdate
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@Api("ANDON_动作") //@Api("ANDON_动作")
public class AndonAction extends BaseBean { //public class AndonAction extends BaseBean {
//
@Column(name = "ACTION_CODE") // @Column(name = "ACTION_CODE")
@ApiParam(value = "动作代码") // @ApiParam(value = "动作代码")
private String actionCode; // private String actionCode;
//
@Column(name = "ACTION_NAME") // @Column(name = "ACTION_NAME")
@ApiParam(value = "动作名称") // @ApiParam(value = "动作名称")
private String actionName; // private String actionName;
} //}

14
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java
Unescape Escape View File

@ -28,19 +28,21 @@ import javax.persistence.Table;
@Api("ANDON_呼叫原因") @Api("ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean { public class AndonAlarmCause extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "AC_CODE") @Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码") @ApiParam(value = "呼叫原因代码")
private String acCode; private String acCode;
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@Column(name = "AC_NAME") @Column(name = "AC_NAME")
@ApiParam(value = "呼叫原因描述") @ApiParam(value = "呼叫原因描述")
private String acName; private String acName;
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
} }

76
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java
Unescape Escape View File

@ -1,38 +1,38 @@
package cn.estsh.i3plus.pojo.andon.bean; //package cn.estsh.i3plus.pojo.andon.bean;
//
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; //import io.swagger.annotations.ApiParam;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; //import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; //import org.hibernate.annotations.DynamicUpdate;
//
import javax.persistence.Column; //import javax.persistence.Column;
import javax.persistence.Entity; //import javax.persistence.Entity;
import javax.persistence.Table; //import javax.persistence.Table;
//
/** ///**
* @Description : 安灯类型 // * @Description : 安灯类型
* @Reference : // * @Reference :
* @Author : silliter.yuan // * @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:16 // * @CreateDate : 2019-05-10 17:16
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@Entity //@Entity
@Table(name="ANDON_ALARM_TYPE") //@Table(name="ANDON_ALARM_TYPE")
@DynamicInsert //@DynamicInsert
@DynamicUpdate //@DynamicUpdate
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@Api("安灯类型") //@Api("安灯类型")
public class AndonAlarmType extends BaseBean { //public class AndonAlarmType extends BaseBean {
//
@Column(name = "ALARM_CODE") // @Column(name = "ALARM_TYPE")
@ApiParam(value = "安灯类型代码") // @ApiParam(value = "安灯类型代码")
private String alarmCode; // private String alarmCode;
//
@Column(name = "ALARM_NAME") // @Column(name = "ALARM_NAME")
@ApiParam(value = "安灯类型名称") // @ApiParam(value = "安灯类型名称")
private String alarmName; // private String alarmName;
} //}

76
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java
Unescape Escape View File

@ -1,38 +1,38 @@
package cn.estsh.i3plus.pojo.andon.bean; //package cn.estsh.i3plus.pojo.andon.bean;
//
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; //import io.swagger.annotations.ApiParam;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; //import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; //import org.hibernate.annotations.DynamicUpdate;
//
import javax.persistence.Column; //import javax.persistence.Column;
import javax.persistence.Entity; //import javax.persistence.Entity;
import javax.persistence.Table; //import javax.persistence.Table;
//
/** ///**
* @Description : ANDON_重要度 // * @Description : ANDON_重要度
* @Reference : // * @Reference :
* @Author : siliter.yuan // * @Author : siliter.yuan
* @CreateDate : 2019-05-31 9:47 // * @CreateDate : 2019-05-31 9:47
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@Entity //@Entity
@Table(name="ANDON_IMPORTANCE") //@Table(name="ANDON_IMPORTANCE")
@DynamicInsert //@DynamicInsert
@DynamicUpdate //@DynamicUpdate
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件现象") //@Api("ANDON_事件现象")
public class AndonImportance extends BaseBean { //public class AndonImportance extends BaseBean {
//
@Column(name = "IMPORTANCE_CODE") // @Column(name = "IMPORTANCE_CODE")
@ApiParam(value = "重要等级代码") // @ApiParam(value = "重要等级代码")
private String importanceCode; // private String importanceCode;
//
@Column(name = "IMPORTANCE_NAME") // @Column(name = "IMPORTANCE_NAME")
@ApiParam(value = "重要等级名称") // @ApiParam(value = "重要等级名称")
private String importanceName; // private String importanceName;
} //}

76
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java
Unescape Escape View File

@ -1,38 +1,38 @@
package cn.estsh.i3plus.pojo.andon.bean; //package cn.estsh.i3plus.pojo.andon.bean;
//
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; //import io.swagger.annotations.ApiParam;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; //import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; //import org.hibernate.annotations.DynamicUpdate;
//
import javax.persistence.Column; //import javax.persistence.Column;
import javax.persistence.Entity; //import javax.persistence.Entity;
import javax.persistence.Table; //import javax.persistence.Table;
//
/** ///**
* @Description : 安灯通知方式 // * @Description : 安灯通知方式
* @Reference : // * @Reference :
* @Author : silliter.yuan // * @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:16 // * @CreateDate : 2019-05-10 17:16
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@Entity //@Entity
@Table(name="ANDON_RESPONSE") //@Table(name="ANDON_RESPONSE")
@DynamicInsert //@DynamicInsert
@DynamicUpdate //@DynamicUpdate
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@Api("安灯通知方式") //@Api("安灯通知方式")
public class AndonResponse extends BaseBean { //public class AndonResponse extends BaseBean {
//
@Column(name = "RESPONSE_CODE") // @Column(name = "RESPONSE_CODE")
@ApiParam(value = "通知方式代码") // @ApiParam(value = "通知方式代码")
private String responseCode; // private String responseCode;
//
@Column(name = "RESPONSE_NAME") // @Column(name = "RESPONSE_NAME")
@ApiParam(value = "通知方式名称") // @ApiParam(value = "通知方式名称")
private String responseName; // private String responseName;
} //}

76
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java
Unescape Escape View File

@ -1,38 +1,38 @@
package cn.estsh.i3plus.pojo.andon.bean; //package cn.estsh.i3plus.pojo.andon.bean;
//
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; //import io.swagger.annotations.ApiParam;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; //import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; //import org.hibernate.annotations.DynamicUpdate;
//
import javax.persistence.Column; //import javax.persistence.Column;
import javax.persistence.Entity; //import javax.persistence.Entity;
import javax.persistence.Table; //import javax.persistence.Table;
//
/** ///**
* @Description : 安灯状态 // * @Description : 安灯状态
* @Reference : // * @Reference :
* @Author : silliter.yuan // * @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:16 // * @CreateDate : 2019-05-10 17:16
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@Entity //@Entity
@Table(name="ANDON_STATUS") //@Table(name="ANDON_ACTION_TAG")
@DynamicInsert //@DynamicInsert
@DynamicUpdate //@DynamicUpdate
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@Api("安灯状态") //@Api("安灯状态")
public class AndonStatus extends BaseBean { //public class AndonStatus extends BaseBean {
//
@Column(name = "STATUS_CODE") // @Column(name = "STATUS_CODE")
@ApiParam(value = "状态代码") // @ApiParam(value = "状态代码")
private String statusCode; // private String statusCode;
//
@Column(name = "STATUS_NAME") // @Column(name = "STATUS_NAME")
@ApiParam(value = "状态名称") // @ApiParam(value = "状态名称")
private String statusName; // private String statusName;
} //}

32
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java
Unescape Escape View File

@ -1,16 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository; //package cn.estsh.i3plus.pojo.andon.repository;
//
import cn.estsh.i3plus.pojo.andon.bean.AndonAction; //import cn.estsh.i3plus.pojo.andon.bean.AndonAction;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; //import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository; //import org.springframework.stereotype.Repository;
//
/** ///**
* @Description : 对象持久层仓用方法控制（ANDON_动作） // * @Description : 对象持久层仓用方法控制（ANDON_动作）
* @Reference : // * @Reference :
* @Author : hansen.ke // * @Author : hansen.ke
* @CreateDate : 2019-05-13 11:05 // * @CreateDate : 2019-05-13 11:05
* @Modify: // * @Modify:
**/ // **/
@Repository //@Repository
public interface IAndonActionRepository extends BaseRepository<AndonAction, Long> { //public interface IAndonActionRepository extends BaseRepository<AndonAction, Long> {
} //}

32
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java
Unescape Escape View File

@ -1,16 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository; //package cn.estsh.i3plus.pojo.andon.repository;
//
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; //import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; //import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository; //import org.springframework.stereotype.Repository;
//
/** ///**
* @Description :对象持久层仓用方法控制(安灯类型信息) // * @Description :对象持久层仓用方法控制(安灯类型信息)
* @Reference : // * @Reference :
* @Author : silliter.yuan // * @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27 // * @CreateDate : 2019-05-10 17:27
* @Modify: // * @Modify:
**/ // **/
@Repository //@Repository
public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType,Long> { //public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType,Long> {
} //}

32
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java
Unescape Escape View File

@ -1,16 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository; //package cn.estsh.i3plus.pojo.andon.repository;
//
import cn.estsh.i3plus.pojo.andon.bean.AndonImportance; //import cn.estsh.i3plus.pojo.andon.bean.AndonImportance;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; //import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository; //import org.springframework.stereotype.Repository;
//
/** ///**
* @Description : 对象持久层仓用方法控制（ANDON_重要度） // * @Description : 对象持久层仓用方法控制（ANDON_重要度）
* @Reference : // * @Reference :
* @Author : silliter.yuan // * @Author : silliter.yuan
* @CreateDate : 2019-05-31 11:05 // * @CreateDate : 2019-05-31 11:05
* @Modify: // * @Modify:
**/ // **/
@Repository //@Repository
public interface IAndonImportanceRepository extends BaseRepository<AndonImportance, Long> { //public interface IAndonImportanceRepository extends BaseRepository<AndonImportance, Long> {
} //}

32
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java
Unescape Escape View File

@ -1,16 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository; //package cn.estsh.i3plus.pojo.andon.repository;
//
import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; //import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; //import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository; //import org.springframework.stereotype.Repository;
//
/** ///**
* @Description :对象持久层仓用方法控制(安灯通知方式信息) // * @Description :对象持久层仓用方法控制(安灯通知方式信息)
* @Reference : // * @Reference :
* @Author : silliter.yuan // * @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27 // * @CreateDate : 2019-05-10 17:27
* @Modify: // * @Modify:
**/ // **/
@Repository //@Repository
public interface IAndonResponseRepository extends BaseRepository<AndonResponse,Long> { //public interface IAndonResponseRepository extends BaseRepository<AndonResponse,Long> {
} //}

32
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java
Unescape Escape View File

@ -1,16 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository; //package cn.estsh.i3plus.pojo.andon.repository;
//
import cn.estsh.i3plus.pojo.andon.bean.AndonStatus; //import cn.estsh.i3plus.pojo.andon.bean.AndonStatus;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; //import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository; //import org.springframework.stereotype.Repository;
//
/** ///**
* @Description :对象持久层仓用方法控制(安灯状态信息) // * @Description :对象持久层仓用方法控制(安灯状态信息)
* @Reference : // * @Reference :
* @Author : silliter.yuan // * @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27 // * @CreateDate : 2019-05-10 17:27
* @Modify: // * @Modify:
**/ // **/
@Repository //@Repository
public interface IAndonStatusRepository extends BaseRepository<AndonStatus,Long> { //public interface IAndonStatusRepository extends BaseRepository<AndonStatus,Long> {
} //}

52
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -401,45 +401,19 @@ public class AndonHqlPack {
return result; return result;
} }
//
/** // /**
* 安灯类型查询条件封装 // * 安灯类型查询条件封装
* @param andonAlarmType // * @param andonAlarmType
* @return // * @return
*/ // */
public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) { // public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
DdlPackBean result = new DdlPackBean(); // DdlPackBean result = new DdlPackBean();
//
getStringBuilderPack(andonAlarmType, result); // getStringBuilderPack(andonAlarmType, result);
//
return result; // return result;
} // }
/**
* 安灯状态查询条件封装
* @param andonStatus
* @return
*/
public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(andonStatus, result);
return result;
}
/**
* ANDON通知方式查询条件封装
* @param andonResponse
* @return
*/
public static DdlPackBean packAndonResponse(AndonResponse andonResponse){
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(andonResponse, result);
return result;
}
/** /**
* ANDON通知对象查询条件封装 * ANDON通知对象查询条件封装

169
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
Unescape Escape View File

@ -90,15 +90,14 @@ public class AndonEnumUtil {
* 10-是，20-否 * 10-是，20-否
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_ALARM_STATUS{ public enum ALARM_STATUS {
YES(10,"需要按灯"), YES(10,"需要按灯"),
ON(20,"不需要按灯"); ON(20,"不需要按灯");
private int value; private int value;
private String description; private String description;
IS_ALARM_STATUS(int value, String description) { ALARM_STATUS(int value, String description) {
this.value = value; this.value = value;
this.description = description; this.description = description;
} }
@ -128,7 +127,6 @@ public class AndonEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{ public enum ALARM_BUSI_FLAG{
ALARM_FLAG("10","安灯呼叫标识"), ALARM_FLAG("10","安灯呼叫标识"),
USER_CODE("20","用户工号"), USER_CODE("20","用户工号"),
READ_FLAG("30", "安灯读取状态"), READ_FLAG("30", "安灯读取状态"),
@ -158,8 +156,7 @@ public class AndonEnumUtil {
* 1-呼叫，2-签到，3-解决 * 1-呼叫，2-签到，3-解决
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_FLAG{ public enum ANDON_ACTION_TAG {
CALL(1,"10","呼叫"), CALL(1,"10","呼叫"),
SIGN(2,"20","响应"), SIGN(2,"20","响应"),
RESOLVE(3,"30","解决"), RESOLVE(3,"30","解决"),
@ -171,7 +168,7 @@ public class AndonEnumUtil {
private String code; private String code;
private String description; private String description;
ALARM_FLAG(int value,String code, String description) { ANDON_ACTION_TAG(int value, String code, String description) {
this.value = value; this.value = value;
this.code = code; this.code = code;
this.description = description; this.description = description;
@ -198,37 +195,7 @@ public class AndonEnumUtil {
} }
} }
/**
* 按灯动作标志
* 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_FLAG{
CALL_ACTION("10","呼叫动作"),
SIGN_ACTION("20","签到动作"),
RESOLVE_ACTION("30", "解决动作"),
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
SHIFG_CALL_ACTION("70", "转呼动作");
private String value;
private String description;
ANDON_ACTION_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/** /**
* 优先级别 * 优先级别
@ -236,7 +203,6 @@ public class AndonEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_PRIORITY{ public enum ALARM_PRIORITY{
FIRST(10,"一级"), FIRST(10,"一级"),
SECOND(20,"二级"), SECOND(20,"二级"),
THIRD(30,"三级"); THIRD(30,"三级");
@ -268,52 +234,14 @@ public class AndonEnumUtil {
} }
} }
/**
* 通知级别
* 10 - 一级，20 - 二级，30 - 三级，40 - 四级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_LEVEL{
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级"),
FOUTH(40,"四级");
private int value;
private String description;
NOTICE_LEVEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/** /**
* ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_CODE{ public enum ALARM_TYPE {
PART("PART_ALARM","物料"), PART("PART_ALARM","物料"),
QUALITY("QUALITY_ALARM","质量"), QUALITY("QUALITY_ALARM","质量"),
EQUIP("EQUMENT_ALARM","设备"), EQUIP("EQUMENT_ALARM","设备"),
@ -323,7 +251,7 @@ public class AndonEnumUtil {
private String value; private String value;
private String description; private String description;
ALARM_CODE(String value, String description) { ALARM_TYPE(String value, String description) {
this.value = value; this.value = value;
this.description = description; this.description = description;
} }
@ -352,7 +280,6 @@ public class AndonEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROD_ORG_LEVEL{ public enum PROD_ORG_LEVEL{
LEVEL_ONE(1,"一级目录"), LEVEL_ONE(1,"一级目录"),
LEVEL_TWO(2,"二级目录"), LEVEL_TWO(2,"二级目录"),
LEVEL_THREE(3,"三级目录"), LEVEL_THREE(3,"三级目录"),
@ -391,7 +318,6 @@ public class AndonEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOP_LINE_FLAG{ public enum STOP_LINE_FLAG{
STOP("1","停止产线"), STOP("1","停止产线"),
RESTART("0","启动产线"); RESTART("0","启动产线");
@ -417,15 +343,91 @@ public class AndonEnumUtil {
* 10-短信，20-邮箱 * 10-短信，20-邮箱
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_WAYS{ public enum NOTICE_MESSAGE_SEND_TYPE {
SMS("10","短信"), SMS("10","短信"),
EMAIL("20","邮箱"); EMAIL("20","邮箱");
private String value; private String value;
private String description; private String description;
NOTICE_WAYS(String value, String description) { NOTICE_MESSAGE_SEND_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 通知级别
* 10 - 一级，20 - 二级，30 - 三级，40 - 四级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_MESSAGE_SEND_LEVEL {
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级"),
FOUTH(40,"四级");
private int value;
private String description;
NOTICE_MESSAGE_SEND_LEVEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 安灯动作
* <per>
* <br/> 10 = 呼叫
* <br/> 20 = 签到
* <br/> 30 = 解决
* <br/> 40 = 撤销
* <br/> 50 = 提交
* <br/> 60 = 审批
* <br/> 70 = 转呼
* </per>
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_FLAG{
CALL_ACTION("10","呼叫动作"),
SIGN_ACTION("20","签到动作"),
RESOLVE_ACTION("30", "解决动作"),
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
SHIFG_CALL_ACTION("70", "转呼动作");
private String value;
private String description;
ANDON_ACTION_FLAG(String value, String description) {
this.value = value; this.value = value;
this.description = description; this.description = description;
} }
@ -438,4 +440,5 @@ public class AndonEnumUtil {
return description; return description;
} }
} }
} }

Write Preview
Loading…
Cancel
Save