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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
peter.pan 6 years ago
parent bc9ac8d207 1d1a2ac8b1
commit 8daa2789a4
13 changed files with 139 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -47,6 +47,10 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "呼叫原因代码")
private String acCode;
@Column(name = "AC_NAME_RDD")
@ApiParam(value = "呼叫原因描述")
private String acNameRdd;
@AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "APPROVAL_STATUS")
@ApiParam(value = "审批状态")

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

@ -297,6 +297,24 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "重要等级名称")
private String importanceNameRdd;
@Column(name = "ORGANIZE_NAME_RDD")
@ApiParam(value = "组织名称")
private String organizeNameRdd;
/**
* 1 = 是，2 = 否
*/
@Column(name = "IS_RESOLVE")
@ApiParam(value = "是否驳回", example = "2")
private Integer isResolve;
@Column(name = "RESOLVE_OPINION")
@ApiParam(value = "驳回意见")
private String resolveOpinion;
@Transient
@ApiParam(value = "安灯状态集合")
private List<String> statusCodeList;
// 是否转呼
public Integer getIsShiftCall() {
@ -368,7 +386,10 @@ public class AndonManageQueue extends BaseBean {
* @param confirmTime
* @param resetTime
*/
public AndonManageQueue(String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
this.organizeCode = organizeCode;
this.workCenterNameRdd = workCenterNameRdd;
this.workCellNameRdd = workCellNameRdd;
this.resetUser = resetUser;
this.alarmCode = alarmCode;
this.callTime = callTime;
@ -398,6 +419,18 @@ public class AndonManageQueue extends BaseBean {
public AndonManageQueue() {
}
/**
* 安灯问题情况报表
* @param organizeNameRdd
* @param workCenterNameRdd
* @param andonCount
*/
public AndonManageQueue(String organizeNameRdd, String workCenterNameRdd, Long andonCount) {
this.organizeNameRdd = organizeNameRdd;
this.workCenterNameRdd = workCenterNameRdd;
this.andonCount = andonCount;
}
public static void main(String[] args) {
try {
List ds = new ArrayList();

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -42,20 +43,15 @@ public class MesArea extends BaseBean {
@Transient
@ApiParam(value ="子集列表")
@AnnoOutputColumn(hidden = true)
private List<MesWorkCenter> childTreeList;
@Transient
@ApiParam(value ="名称")
@AnnoOutputColumn(hidden = true)
private String name;
public String getName(){
return areaName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

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

@ -1,7 +1,9 @@
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -41,6 +43,7 @@ public class MesEquipment extends BaseBean {
@Column(name="STATUS")
@ApiParam("设备状态")
@AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_EQUIPMENT_STATUS.class,refForeignKey = "value",value = "description")
private String status;
@Column(name="WORK_CELL_CODE")
@ -57,15 +60,10 @@ public class MesEquipment extends BaseBean {
@Transient
@ApiParam(value ="名称")
@AnnoOutputColumn(hidden = true)
private String name;
public String getName(){
return this.equipmentName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -49,19 +50,15 @@ public class MesWorkCell extends BaseBean {
@Transient
@ApiParam(value ="子集列表")
@AnnoOutputColumn(hidden = true)
private List<MesEquipment> childTreeList;
@Transient
@ApiParam(value ="名称")
@AnnoOutputColumn(hidden = true)
private String name;
public String getName(){
return this.workCellName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -53,22 +54,18 @@ public class MesWorkCenter extends BaseBean {
@Transient
@ApiParam(value ="子集列表")
@AnnoOutputColumn(hidden = true)
private List<MesWorkCell> childTreeList;
@Transient
@ApiParam(value ="名称")
@AnnoOutputColumn(hidden = true)
private String name;
public String getName(){
return this.workCenterName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
public MesWorkCenter(String organizeCode) {
this.organizeCode = organizeCode;
}

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

@ -245,9 +245,12 @@ public class AndonHqlPack {
getStringBuilderPack(andonManageRecord, result);
// 根据优先级倒序，序号升序排序
DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
new String[]{"priorityLevel", "seq"}, result);
// // 根据优先级倒序，序号升序排序
// DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
// new String[]{"priorityLevel", "seq"}, result);
// 信息时间排序
DdlPreparedPack.getOrderDefault(andonManageRecord);
result.setOrderByStr(andonManageRecord.orderBy());
return result;
}
@ -514,6 +517,11 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) {
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);
return result;
@ -530,6 +538,8 @@ public class AndonHqlPack {
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);
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

@ -61,7 +61,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="ORGANIZE_CODE")
@ApiParam(value ="组织代码")
@AnnoOutputColumn(hidden = true)
// @AnnoOutputColumn(hidden = true)
public String organizeCode;
@Column(name="IS_VALID")

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

@ -212,7 +212,8 @@ public class AndonEnumUtil {
RESOLVE(3,"30","解决"),
CANCEL(4,"40", "撤销"),
COMMIT(5,"50","提交"),
PASS(6,"60","审批");
PASS(6,"60","审批"),
REJECT(7,"70","驳回");
private int value;
private String code;

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
/**
* @Description :
@ -900,6 +901,64 @@ public class CommonEnumUtil {
}
}
/**
* Content-Type
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CONTENT_TYPE {
FORM("x-www-form-urlencoded", "表单"),
FILE(" multipart/form-data", "文件"),
JSON(" application/json", "JSON"),
XML(" application/xml ", "XML");
private String value;
private String description;
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
private CONTENT_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public static CONTENT_TYPE valueOfContenType(String val) {
CONTENT_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i];
}
}
return tmp;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
// 数据有效的静态常量
public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();
// 数据未删除的静态常量

12
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
Unescape Escape View File

@ -36,6 +36,18 @@ import javax.persistence.Table;
@Api(value="定时任务执行日志",description = "定时任务执行记录")
public class SysLogTaskTime extends BaseBean {
@Column(name="SCHEDULER_INSTANCE_ID")
@ApiParam(value ="调度器实例id")
private String schedulerInstanceId;
@Column(name="SCHEDULER_SERVER_IP")
@ApiParam(value ="调度服务器ip")
private String schedulerServerIp;
@Column(name="SCHEDULER_SERVER_PORT")
@ApiParam(value ="调度服务器端口")
private String schedulerServerPort;
@Column(name="NAME")
@ApiParam(value ="任务名称")
private String name;

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

@ -154,11 +154,5 @@ public class WmsMoveMaster extends BaseBean {
this.transQty = transQty;
this.rejectQty = rejectQty;
this.fixId = fixId;
}
}

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

@ -40,7 +40,7 @@ public class WmsUnitConvert extends BaseBean {
@ApiParam(value = "换算率")
private Double unitCoefficient;
public Double getUnitCoefficient() {
public Double getUnitCoefficientVal() {
return this.unitCoefficient == null ? 0 : this.unitCoefficient.doubleValue();
}
}

Write Preview
Loading…
Cancel
Save