diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java new file mode 100644 index 0000000..b217ba9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java @@ -0,0 +1,42 @@ +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_DETAIL_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯子类型") +public class AndonAlarmDetailType extends BaseBean { + + @Column(name = "ALARM_DETAIL_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmDetailCode; + + @Column(name = "ALARM_DETAIL_NAME") + @ApiParam(value = "安灯类型名称") + private String alarmDetailName; + + @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/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java index 091ddec..2a816ce 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java @@ -51,4 +51,12 @@ public class AndonAlarmResponseCfg extends BaseBean { @Column(name = "RP_LEVEL") @ApiParam(value = "通知级别") private String rpLevel; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java similarity index 94% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java index 9cd1a6f..b1718d0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java @@ -22,7 +22,7 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="ANDON_STOP_LINE_CFG", indexes = { +@Table(name="ANDON_HALT_CFG", indexes = { @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"), @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"), @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"), @@ -32,7 +32,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonStopLineConfig extends BaseBean { +public class AndonHaltCfg extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java similarity index 68% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java index 4042df9..134006a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.andon.repository; -import cn.estsh.i3plus.pojo.andon.bean.AndonStopLineConfig; +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import org.springframework.stereotype.Repository; @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonStopLineCfgRepository extends BaseRepository { +public interface IAndonHaltCfgRepository 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 3a8daf1..2566f56 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 @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import org.apache.commons.lang3.StringUtils; @@ -341,8 +340,9 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result); - DdlPreparedPack.getNumNOEqualPack(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()), - "rpLevel", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result); getStringBuilderPack(responseCfg, result); @@ -354,7 +354,7 @@ public class AndonHqlPack { * @param stopLineConfig * @return */ - public static DdlPackBean packAndonStopLineCfg(AndonStopLineConfig stopLineConfig) { + public static DdlPackBean packAndonHaltCfg(AndonHaltCfg stopLineConfig) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(stopLineConfig.getAlarmCode(), "alarmCode", result);