修改展示组件,添加查询队列刷新时间;修改PLC标签地址查询条件

yun-zuoyi
宋军超 5 years ago
parent e140910db7
commit a25df616e3

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class RefreshInitModuleModel<T> implements Serializable {
@ApiParam("工作中心")
private String workCenterCode;
@ApiParam("工作单元")
private String workCellCode;
@ApiParam("组织代码")
private String organizeCode;
@ApiParam("用户信息")
private String userInfo;
@ApiParam("队列展示类型(有序/无序)")
private Object resultObj;
@ApiParam("展示组件定时刷新频率")
private Integer timer;
@ApiParam("List字段集")
private List<AttrBean> DataAttrList;
@ApiParam("List结果集")
private List<T> resultList;
}

@ -1345,7 +1345,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean);
DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
@ -1353,6 +1353,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getEquipmentCode(), "equipmentCode", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getObjectCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getObjectCode(), "objectCode", packBean);
}
return packBean;
}

Loading…
Cancel
Save