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 4149183450 8e9ddf0ead
commit ad09180809
17 changed files with 416 additions and 31 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.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;
@ -28,6 +30,7 @@ import javax.persistence.Table;
@Api("ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.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;
@ -36,6 +38,7 @@ public class AndonAlarmDetailType extends BaseBean {
@ApiParam(value = "安灯类型名称")
private String alarmDetailName;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;

6
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.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;
@ -28,10 +30,12 @@ import javax.persistence.Table;
@Api("ANDON_呼叫通知配置")
public class AndonAlarmResponseCfg extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "ANDON_STATUS")
@ApiParam(value = "安灯状态")
private String andonStatus;
@ -40,6 +44,7 @@ public class AndonAlarmResponseCfg extends BaseBean {
@ApiParam(value = "通知条件时长")
private String rpWhere;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "RP_CODE")
@ApiParam(value = "通知方式代码")
private String rpCode;
@ -48,6 +53,7 @@ public class AndonAlarmResponseCfg extends BaseBean {
@ApiParam(value = "通知对象代码")
private String rpObjectCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
@Column(name = "RP_LEVEL")
@ApiParam(value = "通知级别")
private String rpLevel;

4
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.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;
@ -36,6 +38,7 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "工作单元代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@ -44,6 +47,7 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "呼叫原因代码")
private String acCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "APPROVAL_STATUS")
@ApiParam(value = "审批状态")
private String approvalStatus;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.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;
@ -40,6 +42,7 @@ public class AndonEventCause extends BaseBean {
@ApiParam(value = "父阶原因代码")
private String parentEcCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.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;
@ -40,6 +42,7 @@ public class AndonEventMethod extends BaseBean {
@ApiParam(value = "父阶方法代码")
private String parentEmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.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;
@ -36,6 +38,7 @@ public class AndonEventPhenoMenon extends BaseBean {
@ApiParam(value = "事件现象描述")
private String epmName;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.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;
@ -34,6 +36,7 @@ import javax.persistence.Table;
@Api("安灯队列")
public class AndonHaltCfg extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

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

@ -1,6 +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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -64,14 +67,17 @@ public class AndonPLC extends BaseBean {
@ApiParam(value = "分组号")
private String groupNo;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_BUSI_FLAG.class,refForeignKey = "value",value = "description")
@Column(name = "TAG_BUSINESS_TYPE")
@ApiParam(value = "标签业务类型")
private String tagBusinessType;
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
@Column(name = "IS_ALARM_STATUS")
@ApiParam(value = "是否按灯状态", example = "1")
private Integer isAlarmStatus;

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

@ -48,6 +48,10 @@ public class MesArea extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return areaName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

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

@ -17,7 +17,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :生产区域
* @Description :生产设备
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
@ -59,6 +59,10 @@ public class MesEquipment extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return this.equipmentName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

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

@ -55,6 +55,10 @@ public class MesWorkCell extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return this.workCellName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

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

@ -59,6 +59,10 @@ public class MesWorkCenter extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return this.workCenterName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

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

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import org.apache.commons.lang3.StringUtils;
/**
@ -286,9 +287,8 @@ public class AndonHqlPack {
*/
public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
if (StringUtils.isNotEmpty(mesArea.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
}
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
packBean.setOrderByStr(mesArea.orderBy());
return packBean;
}
@ -300,12 +300,10 @@ public class AndonHqlPack {
*/
public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
}
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
packBean.setOrderByStr(mesWorkCenter.orderBy());
return packBean;
}
@ -317,15 +315,12 @@ public class AndonHqlPack {
*/
public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
}
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
packBean.setOrderByStr(mesWorkCell.orderBy());
return packBean;
}
@ -343,6 +338,7 @@ public class AndonHqlPack {
if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
}
packBean.setOrderByStr(mesEquipment.orderBy());
return packBean;
}
@ -501,6 +497,11 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result);
DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(eventPhenoMenon, result);
return result;
@ -550,4 +551,90 @@ public class AndonHqlPack {
getStringBuilderPack(andonManageRecord, result);
return result;
}
/**
* 区域唯一校验
* @param mesArea
* @return
*/
public static DdlPackBean packHqlCheckMesAreaOnlyByAreaCode(MesArea mesArea){
DdlPackBean result = new DdlPackBean();
if (mesArea != null && mesArea.getId() != null && mesArea.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 工作中心唯一校验
* @param mesWorkCenter
* @return
*/
public static DdlPackBean packHqlCheckMesWorkCenterOnlyByWorkCenterCode(MesWorkCenter mesWorkCenter){
DdlPackBean result = new DdlPackBean();
if (mesWorkCenter != null && mesWorkCenter.getId() != null && mesWorkCenter.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 工作单元唯一校验
* @param mesWorkCell
* @return
*/
public static DdlPackBean packHqlCheckMesWorkCellOnlyByWorkCellCode(MesWorkCell mesWorkCell){
DdlPackBean result = new DdlPackBean();
if (mesWorkCell != null && mesWorkCell.getId() != null && mesWorkCell.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 设备唯一校验
* @param mesEquipment
* @return
*/
public static DdlPackBean packHqlCheckMesEquipmentOnlyByEquipmentCode(MesEquipment mesEquipment){
DdlPackBean result = new DdlPackBean();
if (mesEquipment != null && mesEquipment.getId() != null && mesEquipment.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 班次唯一校验
* @param mesShift
* @return
*/
public static DdlPackBean packHqlCheckMesShiftOnlyByShiftCode(MesShift mesShift){
DdlPackBean result = new DdlPackBean();
if (mesShift != null && mesShift.getId() != null && mesShift.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesShift.getId(),"id",result);
DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result);
}
DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
}

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

@ -45,6 +45,16 @@ public class AndonEnumUtil {
}
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;
}
}
/**
@ -83,6 +93,16 @@ public class AndonEnumUtil {
}
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;
}
}
/**
@ -119,6 +139,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -149,6 +179,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
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;
}
}
/**
@ -193,6 +243,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
@ -232,6 +292,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
@ -280,6 +350,16 @@ public class AndonEnumUtil {
}
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;
}
}
/**
@ -311,12 +391,22 @@ public class AndonEnumUtil {
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val ) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -343,6 +433,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
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;
}
}
/**
@ -369,6 +479,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
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;
}
}
/**
@ -407,6 +537,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -446,6 +586,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
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;
}
}
/**
@ -479,5 +639,77 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
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;
}
}
/**
* 设备状态：
* 10=备用，
* 20=运行，
* 30=故障，
* 40=检修
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_EQUIPMENT_STATUS{
SPARE("10","备用"),
RUN("20","运行"),
ERROR("30","故障"),
OVERHAUL("40","检修");
private String value;
private String description;
ANDON_EQUIPMENT_STATUS(String value,String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
}

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -237,6 +237,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成不等于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val);
}
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名

24
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -425,36 +425,38 @@ public class CoreHqlPack {
/**
* 任务周期复杂查询
* @param taskTimeExpression
* @param sysTaskCycle
* @return
*/
public static String packHqlSysTaskCycle(SysTaskCycle taskTimeExpression) {
public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result);
HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result);
HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result);
// 添加默认排序
HqlPack.getOrderDefault(taskTimeExpression);
HqlPack.getOrderDefault(sysTaskCycle);
return result.toString();
}
/**
* 定时任务复杂查询
* @param taskTime
* @param sysTaskPlan
* @return
*/
public static String packHqlSysTaskPlan(SysTaskPlan taskTime){
public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(taskTime.getName(),"name",result);
HqlPack.getNumEqualPack(taskTime.getTaskPlanStatus(),"taskPlanStatus",result);
HqlPack.getNumEqualPack(taskTime.getTaskCycleId(),"taskCycleId",result);
HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
// 添加默认排序
HqlPack.getOrderDefault(taskTime);
HqlPack.getOrderDefault(sysTaskPlan);
return result.toString();
}
@ -724,6 +726,7 @@ public class CoreHqlPack {
HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result);
HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
// 添加默认排序
HqlPack.getOrderDefault(orderNoRule);
@ -762,6 +765,7 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
return result.toString();
}

Write Preview
Loading…
Cancel
Save