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

问题清单问题修复

Browse Source
yun-zuoyi
crish 6 years ago
parent f7fbd1c24f
commit 7d8b8664cc
11 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File

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

@ -28,7 +28,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_呼叫原因")
@Api(value = "ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@ -40,6 +40,7 @@ public class AndonAlarmCause extends BaseBean {
@ApiParam(value = "呼叫原因代码")
private String acCode;
@AnnoOutputColumn(hidden = true)
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@ -48,10 +49,12 @@ public class AndonAlarmCause extends BaseBean {
@ApiParam(value = "呼叫原因描述")
private String acName;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作中心")
private String workCenterCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作单元")
private String workCellCode;

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

@ -31,15 +31,15 @@ import javax.persistence.Table;
public class AndonAlarmDetailType extends BaseBean {
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯子类型编码")
private String alarmDetailCode;
@Column(name = "ALARM_DETAIL_NAME")
@ApiParam(value = "安灯类型名称")
@ApiParam(value = "安灯子类型名称")
private String alarmDetailName;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯类型")
private String alarmCode;
}

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

@ -29,22 +29,20 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元呼叫原因配置")
public class AndonCellAlarmCause extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
@ApiParam(value = "事件描述")
private String acCode;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,15 +35,16 @@ public class AndonCellEventCause extends BaseBean {
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "EC_CODE")
@ApiParam(value = "事件原因代码")
@ApiParam(value = "事件原因")
private String ecCode;

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

@ -29,22 +29,20 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元处理方法配置")
public class AndonCellEventMethod extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")
@ApiParam(value = "处理方法")
private String emCode;
}

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

@ -28,7 +28,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件原因")
@Api(value = "ANDON_事件原因")
public class AndonEventCause extends BaseBean {
@Column(name = "EC_CODE")
@ -41,6 +41,7 @@ public class AndonEventCause extends BaseBean {
@Column(name = "PARENT_EC_CODE")
@ApiParam(value = "父阶原因代码")
@AnnoOutputColumn(hidden = true)
private String parentEcCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@ -50,9 +51,11 @@ public class AndonEventCause extends BaseBean {
@Transient
@ApiParam(value = "工作中心")
@AnnoOutputColumn(hidden = true)
private String workCenterCode;
@Transient
@ApiParam(value = "工作单元")
@AnnoOutputColumn(hidden = true)
private String workCellCode;
}

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

@ -28,7 +28,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件处理方法")
@Api(value = "ANDON_事件处理方法")
public class AndonEventMethod extends BaseBean {
@Column(name = "EM_CODE")
@ -39,6 +39,7 @@ public class AndonEventMethod extends BaseBean {
@ApiParam(value = "事件方法描述")
private String emName;
@AnnoOutputColumn(hidden = true)
@Column(name = "PARENT_EM_CODE")
@ApiParam(value = "父阶方法代码")
private String parentEmCode;
@ -48,10 +49,12 @@ public class AndonEventMethod extends BaseBean {
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作中心")
private String workCenterCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作单元")
private String workCellCode;

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

@ -44,10 +44,12 @@ public class AndonEventPhenoMenon extends BaseBean {
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作中心")
private String workCenterCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作单元")
private String workCellCode;

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

@ -36,7 +36,7 @@ public class AndonPLC extends BaseBean {
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@Column(name = "NODE_CODE")
@ -52,7 +52,7 @@ public class AndonPLC extends BaseBean {
private String channelName;
@Column(name = "TAG_NAME")
@ApiParam(value = "标签名称")
@ApiParam(value = "标签名字")
private String tagName;
@Column(name = "TAG_ADDRESS")
@ -79,7 +79,7 @@ public class AndonPLC extends BaseBean {
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
@Column(name = "IS_ALARM_STATUS")
@ApiParam(value = "是否按灯状态", example = "1")
@ApiParam(value = "是否按灯", example = "1")
private Integer isAlarmStatus;
public int getIsAlarmStatusVal(){

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

@ -279,13 +279,10 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result);
DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result);
getStringBuilderPack(andonAlarmCause, result);
return result;
}
@ -296,10 +293,8 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonEventMethod, result);
return result;
}
@ -310,10 +305,8 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonEventCause, result);
return result;
}
@ -365,7 +358,6 @@ public class AndonHqlPack {
if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
}
getStringBuilderPack(andonManageQueue, result);
// 根据优先级倒序，序号升序排序
// DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
@ -627,9 +619,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
getStringBuilderPack(andonResponseObject, result);
return result;
}
@ -640,13 +630,10 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result);
DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result);
getStringBuilderPack(andonEventCause, result);
return result;
}
@ -673,6 +660,11 @@ public class AndonHqlPack {
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result);
DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
new String[]{eventPhenoMenon.getOrderByParam()},
result
);
getStringBuilderPack(eventPhenoMenon, result);
@ -681,18 +673,15 @@ public class AndonHqlPack {
/**
* ANDON_ 事件处理方法
* @param eventPhenoMenon
* @param eventMethod
* @return
*/
public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) {
public static DdlPackBean packAndonEventMethod(AndonEventMethod eventMethod) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmName(), "emName", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmCode(), "emCode", result);
getStringBuilderPack(eventPhenoMenon, result);
DdlPreparedPack.getStringEqualPack(eventMethod.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(eventMethod.getEmName(), "emName", result);
DdlPreparedPack.getStringLikerPack(eventMethod.getEmCode(), "emCode", result);
getStringBuilderPack(eventMethod, result);
return result;
}
@ -703,13 +692,14 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonPLC(AndonPLC plc) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result);
DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result);
DdlPreparedPack.getStringEqualPack(plc.getChannelName(),"channelName",result);
DdlPreparedPack.getStringEqualPack(plc.getGroupNo(),"groupNo",result);
DdlPreparedPack.getStringEqualPack(plc.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(plc.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(plc, result);
return result;
}

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="IS_VALID")
@ApiParam(value = "有效性",example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED")

Write Preview
Loading…
Cancel
Save