From b7a7eb29aeee571390b6f0573fc90b9cd6b4defd Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 13 Jun 2019 18:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=20=09=09?= =?UTF-8?q?=20=E6=9F=A5=09=09=09=09=E8=A1=A8=09=09=20=20=E5=B7=B2=E4=BB=8E?= =?UTF-8?q?=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=9E=9A=E4=B8=BE=20=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E5=8A=A8=E4=BD=9C=09=09=E6=9F=A5=E8=AF=A2=09=09=09=09?= =?UTF-8?q?=E8=A1=A8=09=09=20=20=E5=B7=B2=E4=BB=8E=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9E=9A=E4=B8=BE=20=E5=AE=89=E7=81=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=09=09=20=E6=9F=A5=E8=AF=A2=09=09=09=09=09=09=20=20=20?= =?UTF-8?q?=E5=B7=B2=E4=BB=8E=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=09=09ANDON=5FSTATUS=20=E9=80=9A=E7=9F=A5=E6=96=B9=E5=BC=8F=09?= =?UTF-8?q?=09=20=E6=9F=A5=E8=AF=A2=09=09=09=09=09=09=20=20=20=E5=B7=B2?= =?UTF-8?q?=E4=BB=8E=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=9E=9A=E4=B8=BE=20?= =?UTF-8?q?=E9=87=8D=E8=A6=81=E5=BA=A6=09=09=09=20=20=E6=9F=A5=09=09=09=09?= =?UTF-8?q?=09=09=09=E5=B7=B2=E4=BB=8E=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonAction.java | 76 ++++----- .../bean/AndonAlarmCause.java | 14 +- .../bean/AndonAlarmType.java | 76 ++++----- .../bean/AndonImportance.java | 76 ++++----- .../bean/AndonResponse.java | 76 ++++----- .../bean/AndonStatus.java | 76 ++++----- .../repository/IAndonActionRepository.java | 32 ++-- .../repository/IAndonAlarmTypeRepository.java | 32 ++-- .../repository/IAndonImportanceRepository.java | 32 ++-- .../repository/IAndonResponseRepository.java | 32 ++-- .../repository/IAndonStatusRepository.java | 32 ++-- .../sqlpack/AndonHqlPack.java | 52 ++----- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 169 +++++++++++---------- 13 files changed, 377 insertions(+), 398 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java index cb8c0b6..4b71a12 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java @@ -1,38 +1,38 @@ -package cn.estsh.i3plus.pojo.andon.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 : ANDON_动作 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2019-05-13 9:47 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_ACTION") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("ANDON_动作") -public class AndonAction extends BaseBean { - - @Column(name = "ACTION_CODE") - @ApiParam(value = "动作代码") - private String actionCode; - - @Column(name = "ACTION_NAME") - @ApiParam(value = "动作名称") - private String actionName; -} +//package cn.estsh.i3plus.pojo.andon.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 : ANDON_动作 +// * @Reference : +// * @Author : hansen.ke +// * @CreateDate : 2019-05-13 9:47 +// * @Modify: +// **/ +//@Data +//@Entity +//@Table(name="ANDON_ACTION") +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Api("ANDON_动作") +//public class AndonAction extends BaseBean { +// +// @Column(name = "ACTION_CODE") +// @ApiParam(value = "动作代码") +// private String actionCode; +// +// @Column(name = "ACTION_NAME") +// @ApiParam(value = "动作名称") +// private String actionName; +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index 5299981..b7cb9c1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -28,19 +28,21 @@ import javax.persistence.Table; @Api("ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean { + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + @Column(name = "AC_CODE") @ApiParam(value = "呼叫原因代码") private String acCode; + @Column(name = "PARENT_AC_CODE") + @ApiParam(value = "父阶原因代码") + private String parentAcCode; + @Column(name = "AC_NAME") @ApiParam(value = "呼叫原因描述") private String acName; - @Column(name = "PARENT_AC_CODE") - @ApiParam(value = "父阶原因代码") - private String parentAcCode; - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") - private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java index 821efb7..e3ea63e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java @@ -1,38 +1,38 @@ -package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan - * @CreateDate : 2019-05-10 17:16 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_ALARM_TYPE") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("安灯类型") -public class AndonAlarmType extends BaseBean { - - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") - private String alarmCode; - - @Column(name = "ALARM_NAME") - @ApiParam(value = "安灯类型名称") - private String alarmName; -} +//package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan +// * @CreateDate : 2019-05-10 17:16 +// * @Modify: +// **/ +//@Data +//@Entity +//@Table(name="ANDON_ALARM_TYPE") +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Api("安灯类型") +//public class AndonAlarmType extends BaseBean { +// +// @Column(name = "ALARM_TYPE") +// @ApiParam(value = "安灯类型代码") +// private String alarmCode; +// +// @Column(name = "ALARM_NAME") +// @ApiParam(value = "安灯类型名称") +// private String alarmName; +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java index e7d4dc7..7105fd6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java @@ -1,38 +1,38 @@ -package cn.estsh.i3plus.pojo.andon.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 : ANDON_重要度 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2019-05-31 9:47 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_IMPORTANCE") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("ANDON_事件现象") -public class AndonImportance extends BaseBean { - - @Column(name = "IMPORTANCE_CODE") - @ApiParam(value = "重要等级代码") - private String importanceCode; - - @Column(name = "IMPORTANCE_NAME") - @ApiParam(value = "重要等级名称") - private String importanceName; -} +//package cn.estsh.i3plus.pojo.andon.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 : ANDON_重要度 +// * @Reference : +// * @Author : siliter.yuan +// * @CreateDate : 2019-05-31 9:47 +// * @Modify: +// **/ +//@Data +//@Entity +//@Table(name="ANDON_IMPORTANCE") +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Api("ANDON_事件现象") +//public class AndonImportance extends BaseBean { +// +// @Column(name = "IMPORTANCE_CODE") +// @ApiParam(value = "重要等级代码") +// private String importanceCode; +// +// @Column(name = "IMPORTANCE_NAME") +// @ApiParam(value = "重要等级名称") +// private String importanceName; +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java index e3e23ba..dcc55cc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java @@ -1,38 +1,38 @@ -package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan - * @CreateDate : 2019-05-10 17:16 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_RESPONSE") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("安灯通知方式") -public class AndonResponse extends BaseBean { - - @Column(name = "RESPONSE_CODE") - @ApiParam(value = "通知方式代码") - private String responseCode; - - @Column(name = "RESPONSE_NAME") - @ApiParam(value = "通知方式名称") - private String responseName; -} +//package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan +// * @CreateDate : 2019-05-10 17:16 +// * @Modify: +// **/ +//@Data +//@Entity +//@Table(name="ANDON_RESPONSE") +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Api("安灯通知方式") +//public class AndonResponse extends BaseBean { +// +// @Column(name = "RESPONSE_CODE") +// @ApiParam(value = "通知方式代码") +// private String responseCode; +// +// @Column(name = "RESPONSE_NAME") +// @ApiParam(value = "通知方式名称") +// private String responseName; +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java index a5ee2db..73fca80 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java @@ -1,38 +1,38 @@ -package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan - * @CreateDate : 2019-05-10 17:16 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_STATUS") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("安灯状态") -public class AndonStatus extends BaseBean { - - @Column(name = "STATUS_CODE") - @ApiParam(value = "状态代码") - private String statusCode; - - @Column(name = "STATUS_NAME") - @ApiParam(value = "状态名称") - private String statusName; -} +//package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan +// * @CreateDate : 2019-05-10 17:16 +// * @Modify: +// **/ +//@Data +//@Entity +//@Table(name="ANDON_ACTION_TAG") +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Api("安灯状态") +//public class AndonStatus extends BaseBean { +// +// @Column(name = "STATUS_CODE") +// @ApiParam(value = "状态代码") +// private String statusCode; +// +// @Column(name = "STATUS_NAME") +// @ApiParam(value = "状态名称") +// private String statusName; +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java index 008a3ca..99dddcb 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java @@ -1,16 +1,16 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonAction; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制（ANDON_动作） - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2019-05-13 11:05 - * @Modify: - **/ -@Repository -public interface IAndonActionRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.andon.repository; +// +//import cn.estsh.i3plus.pojo.andon.bean.AndonAction; +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import org.springframework.stereotype.Repository; +// +///** +// * @Description : 对象持久层仓用方法控制（ANDON_动作） +// * @Reference : +// * @Author : hansen.ke +// * @CreateDate : 2019-05-13 11:05 +// * @Modify: +// **/ +//@Repository +//public interface IAndonActionRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java index 31afb4f..c1c4f04 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java @@ -1,16 +1,16 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description :对象持久层仓用方法控制(安灯类型信息) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-10 17:27 - * @Modify: - **/ -@Repository -public interface IAndonAlarmTypeRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.andon.repository; +// +//import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import org.springframework.stereotype.Repository; +// +///** +// * @Description :对象持久层仓用方法控制(安灯类型信息) +// * @Reference : +// * @Author : silliter.yuan +// * @CreateDate : 2019-05-10 17:27 +// * @Modify: +// **/ +//@Repository +//public interface IAndonAlarmTypeRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java index e598260..ffcd41e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java @@ -1,16 +1,16 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonImportance; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制（ANDON_重要度） - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-31 11:05 - * @Modify: - **/ -@Repository -public interface IAndonImportanceRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.andon.repository; +// +//import cn.estsh.i3plus.pojo.andon.bean.AndonImportance; +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import org.springframework.stereotype.Repository; +// +///** +// * @Description : 对象持久层仓用方法控制（ANDON_重要度） +// * @Reference : +// * @Author : silliter.yuan +// * @CreateDate : 2019-05-31 11:05 +// * @Modify: +// **/ +//@Repository +//public interface IAndonImportanceRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java index 3c2dc3d..b854621 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java @@ -1,16 +1,16 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description :对象持久层仓用方法控制(安灯通知方式信息) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-10 17:27 - * @Modify: - **/ -@Repository -public interface IAndonResponseRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.andon.repository; +// +//import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import org.springframework.stereotype.Repository; +// +///** +// * @Description :对象持久层仓用方法控制(安灯通知方式信息) +// * @Reference : +// * @Author : silliter.yuan +// * @CreateDate : 2019-05-10 17:27 +// * @Modify: +// **/ +//@Repository +//public interface IAndonResponseRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java index e33d81f..cd8620d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java @@ -1,16 +1,16 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonStatus; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description :对象持久层仓用方法控制(安灯状态信息) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-10 17:27 - * @Modify: - **/ -@Repository -public interface IAndonStatusRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.andon.repository; +// +//import cn.estsh.i3plus.pojo.andon.bean.AndonStatus; +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import org.springframework.stereotype.Repository; +// +///** +// * @Description :对象持久层仓用方法控制(安灯状态信息) +// * @Reference : +// * @Author : silliter.yuan +// * @CreateDate : 2019-05-10 17:27 +// * @Modify: +// **/ +//@Repository +//public interface IAndonStatusRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 05c9462..0d3ef20 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -401,45 +401,19 @@ public class AndonHqlPack { return result; } - - /** - * 安灯类型查询条件封装 - * @param andonAlarmType - * @return - */ - public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) { - DdlPackBean result = new DdlPackBean(); - - getStringBuilderPack(andonAlarmType, 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; - } +// +// /** +// * 安灯类型查询条件封装 +// * @param andonAlarmType +// * @return +// */ +// public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) { +// DdlPackBean result = new DdlPackBean(); +// +// getStringBuilderPack(andonAlarmType, result); +// +// return result; +// } /** * ANDON通知对象查询条件封装 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 389a797..c98878e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -90,15 +90,14 @@ public class AndonEnumUtil { * 10-是，20-否 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IS_ALARM_STATUS{ - + public enum ALARM_STATUS { YES(10,"需要按灯"), ON(20,"不需要按灯"); private int value; private String description; - IS_ALARM_STATUS(int value, String description) { + ALARM_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -128,7 +127,6 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ - ALARM_FLAG("10","安灯呼叫标识"), USER_CODE("20","用户工号"), READ_FLAG("30", "安灯读取状态"), @@ -158,8 +156,7 @@ public class AndonEnumUtil { * 1-呼叫，2-签到，3-解决 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ALARM_FLAG{ - + public enum ANDON_ACTION_TAG { CALL(1,"10","呼叫"), SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), @@ -171,7 +168,7 @@ public class AndonEnumUtil { private String code; private String description; - ALARM_FLAG(int value,String code, String description) { + ANDON_ACTION_TAG(int value, String code, String description) { this.value = value; this.code = code; 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) public enum ALARM_PRIORITY{ - FIRST(10,"一级"), SECOND(20,"二级"), 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=检测 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ALARM_CODE{ - + public enum ALARM_TYPE { PART("PART_ALARM","物料"), QUALITY("QUALITY_ALARM","质量"), EQUIP("EQUMENT_ALARM","设备"), @@ -323,7 +251,7 @@ public class AndonEnumUtil { private String value; private String description; - ALARM_CODE(String value, String description) { + ALARM_TYPE(String value, String description) { this.value = value; this.description = description; } @@ -352,7 +280,6 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROD_ORG_LEVEL{ - LEVEL_ONE(1,"一级目录"), LEVEL_TWO(2,"二级目录"), LEVEL_THREE(3,"三级目录"), @@ -391,7 +318,6 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOP_LINE_FLAG{ - STOP("1","停止产线"), RESTART("0","启动产线"); @@ -417,15 +343,91 @@ public class AndonEnumUtil { * 10-短信，20-邮箱 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum NOTICE_WAYS{ - + public enum NOTICE_MESSAGE_SEND_TYPE { SMS("10","短信"), EMAIL("20","邮箱"); private String value; 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; + } + } + + /** + * 安灯动作 + * + *
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; } @@ -438,4 +440,5 @@ public class AndonEnumUtil { return description; } } + }