Merge remote-tracking branch 'origin/test' into test

yun-zuoyi
钮海涛 5 years ago
commit 9f349cd42c

@ -85,10 +85,6 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
private Long alarmRouteId;
@Transient
@ApiParam("状态机异常时默认不缓存")
private boolean cacheFlag = false;
@Transient
@ApiParam("当前状态点的触发组件集默认未执行")
private boolean actionAmgIdFalg = false;
@ -100,12 +96,4 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
@ApiParam("每个组件执行完成根据业务设置下个触发事件如果需要外部告知下个触发事件则设置null一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent")
private String nextTriggerEvent;
@Transient
@ApiParam("在一个组件集中默认继续执行下一个组件当组件集中一个组件执行失败或者根据业务需要跳出去进去下个状态点则设置未false(即这个组件集中剩余的组件停止执行),同时配置下个状态点的触发事件nextTriggerEvent")
private boolean execNextModuleFlag = true;
@Transient
@ApiParam("默认异常未处理业务异常抛出后如果需要缓存则设置cacheFlag为true因为会被catch捕获所以这里需要设置为true避免异常重复被处理")
private boolean doErrorFlag = false;
}

@ -1,6 +1,5 @@
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;
@ -17,7 +16,6 @@ import java.io.Serializable;
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@ -42,7 +40,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
public String andonOrderNo;
@Column(name = "ERROR_DESC")
@ApiParam(value = "失败描述")
@ApiParam(value = "异常描述")
public String errorDesc;
@Column(name = "WORK_CENTER_CODE")
@ -61,18 +59,10 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
@ApiParam(value = "安灯来源类型")
private String sourceType;
@Column(name = "CACHE_FLAG")
@ApiParam(value = "缓存标识")
private Integer cacheFlag;
@Column(name = "CACHE_KEY")
@ApiParam(value = "缓存KEY")
private String cacheKey;
@Column(name = "HANDLE_TYPE")
@ApiParam(value = "处理方式")
private Integer handleType;
@Column(name = "HANDLE_STATUS")
@ApiParam(value = "处理状态")
private Integer handleStatus;

@ -42,9 +42,6 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("触发事件")
private String triggerEvent;
@ApiModelProperty("缓存KEY")
private String cacheKey;
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;

@ -1,46 +1,6 @@
package cn.estsh.i3plus.pojo.andon.sqlpack;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
import cn.estsh.i3plus.pojo.andon.bean.AndonActor;
import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast;
import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonConfig;
import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon;
import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType;
import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase;
import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord;
import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord;
import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType;
import cn.estsh.i3plus.pojo.andon.bean.AndonPLC;
import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach;
import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject;
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
import cn.estsh.i3plus.pojo.andon.bean.MesArea;
import cn.estsh.i3plus.pojo.andon.bean.MesEquipment;
import cn.estsh.i3plus.pojo.andon.bean.MesShift;
import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
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.CommonEnumUtil;
@ -1086,6 +1046,12 @@ public class AndonHqlPack {
return packBean;
}
/**
*
* @param actionRoute
* @param organizeCode
* @return
*/
public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
@ -1094,6 +1060,12 @@ public class AndonHqlPack {
return packBean;
}
/**
*
* @param alarmRoute
* @param organizeCode
* @return
*/
public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean);
@ -1101,4 +1073,21 @@ public class AndonHqlPack {
DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", packBean);
return packBean;
}
/**
*
* @param routeStatusErrorRecord
* @param organizeCode
* @return
*/
public static DdlPackBean getAndonRouteStatusErrorRecord(AndonRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getAndonOrderNo(), "andonOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getSourceType(), "sourceType", packBean);
DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
return packBean;
}
}

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
@Api("副资源设置时间")
public class AssistResourceSetTime extends BaseAPS {
private static final long serialVersionUID = 901172392855536686L;
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -34,6 +34,7 @@ import java.util.List;
@ExcludeImportExport
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class BaseOrder extends BaseAPS {
private static final long serialVersionUID = -2571085172798608026L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass;
@Api("规则参数基类")
@ExcludeImportExport
public class BaseRule extends BaseAPS {
private static final long serialVersionUID = -1818853814377611968L;
@Column(name="CODE")
@ApiParam(value ="规则编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -22,6 +22,7 @@ import javax.persistence.Table;
@Table(name = "APS_CANCEL_PLAN_RULE")
@Api("取消计划规则")
public class CancelPlanRule extends BaseRule {
private static final long serialVersionUID = 2674055522875545446L;
@Column(name="WORK_FILTERS")
@ApiParam(value ="工作筛选")
private String workFilters;

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_DATA_LINK")
@Api("数据集成数据连接信息")
public class DataLink extends BaseAPS {
private static final long serialVersionUID = 8324774871058505466L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(notEmpty = true)

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("班次")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class DayShift extends BaseAPS {
private static final long serialVersionUID = 7964370027924366093L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_DYNAMIC_SET_TIME")
@Api("动态设置时间")
public class DynamicSetTime extends BaseAPS {
private static final long serialVersionUID = -1696499471488104793L;
@Column(name="RES_CODE")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api("数据导出明细")
public class ExportDetail extends BaseAPS {
private static final long serialVersionUID = -8898414164032180539L;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")
private String outName;

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_EXPORT_PROJECT")
@Api("数据导出明细集合")
public class ExportProject extends BaseAPS {
private static final long serialVersionUID = -7281303629295174330L;
@Column(name="NAME")
@ApiParam(value ="标识名")
private String name;

@ -23,6 +23,7 @@ import javax.persistence.Table;
@Table(name = "APS_EXPRESSION_RECORD")
@Api("表达式记录")
public class ExpressionRecord extends BaseAPS {
private static final long serialVersionUID = 4038954046132896632L;
@Column(name="BEAN_NAME")
@ApiParam(value ="表名")
private String beanName;

@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.lang.reflect.Method;
import java.sql.JDBCType;
@ -35,6 +36,7 @@ import java.sql.JDBCType;
@Api("字段信息")
@ExcludeImportExport
public class FieldInfo extends BaseAPS {
private static final long serialVersionUID = -6195036426929675850L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)
@ -121,11 +123,15 @@ public class FieldInfo extends BaseAPS {
private Boolean notEmpty;
@JsonIgnore
@Transient
private transient Class<? extends BaseBean> clazz;
@JsonIgnore
@Transient
private transient Class<?> typeClass;
@JsonIgnore
@Transient
private transient Method getMethod;
@JsonIgnore
@Transient
private transient Method setMethod;
}

@ -24,6 +24,7 @@ import javax.persistence.Table;
@Table(name = "APS_FIELD_SET_RULE")
@Api("属性赋值规则")
public class FieldSetRule extends BaseRule {
private static final long serialVersionUID = 6880145972942618559L;
@Column(name="BEAN")
@ApiParam(value ="实体名")
private ApsEnumUtil.FIELD_SET_BEAN bean;

@ -31,6 +31,7 @@ import javax.validation.constraints.Min;
@Api("炉容量")
public class FurnaceCapacity extends BaseAPS {
private static final long serialVersionUID = -5657804042629460659L;
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -32,6 +32,7 @@ import java.util.List;
@Api("炉资源计划")
public class FurnacePlan extends BaseAPS {
private static final long serialVersionUID = 6816465736285211114L;
@Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
@ApiParam(value ="已占用的能力")
private Double capacity;

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api("组炉设置")
public class FurnaceSetting extends BaseAPS {
private static final long serialVersionUID = -4566911526487268870L;
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -24,6 +24,7 @@ import javax.persistence.Table;
@Table(name = "APS_HEURISTIC_RULE")
@Api("排程运算规则")
public class HeuristicRule extends BaseRule {
private static final long serialVersionUID = -4856714428377308150L;
@Column(name="WORK_FILTER")
@ApiParam(value ="工作筛选")
private String workFilter;

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("数据导入明细")
public class ImportDetail extends BaseAPS {
private static final long serialVersionUID = 1264030397500660450L;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")
private String outName;

@ -28,6 +28,7 @@ import java.util.List;
@Table(name = "APS_IMPORT_PROJECT")
@Api("数据导入明细集合")
public class ImportProject extends BaseAPS {
private static final long serialVersionUID = -1899074765155621438L;
@Column(name="NAME")
@ApiParam(value ="标识名")
private String name;

@ -26,6 +26,7 @@ import javax.persistence.Table;
@Table(name = "APS_INVENTORY")
@Api("库存")
public class Inventory extends BaseOrder {
private static final long serialVersionUID = 2378846162007550439L;
@Column(name="SPECIFY_TOP_ORDER")
@ApiParam(value ="指定顶层订单")
private String specifyTopOrder;

@ -24,6 +24,7 @@ import javax.persistence.Table;
@Table(name = "APS_MAT_CALC_RULE")
@Api("物料运算规则")
public class MatCalcRule extends BaseRule {
private static final long serialVersionUID = 2102986260688118982L;
@Column(name="MATERIAL_FILTER")
@ApiParam(value ="物料筛选")
private String materialFilter;

@ -34,6 +34,7 @@ import java.util.List;
@Api("物料")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class Material extends BaseAPS {
private static final long serialVersionUID = -7928225487946173108L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_MATERIAL_SET_TIME")
@Api("物料设置时间")
public class MaterialSetTime extends BaseAPS {
private static final long serialVersionUID = -7996431489447641539L;
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_OPER_INPUT")
@Api("工序输入")
public class OperInput extends BaseAPS {
private static final long serialVersionUID = 6653235155693766804L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

@ -28,6 +28,7 @@ import java.util.List;
@Table(name = "APS_OPER_OUTPUT")
@Api("工序输出")
public class OperOutput extends BaseAPS {
private static final long serialVersionUID = 3185682762290147209L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_OPER_RESOURCE")
@Api("工序资源")
public class OperResource extends BaseAPS {
private static final long serialVersionUID = -8683889582369342606L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_OPERATION")
@Api("工序")
public class Operation extends BaseAPS {
private static final long serialVersionUID = 4394179144091116858L;
@Column(name="NUMBER")
@ApiParam(value ="工序号")
@FieldAnnotation(notEmpty = true)

@ -24,6 +24,7 @@ import java.util.Date;
@Api("订单树")
@ExcludeImportExport
public class OrderTree extends BaseAPS {
private static final long serialVersionUID = -7505923374791695738L;
@ApiParam(value ="物料编码")
private String material;

@ -26,6 +26,7 @@ import java.util.Date;
@Table(name = "APS_OVERTIME_CALENDAR")
@Api("加班日历")
public class OvertimeCalendar extends BaseAPS {
private static final long serialVersionUID = -501715721073189464L;
@Column(name="RES_CODES")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -32,6 +32,7 @@ import java.util.List;
@Api("父工作")
@ExcludeImportExport
public class ParentWork extends BaseAPS {
private static final long serialVersionUID = 8792781216193806606L;
@Column(name="count", columnDefinition = "decimal(18,8)")
@ApiParam(value ="数量")
private Double count;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api("工作反馈")
public class PlanFeedback extends BaseAPS {
private static final long serialVersionUID = 2520555825093741381L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)

@ -30,6 +30,7 @@ import java.util.List;
@Table(name = "APS_PRODUCT_ORDER")
@Api("生产订单")
public class ProductOrder extends BaseOrder {
private static final long serialVersionUID = 6900226668783662736L;
@Column(name="EST")
@ApiParam(value ="最早开始时间")
private Date est;

@ -33,6 +33,7 @@ import java.util.List;
@Api("工艺路线")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class ProductRouting extends BaseAPS {
private static final long serialVersionUID = 4905294866468216722L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Table(name = "APS_PURCHASE_ORDER")
@Api("采购订单")
public class PurchaseOrder extends BaseOrder {
private static final long serialVersionUID = 4699381603433121631L;
@Column(name="SPECIFY_TOP_ORDER")
@ApiParam(value ="指定顶层订单")
private String specifyTopOrder;

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_RES_CALENDAR")
@Api("日历")
public class ResCalendar extends BaseAPS {
private static final long serialVersionUID = 8338930205816433211L;
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -33,6 +33,7 @@ import java.util.List;
@Api("资源")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class Resource extends BaseAPS {
private static final long serialVersionUID = 3304084329600816457L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -30,6 +30,7 @@ import javax.persistence.Table;
@ExcludeImportExport
public class RuleDetail extends BaseAPS {
private static final long serialVersionUID = -6433950357039396107L;
@Column(name="TYPE")
@ApiParam(value ="规则类型")
private ApsEnumUtil.RULE_TYPE type;

@ -29,6 +29,7 @@ import java.util.List;
@Api("规则组合")
@ExcludeImportExport
public class RuleGroup extends BaseAPS {
private static final long serialVersionUID = 4741897751041891075L;
@Column(name="CODE")
@ApiParam(value ="编码")
private String code;

@ -28,6 +28,7 @@ import java.util.Date;
@Table(name = "APS_SALES_ORDER")
@Api("销售订单")
public class SalesOrder extends BaseOrder {
private static final long serialVersionUID = -511784925441907538L;
@Column(name="LOW_EST")
@ApiParam(value ="底阶最早开始时间")
private Date lowEst;

@ -26,6 +26,7 @@ import javax.persistence.Table;
@ExcludeImportExport
public class SerialNumber extends BaseAPS {
private static final long serialVersionUID = 312483211086701109L;
@Column(name="NUMBER")
@ApiParam(value ="流水号")
private Integer number;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api("运输时间")
public class ShippingTime extends BaseAPS {
private static final long serialVersionUID = -8698904420363808737L;
@Column(name="PREV_RES_CODE")
@ApiParam(value ="前资源编码")
@FieldAnnotation(relation = "PrevRes")

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api("标准工序")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class StandOperation extends BaseAPS {
private static final long serialVersionUID = -6869403951765771775L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -26,6 +26,7 @@ import java.util.Date;
@Table(name = "APS_SYS_PARAM")
@Api("系统参数")
public class SysParam extends BaseAPS {
private static final long serialVersionUID = 3115620726438869596L;
@Column(name="BASE_TIME")
@ApiParam(value ="基准时间")
private Date baseTime;

@ -34,6 +34,7 @@ import java.util.List;
@Api("工作")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class Work extends BaseAPS {
private static final long serialVersionUID = 6471740978550523187L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true, modify = false)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_WORK_INPUT")
@Api("工作输入")
public class WorkInput extends BaseAPS {
private static final long serialVersionUID = 2654389476284740183L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -31,6 +31,7 @@ import java.util.List;
@Api("工作输出")
public class WorkOutput extends BaseAPS {
private static final long serialVersionUID = 6031001499619328313L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -35,6 +35,7 @@ import java.util.List;
@Api("工作计划")
public class WorkPlan extends BaseAPS {
private static final long serialVersionUID = 5489548115780676195L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("工作关联")
public class WorkRelation extends BaseAPS {
private static final long serialVersionUID = -5824884364328962956L;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", modify = false)

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("工作资源")
public class WorkResource extends BaseAPS {
private static final long serialVersionUID = 4791940404968841144L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -25,6 +25,7 @@ import java.util.HashMap;
@MappedSuperclass
@ExcludeImportExport
public abstract class BaseAPS extends BaseBean {
private static final long serialVersionUID = -8638842158403944318L;
@JsonIgnore
@Lob
@FieldAnnotation(property = false)

@ -76,9 +76,9 @@ public class DdlPackBean {
public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(isValid,"isValid",result);
DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlPreparedPack.getNumEqualPack(isValid, "isValid", result);
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result);
return result;
}

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.base.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-06-01 20:33
* @Modify:
**/
@Data
@ApiModel("文件基础信息")
public class ImppFile {
/******* 文件基础信息 ******/
@ApiModelProperty("文件名称")
private String name; //文件名
@ApiModelProperty("文件内容")
private byte[] content; //内容
@ApiModelProperty("文件后缀名称")
private String ext; //文件类型
public void setExt(String ext) {
if(ext.indexOf(".") != 0){
ext ="."+ext;
}
this.ext = ext;
}
@ApiModelProperty("文件md5")
private String md5;
@ApiModelProperty("文件创建时间")
private String createDateTime;
@ApiModelProperty("文件作者")
private String author; //作者
/******* 文件系统唯一信息 ******/
@ApiModelProperty("文件系统-组名称")
private String dfsGroupName;
@ApiModelProperty("文件系统-名称")
private String dfsFileName;
@ApiModelProperty("文件系统-唯一键")
private String dfsFileKey;
/******* 构造方法 ******/
public ImppFile() {
}
public ImppFile(String name, byte[] content, String ext) {
this.name = name;
this.content = content;
this.setExt(ext);
}
}

@ -13,32 +13,6 @@ import org.apache.commons.lang3.StringUtils;
public class AndonEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
INNER(10, "内部处理"),
OUTER(20, "外部处理"),
REVIEW(30, "人工审核");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -64,32 +38,6 @@ public class AndonEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG {
FALSE(10, "否"),
TRUE(20, "是"),
ORIGINAL(30, "原先");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -876,7 +876,8 @@ public class BlockSoftSwitchEnumUtil {
SUIT_MESSAGE(10, "适配信息"),
REQUEST_ORGIN_PARAM(20, "请求原始参数"),
ORIGINAL_MESSAGE(30, "原始报文"),
CONVERTED_MESSAGE(40, "转换报文");
CONVERTED_MESSAGE(40, "转换报文"),
SUIT_SEND_MESSAGE(50, "适配发送报文");
private int value;
private String description;

@ -59,6 +59,7 @@ public class CommonEnumUtil {
/** 平台服务 */
CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"),
MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"),
/** 调试服务 */
DEV(9999, 0000, 0, 120000000L, "Development", "系统调试");
@ -2519,4 +2520,12 @@ public class CommonEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYNAMIC_DATA_SOURCE_TYPE {
MASTER,NODE
}
}

@ -0,0 +1,165 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @Description : Model Pojo
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-11-21 15:50
* @Modify:
**/
public class MdmEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MDM_OPERATE_TYPE {
INSERT(1, "新增"),
UPDATE(2, "修改");
private int value;
private String description;
private MDM_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static MdmEnumUtil.MDM_OPERATE_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
* hql
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HQL_ENTITY_TYPE {
MASTER(1, "master", "主数据"),
BUSI(2, "busi", "业务数据");
private int value;
private String alias;
private String description;
private HQL_ENTITY_TYPE(int value, String alias, String description) {
this.value = value;
this.alias = alias;
this.description = description;
}
public int getValue() {
return value;
}
public String getAlias() {
return alias;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfAlias(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].alias;
}
}
return tmp;
}
public static MdmEnumUtil.HQL_ENTITY_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
* mdm
*/
public enum MDM_SYNC_TYPE{
INSERT(1, "新增"),
UPDATE(2, "修改"),
DELETE(2, "删除");
private int value;
private String description;
private MDM_SYNC_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static MdmEnumUtil.MDM_SYNC_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
}

@ -5091,7 +5091,8 @@ public class MesEnumUtil {
public enum BOARD_TYPE {
BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板");
private String code;
private String description;
@ -5741,16 +5742,18 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLC_DATA_TYPE {
INT("int", "数字"),
STRING("string", "字符串"),
BOOLEAN("boolean", "布尔");
STRING("10", "String", "字符串"),
BOOLEAN("20","Boolean", "布尔"),
WORD("30", "Word", "整形-Word"),
DWORD("40","Dword", "整形-DWord");
private String value;
private String code;
private String description;
PLC_DATA_TYPE(String value, String description) {
PLC_DATA_TYPE(String value, String code,String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -6148,4 +6151,130 @@ public class MesEnumUtil {
return valueOf(val);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TOPIC_TYPE {
COLOUR(10, "颜色"),
GRADE(20, "等级"),
TO_CONFIGURE(30, "配置");
private int value;
private String description;
TOPIC_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OPTION_TYPE {
OPTION(10, "选配件"),
BOM_DISASSEMBLY(20, "BOM拆解");
private int value;
private String description;
OPTION_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* (10-20-)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum YELLOW_GUN_RULE {
COLLECT_TORQUE(10, "继续采集扭矩"),
SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
private int value;
private String description;
YELLOW_GUN_RULE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -612,6 +612,16 @@ public class MesPcnEnumUtil {
return tmp;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static MES_MATCH_TYPE getByValue(int value) {
for (MES_MATCH_TYPE mesMatchType : values()) {
if (mesMatchType.getValue() == value) {
@ -2510,7 +2520,9 @@ public class MesPcnEnumUtil {
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
STOP_PCS_CTL("stopPcsCtl", "停止监控"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
PROCESS_CONTENT("processContent", "过程组件内容"),
TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容");
private String value;
private String description;
@ -2555,6 +2567,7 @@ public class MesPcnEnumUtil {
CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
FORM("form", "文本按钮"),
SPEC_TEXT("spec_text", "工步弹框文本"),
IMAGE_LIST("image_list", "图片列表"),
SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
private String value;
@ -3759,40 +3772,6 @@ public class MesPcnEnumUtil {
}
/**
* (10-20-)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum YELLOW_GUN_RULE {
COLLECT_TORQUE(10, "继续采集扭矩"),
SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
private int value;
private String description;
YELLOW_GUN_RULE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -4043,4 +4022,96 @@ public class MesPcnEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TOPIC_TYPE {
COLOUR(10, "零件颜色"),
GRADE(20, "等级"),
TO_CONFIGURE(30, "配置");
private int value;
private String description;
TOPIC_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOP_MACHINE_TYPE {
TIMER_TIME_OUT(10, "计时器超时停机"),
DELAY_HELP(20, "延时帮助停机"),
URGENT_STOP(30, "急停停机");
private int value;
private String description;
STOP_MACHINE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -11,6 +11,31 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class PtlEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_METHOD_TYPE {
INTERFACE(10, "界面方法"),
MONITOR(20, "监听方法");
private int value;
private String description;
PTL_METHOD_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.StringUtils;
import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*;
/**
* @author Wynne.Lu
* @date 2020/2/12 17:41
@ -14,6 +12,31 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_
public class PtlPcnEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS {
TRUE(10, "已处理"),
FALSE(20, "未处理");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -707,164 +730,6 @@ public class PtlPcnEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MONITOR_PROCESS_MESSAGE_TYPE {
CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"),
LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"),
CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"),
INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"),
REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新");
private int value;
private String code;
private String callClass;
private String description;
MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) {
this.value = value;
this.code = code;
this.callClass = callClass;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getCallClass() {
return callClass;
}
public String getDescription() {
return description;
}
public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) {
if (enums.getCode().equals(code)) {
return enums;
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INTERFACE_SIGNAL_MESSAGE_TYPE {
CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"),
SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"),
INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面");
// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"),
// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"),
// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细");
private int value;
private String code;
private String callClass;
private String description;
INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) {
this.value = value;
this.code = code;
this.callClass = callClass;
this.description = description;
}
public int getValue() {
return value;
}
public String getCallClass() {
return callClass;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) {
if (enums.getCode().equals(code)) {
return enums;
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GEN_TASK_MESSAGE_TYPE {
GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务");
private int value;
private String code;
private String callClass;
private String description;
GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) {
this.value = value;
this.code = code;
this.callClass = callClass;
this.description = description;
}
public int getValue() {
return value;
}
public String getCallClass() {
return callClass;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) {
if (enums.getCode().equals(code)) {
return enums;
}
}
return null;
}
}
/**
* websocket
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -589,7 +589,8 @@ public class SwebEnumUtil {
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单");
LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
private int value;
private String code;
private String description;
@ -646,4 +647,97 @@ public class SwebEnumUtil {
return valueOf(val);
}
}
/**
* PO/DOC_MOVE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SN_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
PRINTED(40, "C", "已打印");
private int value;
private String code;
private String description;
ORDER_SN_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 10=20=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_STOCK_TYPE {
SOURCE(10, "实物条码"),
TARGET(20, "虚拟条码"),
CUST_SN(30, "客户条码");
private int value;
private String description;
ORDER_STOCK_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

@ -725,7 +725,8 @@ public class WmsEnumUtil {
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单");
LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
private int value;
private String code;
private String description;
@ -7397,4 +7398,241 @@ public class WmsEnumUtil {
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOCATE_PROPORTION {
ZERO(10, "ZERO", "0%"),
GENERAL(20, "GENERAL", "0%-30%"),
MEDIUM(30, "MEDIUM", "30%-60%"),
WELL(40, "WELL", "60%-100%");
private int value;
private String code;
private String description;
LOCATE_PROPORTION(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static LOCATE_PROPORTION codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* BH
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_SUMMARY_IS_SYNC {
INIT(10, "INIT", "初始化"),
WAIT_SYNC(20, "WAIT_SYNC", "待同步"),
FINISH_SYNC(30, "FINISH_SYNC", "已同步");
private int value;
private String code;
private String description;
BH_SUMMARY_IS_SYNC(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static BH_SUMMARY_IS_SYNC codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCAN_CATEGORY {
ASN(10, "wmsDoMovementMasterRepository", "ASN"),
PO(20, "wmsDoMovementMasterRepository", "PO"),
SO(30, "wmsDoMovementMasterRepository", "SO"),
MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
QC(70, "wmsDoMovementMasterRepository", "质检单"),
CS(80, "wmsCSOrderMasterRepository", "盘点单"),
SN(90, "wmsStockSnRepository", "条码"),
PO_SN(100, "wmsPoSnRepository", "收货条码");
private int value;
private String code;
private String description;
SCAN_CATEGORY(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static SCAN_CATEGORY getByDesc(String desc) {
SCAN_CATEGORY tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i];
}
}
return tmp;
}
public static SCAN_CATEGORY codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
}

@ -1,56 +0,0 @@
//package cn.estsh.i3plus.pojo.form.bean;
//
//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
//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 : yunhao
// * @CreateDate : 2020-03-12 13:36
// * @Modify:
// **/
//@Data
//@Entity
//@DynamicInsert
//@DynamicUpdate
//@EqualsAndHashCode(callSuper = true)
//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY")
//@Api(value = "元素约束属性", description = "元素约束属性")
//public class BfElementConstraintProperty extends BaseBean {
//
// @Column(name = "CONSTRAINT_ID")
// @ApiParam(value = "约束ID", example = "-1")
// @JsonSerialize(using = ToStringSerializer.class)
// private Long constraintId;
//
// @Column(name = "ELEMENT_PROPERTY_ID")
// @ApiParam(value = "元素属性ID", example = "-1")
// @JsonSerialize(using = ToStringSerializer.class)
// private Long elementPropertyId;
//
// @Column(name = "DATA_OBJECT_PROPERTY_ID")
// @ApiParam(value = "数据对象属性ID", example = "-1")
// @JsonSerialize(using = ToStringSerializer.class)
// private Long dataObjectPropertyId;
//
// @Column(name="PROPERTY_NAME")
// @ApiParam(value ="元素属性名称")
// private String propertyName;
//
// @Column(name="PROPERTY_CODE_RDD")
// @ApiParam(value ="元素属性代码")
// private String propertyCodeRdd;
//
//}

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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 : yunhao
* @CreateDate : 2020-05-27 21:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BF_ELEMENT_PICK_UP_PROPERTY")
@Api(value = "表单拾取属性", description = "表单拾取属性")
public class BfElementPickUpProperty extends BaseBean {
@Column(name = "PICK_UP_PROPERTY_ID")
@ApiParam(value = "拾取属性id", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long pickUpPropertyId;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name="ELEMENT_PROPERTY_ID")
@ApiParam(value ="元素属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementPropertyId;
@Column(name="ELEMENT_PROPERTY_NAME")
@ApiParam(value ="元素属性名称")
private String elementPropertyName;
@Column(name = "PICK_UP_ELEMENT_ID")
@ApiParam(value = "拾取元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long pickUpElementId;
@Column(name="PICK_UP_ELEMENT_PROPERTY_ID")
@ApiParam(value ="拾取元素属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long pickUpElementPropertyId;
@Column(name="PICK_UP_ELEMENT_PROPERTY_NAME")
@ApiParam(value ="拾取元素属性名称")
private String pickUpElementPropertyName;
}

@ -15,6 +15,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
@ -149,6 +150,9 @@ public class BfElementProperty extends BaseBean {
@ApiParam(value ="是否为唯一约束字段")
private transient Integer isUniqueProperty;
@Transient
@ApiParam(value ="拾取关联属性")
private List<BfElementPickUpProperty> pickUpPropertyList;
// public Object getFormValue() {
// return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfElementPickUpProperty;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-21 15:18
* @Modify:
**/
public interface BfElementPickUpPropertyRepository extends BaseRepository<BfElementPickUpProperty,Long> {
}

@ -403,8 +403,8 @@ public final class FormHqlPack {
public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "cascadeName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "cascadeDescription", ddlPackBean);
return ddlPackBean;
}

@ -3,10 +3,15 @@ package cn.estsh.i3plus.pojo.mdm.bean.base;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
/**
@ -17,30 +22,71 @@ import javax.persistence.Transient;
* @Modify:
**/
@Data
@MappedSuperclass
@ApiModel("MDM基础bean")
public class BaseMdmBean extends BaseBean {
public abstract class BaseMdmBean extends BaseBean {
private static final long serialVersionUID = 3957595289035947441L;
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@Column(name = "MDM_VERSION")
@ApiModelProperty("mdm数据版本")
@JsonSerialize(using = ToStringSerializer.class)
private Long mdmVersion;
public long getMdmVersion() {
public long getMdmVersionVal() {
return mdmVersion == null ? 0 : mdmVersion;
}
// 版本递增
public long nextMdmVersion() {
return mdmVersion = getMdmVersion() + 1;
mdmVersion = getMdmVersionVal() + 1;
return mdmVersion;
}
@Column(name = "IS_MDM_PUBLISHED")
@ApiModelProperty("是否发布")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isPublished;
private Integer isMdmPublished;
@Column(name = "MDM_OPERATE_TYPE")
@ApiModelProperty("操作类型")
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
private Integer mdmOperateType;
public Integer getMdmOperateTypeVal() {
return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
}
@Column(name = "MDM_REF_ID")
@ApiModelProperty("关联id")
@JsonSerialize(using = ToStringSerializer.class)
private Long mdmRefId;
//排序方式
@Override
public String orderBy() {
String result = "";
if (orderByParam != null && orderByParam.trim().length() > 0) {
result = " order by ";
if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == isMdmMaster) {
result += "master.";
} else {
result += "busi.";
}
result += orderByParam;
if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
result += " asc";
} else {
result += " desc";
}
}
return result;
}
}

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mdm.bean.base;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
/**
* @Description : MDMbean
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 17:30
* @Modify:
**/
@Data
@MappedSuperclass
@ApiModel("MDM业务基础bean")
public class BaseMdmBusiExtdBean extends BaseMdmBean {
private static final long serialVersionUID = 4267453020130810967L;
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer mdmSoftType;
@Column(name = "MDM_MASTER_ID")
@ApiModelProperty("主数据id")
@JsonSerialize(using = ToStringSerializer.class)
private Long mdmMasterId;
}

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mdm.bean.base;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description :MDMbean
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-18 20:52
* @Modify:
**/
public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
@ApiModelProperty("主数据")
private M mdmMasterBean;
@ApiModelProperty("业务扩展")
private B mdmBusiBean;
public BaseMdmBusiModelBean() {
}
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
this.mdmMasterBean = mdmMasterBean;
this.mdmBusiBean = mdmBusiBean;
}
/**
* m
*
* @return
*/
public M getMaster() {
return mdmMasterBean;
}
/**
*
*
* @return
*/
public B getBusi() {
return mdmBusiBean;
}
/**
* m
*
* @return
*/
public void setMaster(M baseMdmBean) {
this.mdmMasterBean = baseMdmBean;
}
/**
*
*
* @return
*/
public void setBusi(B baseMdmBusiExtdBean) {
this.mdmBusiBean = baseMdmBusiExtdBean;
}
}

@ -1,30 +0,0 @@
package cn.estsh.i3plus.pojo.mdm.bean.base;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Transient;
/**
* @Description : MDMbean
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 17:30
* @Modify:
**/
@Data
@ApiModel("MDM业务基础bean")
public class BaseMdmExtdBean extends BaseMdmBean {
private static final long serialVersionUID = 4267453020130810967L;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer mdmSoftType;
}

@ -0,0 +1,271 @@
package cn.estsh.i3plus.pojo.mdm.bean.base;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import cn.estsh.i3plus.pojo.mdm.sqlpack.DdlMdmModelPreparedPack;
import java.util.ArrayList;
import java.util.List;
/**
* @Description : hql
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2019-03-29 15:57
* @Modify:
**/
public class DdlPackMdmModelBean {
/**
*
*/
List<MdmEnumUtil.HQL_ENTITY_TYPE> entityTypeList;
/**
*
*/
List<String> keyList;
/**
*
*/
List<Object> valueList;
//是否是hql
private boolean isHql;
//手动hql尽量避免直接传参使用代替
private String hqlAppend;
//where后跟着的hql/sql
private StringBuilder whereAppend;
//排序内容
private String orderByStr;
//需要拼接的hql
private StringBuilder sb = null;
public DdlPackMdmModelBean() {
this.isHql = true;
whereAppend = new StringBuilder();
entityTypeList = new ArrayList<>();
keyList = new ArrayList<>();
valueList = new ArrayList<>();
}
public DdlPackMdmModelBean(boolean isHql) {
this.isHql = isHql;
whereAppend = new StringBuilder();
entityTypeList = new ArrayList<>();
keyList = new ArrayList<>();
valueList = new ArrayList<>();
}
/**
*
*
* @param organizeCode
* @return
*/
public static DdlPackMdmModelBean getDdlPackBean(String organizeCode) {
DdlPackMdmModelBean result = new DdlPackMdmModelBean();
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result);
return result;
}
/**
*
*
* @param organizeCode
* @param isValid
* @return
*/
public static DdlPackMdmModelBean getDdlPackBean(String organizeCode, int isValid) {
DdlPackMdmModelBean result = new DdlPackMdmModelBean();
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, isValid, "isValid", result);
DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, isValid, "isValid", result);
DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result);
return result;
}
public static DdlPackMdmModelBean getDdlPackBean() {
DdlPackMdmModelBean result = new DdlPackMdmModelBean();
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
return result;
}
public static DdlPackMdmModelBean getDdlPackBean(BaseMdmBusiModelBean bean) {
DdlPackMdmModelBean result = new DdlPackMdmModelBean();
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
if (bean != null) {
if (bean.getBusi() != null) {
result.setOrderByStr(bean.getBusi().orderBy());
} else if (bean.getMaster() != null) {
result.setOrderByStr(bean.getMaster().orderBy());
}
}
return result;
}
public boolean isHql() {
return isHql;
}
public void setHql(boolean hql) {
isHql = hql;
}
public String getOrderByStr() {
return orderByStr;
}
public void setOrderByStr(String orderByStr) {
this.orderByStr = orderByStr;
}
public String getHqlAppend() {
return hqlAppend;
}
public void setHqlAppend(String hqlAppend) {
this.hqlAppend = hqlAppend;
}
public String getWhereAppend() {
return whereAppend.toString();
}
public void setWhereAppend(String whereAppend) {
this.whereAppend = new StringBuilder(whereAppend);
}
public List<MdmEnumUtil.HQL_ENTITY_TYPE> getEntityTypeList() {
return entityTypeList;
}
public void setEntityTypeList(List<MdmEnumUtil.HQL_ENTITY_TYPE> entityTypeList) {
this.entityTypeList = entityTypeList;
}
public List<String> getKeyList() {
return keyList;
}
public void setKeyList(List<String> keyList) {
this.keyList = keyList;
}
public List<Object> getValueList() {
return valueList;
}
public void setValueList(List<Object> valueList) {
this.valueList = valueList;
}
/**
*
*
* @param hql
* @param val
*/
public void addColumnQuery(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String column, String hql, Object val) {
if (entityTypeList == null) {
entityTypeList = new ArrayList<>();
}
if (keyList == null) {
keyList = new ArrayList<>();
}
if (valueList == null) {
valueList = new ArrayList<>();
}
if (entityType != null && column != null && val != null) {
entityTypeList.add(entityType);
keyList.add(column);
valueList.add(val);
}
whereAppend.append(hql);
}
/**
*
*
* @return
*/
public int getColumnSize() {
return keyList.size();
}
/**
* hqlddl
*
* @return
*/
public String getPackedHqlAll() {
sb = new StringBuilder();
if (hqlAppend != null) {
sb.append(hqlAppend);
}
if (whereAppend != null) {
sb.append(whereAppend);
}
if (orderByStr != null) {
sb.append(orderByStr);
}
return sb.toString();
}
/**
* ddl
*
* @return
*/
public String getPackedHql() {
sb = new StringBuilder();
if (whereAppend != null) {
sb.append(whereAppend);
}
if (orderByStr != null) {
sb.append(orderByStr);
}
return sb.toString();
}
}

@ -0,0 +1,74 @@
package cn.estsh.i3plus.pojo.mdm.bean.base;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-06-02 16:14
* @Modify:
**/
@Data
@ApiModel("数据中心同步数据")
public class MdmSyncData implements Serializable {
private static final long serialVersionUID = -1642626000860074060L;
@ApiModelProperty("同步数据类型")
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class)
private Integer syncType;
public int getSyncTypeVal(){
return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
}
@ApiModelProperty("同步模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
private Integer syncSoftType;
@ApiModelProperty("是否是主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isMasterData;
public int getIsMasterDataVal() {
return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
}
@ApiModelProperty("同步数据class")
private String syncDataClass;
public String getSyncDataClassSimpleName(){
if(syncDataClass == null){
return null;
}
return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1);
}
@ApiModelProperty("同步数据id")
private List<Long> syncDataId;
@ApiModelProperty("同步数据用户名")
private String syncDateUserName;
@ApiModelProperty("同步时间")
private String syncDateTime;
@ApiModelProperty("同步失败键")
private String syncFailKey;
@ApiModelProperty("同步失败时间")
private String syncFailDateTime;
@ApiModelProperty("同步失败信息")
private String syncFailMessage;
}

@ -0,0 +1,51 @@
package cn.estsh.i3plus.pojo.mdm.bean.busi.core;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
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;
import javax.persistence.Transient;
/**
* @Description : 齿-
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 18:09
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MDM_GEAR_CORE_EXTD")
@ApiModel("主数据齿轮-平台扩展")
public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
private static final long serialVersionUID = -3535174942277452194L;
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Class mdmMasterClass = MdmGear.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
@Column(name = "CORE_NUM")
@ApiModelProperty("核心数量")
public String coreNum;
}

@ -1,31 +0,0 @@
package cn.estsh.i3plus.pojo.mdm.bean.busi.core;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description : 齿-
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 18:09
* @Modify:
**/
@Data
@ApiModel("主数据齿轮-平台扩展")
public class MdmGearCoreExtd extends BaseMdmExtdBean {
private static final long serialVersionUID = -3535174942277452194L;
// 初始化数据
static {
isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
}
@ApiModelProperty("核心数量")
public String coreNum;
}

@ -4,6 +4,13 @@ import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
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 : 齿
@ -13,14 +20,21 @@ import lombok.Data;
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MDM_GEAR")
@ApiModel("主数据齿轮")
public class MdmGear extends BaseMdmBean {
private static final long serialVersionUID = -7580444601811207793L;
@Column(name="NAME")
@ApiModelProperty("齿轮名称")
private String name;
@Column(name="GEAR_MODEL")
@ApiModelProperty("齿轮规格")
private String gearModel;

@ -1,19 +0,0 @@
package cn.estsh.i3plus.pojo.mdm.bean.model.core;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
/**
* @Description : 齿-model
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 18:09
* @Modify:
**/
public class MdmGearCoreModel {
private MdmGear mdmGear;
private MdmGearCoreExtd mdmGearCoreExtd;
}

@ -0,0 +1,112 @@
package cn.estsh.i3plus.pojo.mdm.jpa.dao;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean;
import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean;
import java.util.List;
/**
* @Description : Repository
* @Reference : jpaRepository
* @Author : alwaysfrin
* @CreateDate : 2018-09-13 10:34
* @Modify:
**/
public interface MdmBusiModelRepository<T extends BaseMdmBusiModelBean<M, B>, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
T getById(long id);
List<T> list();
List<T> list(final String hql);
List<T> listPager(Pager pager);
List<T> findByPage(final DdlPackMdmModelBean packBean, final int offset, final int pageSize);
/**
* @param hql hql
* @param values
* @param offset
* @param pageSize
* @return
*/
List<T> findByPage(final String hql, final Object[] values, final int offset, final int pageSize);
List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value);
List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values);
List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff);
List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff);
T getByProperty(DdlPackMdmModelBean packBean);
T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value);
T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values);
int listCount();
int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value);
int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values);
List<T> findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager);
List<T> findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff, Pager pager);
List<T> findByHqlWhere(DdlPackMdmModelBean packBean);
List<T> findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff);
int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values);
List<T> findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff);
List<T> findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager);
int findByHqlWhereCount(DdlPackMdmModelBean packBean);
int findByHqlCount(String hql);
int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue);
List<T> findByHqlPage(DdlPackMdmModelBean packBean, Pager pager);
List<T> findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue);
double findByHqlDouble(DdlPackMdmModelBean packBean);
long findByHqlLong(DdlPackMdmModelBean packBean);
List<T> findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum);
/********************** 多表联查返回Object[]数组根据hql查询翻页信息 开始 ****************************/
List<Object[]> findByHqlObjects(String hql);
List<Object[]> findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue);
List<Object[]> findByHqlPageObjects(String hql, Pager pager);
List<Object[]> findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue);
List<Object[]> findBySqlObjList(String sql);
List<Object[]> findBySqlObjListByPager(String sql, Pager pager);
/****************** 部分业务处理 *******************/
boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value);
boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values);
boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values);
boolean isExitByHql(DdlPackMdmModelBean packBean);
}

@ -0,0 +1,840 @@
package cn.estsh.i3plus.pojo.mdm.jpa.daoimpl;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean;
import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean;
import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository;
import org.hibernate.NonUniqueResultException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.Query;
import java.lang.reflect.ParameterizedType;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-21 15:05
* @Modify:
**/
public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean>
implements MdmBusiModelRepository<T, M, B> {
public static final Logger LOGGER = LoggerFactory.getLogger(MdmBusiModelRepositoryImpl.class);
/**
*
*/
@Autowired
private EntityManager entityManager;
private final Class<T> modelClass;
private final Class<M> masterClass;
private final Class<B> busiExtdClass;
private final String selectCount;
private final String selectAll;
private final String formStr;
public MdmBusiModelRepositoryImpl() {
// 通过反射获取model的真实类型
ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass();
modelClass = (Class<T>) pt.getActualTypeArguments()[0];
masterClass = (Class<M>) pt.getActualTypeArguments()[1];
busiExtdClass = (Class<B>) pt.getActualTypeArguments()[2];
this.formStr = String.format("from %s as busi left join %s as master on busi.mdmMasterId = master.id ",
busiExtdClass.getName(), masterClass.getName()
);
this.selectCount = "select count(distinct busi) " + formStr;
this.selectAll = MessageFormat.format("select new {0}(master,busi) ", modelClass.getName()) + formStr;
}
private void setParameter(Query query, String[] propName, Object[] propValue) {
String name = null;
Object value = null;
for (int i = 0; i < propName.length; i++) {
name = propName[i];
value = propValue[i];
if (value != null) {
if ((value instanceof Object[])) {
query.setParameter(name.replace(".", ""), (Object[]) value);
} else if ((value instanceof Collection)) {
query.setParameter(name.replace(".", ""), (Collection) value);
} else {
query.setParameter(name.replace(".", ""), value);
}
}
}
}
private void appendQL(StringBuffer sb, String[] propName, Object[] propValue) {
String name = null;
Object value = null;
for (int i = 0; i < propName.length; i++) {
name = propName[i];
value = propValue[i];
if (((value instanceof Object[])) || ((value instanceof Collection))) {
Object[] arraySerializable = (Object[]) value;
if ((arraySerializable != null) && (arraySerializable.length > 0)) {
sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")");
}
} else if (value == null) {
sb.append(" and model." + name + " is null ");
} else {
sb.append(" and model." + name + "=:" + name.replace(".", ""));
}
}
}
@Override
public T getById(long id) {
try {
List<T> busiModelList =
entityManager.createQuery(selectAll + " where busi.id = :busi_id").setParameter("busi_id", id).getResultList();
return busiModelList.isEmpty() ? modelClass.newInstance() : busiModelList.get(0);
} catch (Exception e) {
return null;
}
}
@Override
public List<T> list() {
List<T> l = entityManager.createQuery(selectAll).getResultList();
return l;
}
@Override
public List<T> listPager(Pager pager) {
if (pager.getTotalRows() > 0) {
return entityManager.createQuery(selectAll)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
} else {
return new ArrayList<>();
}
}
@Override
public List<T> list(final String hql) {
return entityManager.createQuery(hql).getResultList();
}
@Override
public List<T> findByPage(DdlPackMdmModelBean packBean, int offset, int pageSize) {
Query query = null;
String ddl = selectAll + " where 1=1 " + packBean.getPackedHql();
if (packBean.isHql()) {
query = entityManager.createQuery(ddl);
} else {
query = entityManager.createNativeQuery(ddl);
}
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
return query.setFirstResult(offset)
.setMaxResults(pageSize)
.getResultList();
}
@Override
public List<T> findByPage(String hql, Object[] values, int offset, int pageSize) {
Query query = entityManager.createQuery(hql);
for (int i = 0; i < values.length; i++) {
query.setParameter(i, values[i]);
}
return query.setFirstResult(offset).setMaxResults(pageSize).getResultList();
}
@Override
public List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) {
String queryString = MessageFormat.format("{0} where {1}.{2}= :{3}_{4}", selectAll, entityType.getAlias(), propertyName,
entityType.getAlias(), propertyName);
return entityManager.createQuery(queryString).setParameter(entityType.getAlias() + "_" + propertyName, value).getResultList();
}
@Override
public List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) {
if (entityTypes.length != propertyNames.length || propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!entityTypes:" + entityTypes.length + " propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(selectAll);
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 ");
}
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
}
return queryObject.getResultList();
}
@Override
public List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff) {
String queryString = MessageFormat.format("{0} where {1}.{2}= :{3} {4}", selectAll, entityType.getAlias(), propertyName, propertyName, orderByStuff);
return entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList();
}
@Override
public List<T> findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(selectAll);
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 ");
}
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
queryString.append(" " + orderByStuff);
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
}
return queryObject.getResultList();
}
@Override
public T getByProperty(DdlPackMdmModelBean packBean) {
try {
List<T> list = findByHqlWhere(packBean);
return list.size() != 0 ? list.get(0) : null;
} catch (NoResultException ne) {
LOGGER.error("数据不存在DdlPackMdmModelBean{}", packBean);
return null;
} catch (NonUniqueResultException ex) {
LOGGER.error("查询单条记录但出现多条。packBean{}", packBean);
throw new RuntimeException("存在多条记录:" + ex.getMessage());
}
}
@Override
public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) {
String queryString =
selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName;
try {
List<T> list = entityManager.createQuery(queryString)
.setParameter(entityType.getAlias() + "_" + propertyName, value)
.getResultList();
return list.size() != 0 ? list.get(0) : null;
} catch (NoResultException ne) {
LOGGER.error("数据不存在prop{},value{}", propertyName, value, ne);
return null;
} catch (NonUniqueResultException ex) {
LOGGER.error("查询单条记录但出现多条。prop{},value{}", propertyName, value, ex);
throw new RuntimeException("存在多条记录:" + ex.getMessage());
}
}
@Override
public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(selectAll);
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 ");
}
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
}
try {
List<T> list = queryObject.getResultList();
return list.size() != 0 ? list.get(0) : null;
} catch (NoResultException ne) {
LOGGER.error("数据不存在", ne);
return null;
} catch (NonUniqueResultException ex) {
LOGGER.error("查询单条记录,但出现多条。", ex);
throw new RuntimeException("存在多条记录:" + ex.getMessage());
}
}
@Override
public int listCount() {
try {
Long count = entityManager.createQuery(selectCount, Long.class).getSingleResult();
return count == null ? 0 : count.intValue();
} catch (NoResultException e) {
return 0;
}
}
@Override
public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) {
try {
String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName
+ "= :" + entityType.getAlias() + "_" + propertyName;
Long count = entityManager.createQuery(queryString, Long.class)
.setParameter(entityType.getAlias() + "_" + propertyName, value)
.getSingleResult();
return count == null ? 0 : count.intValue();
} catch (NoResultException e) {
return 0;
}
}
@Override
public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + masterClass.getName() + " as model");
int size = propertyNames.length;
if (size > 0) {
queryString.append(" where 1=1 ");
}
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
Query queryObject = entityManager.createQuery(queryString.toString(), Long.class);
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryObject.setParameter(propertyNames[i], values[i]);
}
}
try {
Long count = (Long) queryObject.getSingleResult();
return count == null ? 0 : count.intValue();
} catch (NoResultException e) {
return 0;
}
}
@Override
public List<T> findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager) {
if (pager.getTotalRows() > 0) {
String queryString = selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff;
return entityManager.createQuery(queryString)
.setParameter(entityType.getAlias() + "_" + propertyName, value)
.getResultList();
} else {
return new ArrayList<>();
}
}
@Override
public List<T> findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values,
String orderByStuff, Pager pager) {
if (pager.getTotalRows() > 0) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(selectAll);
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 ");
}
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
if (orderByStuff != null && orderByStuff.length() > 0) {
queryString.append(orderByStuff);
}
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
} else {
return new ArrayList<>();
}
}
@Override
public List<T> findByHqlWhere(DdlPackMdmModelBean packBean) {
Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql());
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
return query.getResultList();
}
@Override
public List<T> findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:"
+ propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(selectAll + " as where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
int size = propertyNames.length;
for (int i = 0; i < size; i++) {
if (propertyNames[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
queryString.append("" + orderByStuff);
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
}
return queryObject.getResultList();
}
@Override
public int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(selectCount + " where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
int size = propertyNames.length;
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
}
try {
Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult();
return count == null ? 0 : count.intValue();
} catch (NoResultException e) {
return 0;
}
}
@Override
public List<T> findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) {
if (pager.getTotalRows() > 0) {
if (propertyNames.length != values.length) {
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append(selectAll + " where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
int size = propertyNames.length;
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryString.append(
MessageFormat.format(" and {0}.{1}= :{2}_{3}"
, entityTypes[i].getAlias()
, propertyNames[i]
, entityTypes[i].getAlias()
, propertyNames[i]
)
);
}
}
queryString.append(" " + orderByStuff);
Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize());
for (int i = 0; i < size; i++) {
if (values[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
}
return queryObject.getResultList();
} else {
return new ArrayList<>();
}
}
@Override
public List<T> findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager) {
if (pager.getTotalRows() > 0) {
Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql());
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
return query.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
} else {
return new ArrayList<>();
}
}
@Override
public int findByHqlWhereCount(DdlPackMdmModelBean packBean) {
StringBuffer queryString = new StringBuffer();
queryString.append(selectCount + " where 1=1 " + packBean.getWhereAppend());
Query query = entityManager.createQuery(queryString.toString(), Long.class);
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
try {
Long count = (Long) query.getSingleResult();
return count == null ? 0 : count.intValue();
} catch (NoResultException e) {
return 0;
}
}
@Override
public int findByHqlCount(String hql) {
try {
Long count = entityManager.createQuery(hql, Long.class).getSingleResult();
return count == null ? 0 : count.intValue();
} catch (NoResultException e) {
return 0;
}
}
@Override
public int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) {
Query queryObject = entityManager.createQuery(hql, Integer.class);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]);
}
}
try {
return (int) queryObject.getSingleResult();
} catch (NoResultException e) {
return 0;
}
}
@Override
public List<T> findByHqlPage(DdlPackMdmModelBean packBean, Pager pager) {
if (pager.getTotalRows() > 0) {
Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql());
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
return query.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
} else {
return new ArrayList<>();
}
}
@Override
public List<T> findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) {
if (pager.getTotalRows() > 0) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]);
}
}
return queryObject.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
} else {
return new ArrayList<>();
}
}
@Override
public double findByHqlDouble(DdlPackMdmModelBean packBean) {
try {
Query query = entityManager.createQuery(packBean.getPackedHqlAll(), Double.class);
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
Double result = (Double) query.getSingleResult();
return result == null ? 0 : result;
} catch (NoResultException e) {
return 0;
}
}
@Override
public long findByHqlLong(DdlPackMdmModelBean packBean) {
try {
Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql(), Long.class);
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
return (long) query.getSingleResult();
} catch (NoResultException e) {
return 0;
}
}
@Override
public List<T> findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum) {
Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql());
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
return query.setFirstResult(0).setMaxResults(topNum).getResultList();
}
@Override
public List<Object[]> findByHqlObjects(String hql) {
return entityManager.createQuery(hql).getResultList();
}
@Override
public List<Object[]> findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName,
Object[] paramValue) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]);
}
}
return queryObject.getResultList();
}
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager) {
if (pager.getTotalRows() > 0) {
return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
} else {
return new ArrayList<Object[]>();
}
}
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) {
if (pager.getTotalRows() > 0) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < propertyNames.length; i++) {
if (propertyNames[i] != null) {
queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]);
}
}
return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
} else {
return new ArrayList<Object[]>();
}
}
@Override
public List<Object[]> findBySqlObjList(String sql) {
return entityManager.createNativeQuery(sql).getResultList();
}
@Override
public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
if (pager.getTotalRows() > 0) {
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
} else {
return new ArrayList<Object[]>();
}
}
/************** 部分业务 *************/
private String getNowTime(boolean needSecond) {
return needSecond ? getNowTime("yyyy-MM-dd HH:mm:ss") : getNowTime("yyyy-MM-dd HH:mm");
}
private String getNowTime(String format) {
String dateTime;
try {
dateTime = (new SimpleDateFormat(format)).format(new Date());
} catch (Exception e) {
dateTime = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date());
}
return dateTime;
}
@Override
public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) {
//大于0存在
return findByPropertyCount(entityType, propertyName, value) > 0;
}
@Override
public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) {
return findByPropertyCount(entityTypes, propertyNames, values) > 0;
}
@Override
public boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) {
return findByHqlWhereCount(hqlWhere, entityTypes, propertyNames, values) > 0;
}
@Override
public boolean isExitByHql(DdlPackMdmModelBean packBean) {
return findByHqlWhereCount(packBean) > 0;
}
}

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.mdm.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-29 10:23
* @Modify:
**/
@Data
public class MdmPagerQueryModel <T> {
/**
*
*/
private T bean;
/**
*
*/
private Pager pager;
}

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.mdm.model.core;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @Description : 齿-model
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 18:09
* @Modify:
**/
@Data
@ApiModel("齿轮平台业务model")
public class MdmGearCoreBusiModel extends BaseMdmBusiModelBean<MdmGear,MdmGearCoreBusiExtd> {
public MdmGearCoreBusiModel(MdmGear mdmMasterBean, MdmGearCoreBusiExtd mdmBusiBean) {
super(mdmMasterBean, mdmBusiBean);
}
}

@ -0,0 +1,21 @@
package cn.estsh.i3plus.pojo.mdm.modelrepository.core;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository;
import cn.estsh.i3plus.pojo.mdm.jpa.daoimpl.MdmBusiModelRepositoryImpl;
import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel;
import org.springframework.stereotype.Component;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-25 11:42
* @Modify:
**/
@Component
public class MdmGearCoreRepository
extends MdmBusiModelRepositoryImpl<MdmGearCoreBusiModel, MdmGear, MdmGearCoreBusiExtd>
implements MdmBusiModelRepository<MdmGearCoreBusiModel, MdmGear, MdmGearCoreBusiExtd> {
}

@ -0,0 +1,51 @@
package cn.estsh.i3plus.pojo.mdm.repository;
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.mdm.bean.base.BaseMdmBean;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import java.util.List;
/**
* @Description : HQL
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-20 15:23
* @Modify:
**/
public class MdmHqlPack {
public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean getMdmPackBean() {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlIdList(List<Long> idList) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackList(idList,"id",ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlMdmGear(MdmGear mdmGear) {
DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
return ddlPackBean;
}
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mdm.repository.busi.core;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-15 16:26
* @Modify:
**/
@Repository
public interface MdmGearCoreBusiModelRepository extends BaseRepository<MdmGearCoreBusiExtd, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mdm.repository.master;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-15 16:26
* @Modify:
**/
@Repository
public interface MdmGearRepository extends BaseRepository<MdmGear, Long> {
}

@ -0,0 +1,699 @@
package cn.estsh.i3plus.pojo.mdm.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @Description : hqlHqlPacksql
* example name = :name
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2019-03-29
* @Modify:
**/
public class DdlMdmModelPreparedPack {
/**
*
*
* @param startDate
* @param endDate
* @param columnName HQL
* @param packBean HQL
* @param isShowTime
*/
public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName,
DdlPackMdmModelBean packBean, boolean isShowTime) {
if (startDate == null || startDate.trim().length() == 0) {
startDate = "1900-01-01";
} else {
startDate = startDate.trim();
}
if (isShowTime && startDate.trim().length() <= 11) {
startDate += " 00:00:00";
}
if (endDate == null || endDate.trim().length() == 0) {
endDate = "2100-01-01";
} else {
endDate = endDate.trim();
}
if (isShowTime && endDate.trim().length() <= 11) {
endDate += " 23:59:59";
}
packBean.addColumnQuery(entityType, columnName
, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName
, startDate);
packBean.addColumnQuery(entityType, "s_" + columnName
, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName
, endDate);
}
/**
*
*
* @param startDate
* @param endDate
* @param columnName
* @param isLeftContain
* @param isRightContain
* @param packBean HQL
*/
public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) {
if (isLeftContain) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim());
} else {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim());
}
if (isRightContain) {
packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim());
} else {
packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim());
}
}
/**
*
*
* @param date
* @param columnName HQL
* @param packBean HQL
* @param showTaday true:false:
* @param isShowTime
*/
public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) {
if (date != null && date.trim().length() > 0) {
String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
if (date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) {
//只有一个逗号
date = "";
}
String[] time = date.split(",");
if (time.length == 1) {
//只有开始日期,没有结束日期
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + time[0] + "%");
} else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0)
|| (time[1] != null & time[1].trim().length() > 0))) {
if (time[0] == null || time[0].trim().length() == 0) {
time[0] = "1900-01-01";
} else {
time[0] = time[0].trim();
}
if (isShowTime && time[0].trim().length() <= 11) {
time[0] += " 00:00:00";
}
if (time[1] == null || time[1].trim().length() == 0) {
time[1] = "2100-01-01";
} else {
time[1] = time[1].trim();
}
if (isShowTime && time[1].trim().length() <= 11) {
time[1] += " 23:59:59";
}
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, time[0]);
packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, time[1]);
} else {
if (showTaday) {
if (isShowTime) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, today + " 00:00:00");
packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today + " 23:59:59");
} else {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " " +">= :" + entityType.getAlias() + "_" + columnName,today);
packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today);
}
}
}
}
}
/**
*
*
* @param date
* @param startColumnName HQL
* @param endColumnName HQL
* @param packBean HQL
* @param isShowTime
*/
public static void getTimeBetweenCol(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String startColumnName, String endColumnName,
DdlPackMdmModelBean packBean, boolean isShowTime) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (date == null || date.trim().length() == 0) {
date = sdf.format(new Date());
}
if (!isShowTime) {
date = date.substring(0, 10);
packBean.addColumnQuery(entityType, null, " and '" + date + "' between substring(" + entityType.getAlias() + "." + startColumnName
+ ",1,10) and substring(" + entityType.getAlias() + "." + endColumnName + ",1,10)", null);
return;
} else if (date.trim().length() <= 11) {
date += " 00:00:00";
}
packBean.addColumnQuery(entityType, null, " and '" + date + "' between " + entityType.getAlias() + "." + startColumnName
+ " and " + entityType.getAlias() + "." + endColumnName, null);
}
/**
* Stringorder by
*
* @param columnName
* @param packBean
*/
public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object order[], String[] columnName,
DdlPackMdmModelBean packBean) {
String sqlStr = "";
String orderByStr = "";
for (int i = 0; i < order.length; i++) {
if (order[i] != null && order[i].toString().trim().length() > 0) {
if (Integer.parseInt(order[i].toString()) == 1) {
order[i] = "asc";
} else {
order[i] = "desc";
}
if (columnName[i].indexOf(" model.") == -1) {
sqlStr += entityTypes[i].getAlias() + "." + columnName[i];
} else {
sqlStr += columnName[i];
}
sqlStr += " " + order[i].toString() + ",";
}
}
if (sqlStr.length() > 0 && sqlStr.lastIndexOf(",") == sqlStr.length() - 1) {
sqlStr = sqlStr.substring(0, sqlStr.length() - 1);
orderByStr = " order by " + sqlStr;
}
packBean.setOrderByStr(orderByStr);
}
/**
*
*/
public static void getOrderDefault(BaseBean bean) {
if (bean != null && StringUtils.isBlank(bean.getOrderByParam())) {
bean.setOrderByParam("modifyDatetime");
bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
}
}
/**
* Stringlike
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%");
}
}
/**
* Stringlike
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikerPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%");
}
}
/**
* Stringlike()
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringRightLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val + "%");
}
}
/**
* Stringlike()
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLeftLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val);
}
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val);
}
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringLikePack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val);
}
}
/**
* String
*
* @param columnName
* @param packBean
*/
public static void getStringNoEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, val);
}
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringNotNullPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) {
packBean.addColumnQuery(entityType, null, " and " + entityType.getAlias() + "." + columnName + " is not null", null);
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringNotBlanklPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) {
packBean.addColumnQuery(entityType, null, " and (" + entityType.getAlias() + "." + columnName + " is not null and " + entityType.getAlias() + "." + columnName + " !='')", null);
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val);
}
}
/**
* longintequal
*
* @param columnName
* @param packBean
*/
public static void getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
*
*
* @param firstColumnName
* @param packBean
*/
public static void getNotEqueals(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) {
packBean.addColumnQuery(entityType, null, " and UPPER(" + entityType.getAlias() + "." + firstColumnName + ")!= UPPER(" + entityType.getAlias() + "." + twoColumnName + ")", null);
}
/**
* longintequal
*
* @param columnName
* @param packBean
*/
public static void getNegativeNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* longintequal
*
* @param columnName
* @param packBean
*/
public static void getNumEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Long.parseLong(data.toString()) > 0) {
packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* longintequal
*
* @param columnName
* @param packBean
*/
public static void getNumEqualPackOverZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* longintequal
*
* @param columnName
* @param packBean
*/
public static void getNumWithZeroEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Double.parseDouble(data.toString()) >= 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* String
*
* @param columnName
* @param packBean
*/
public static void getStringBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* String
*
* @param columnName
* @param packBean
*/
public static void getStringBiggerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* String
*
* @param columnName
* @param packBean
*/
public static void getStringSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, data);
}
}
/**
* String
*
* @param columnName
* @param packBean
*/
public static void getStringSmallerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_s_" + columnName, data);
}
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberBiggerPackContainsZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberBiggerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* double
*
* @param columnName
* @param packBean
*/
public static void getNumberSmallerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && Double.parseDouble(data.toString()) > 0) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* longintequal()
*
* @param columnName
* @param packBean
*/
public static void getNumNOEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, data);
}
}
/**
* in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, "in_"+columnName,
" and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
}
}
/**
* or
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotOrIsNull(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, "in_"+columnName, " and (" + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ") " +
"or " + entityType.getAlias() + "." + columnName + " is null)", data);
}
}
/**
* in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getOrInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, "in_"+columnName," or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
}
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data));
}
}
/**
* not in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && data.length > 0) {
packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data));
}
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List<?> data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
}
}
/**
* not in List
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List<?> data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
}
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInOrPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && data.trim().length() > 0) {
//判断最后一位是不是逗号
if (data.lastIndexOf(",") != (data.length() - 1)) {
data += ",";
}
String[] dataArray = data.substring(0, data.length() - 1).split(",");
data = "";
for (int i = 0; i < dataArray.length; i++) {
if (i == dataArray.length - 1) {
data += "'" + dataArray[i] + "'";
} else {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(entityType, "in_"+columnName, " or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
}
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null && data.trim().length() > 0) {
//判断最后一位是不是逗号
if (data.lastIndexOf(",") != (data.length() - 1)) {
data += ",";
}
String[] dataArray = data.substring(0, data.length() - 1).split(",");
data = "";
for (int i = 0; i < dataArray.length; i++) {
if (i == dataArray.length - 1) {
data += "'" + dataArray[i] + "'";
} else {
data += "'" + dataArray[i] + "',";
}
}
packBean.addColumnQuery(entityType,"in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
}
}
/**
* not in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
}
}
/**
*
*
* @param columnName
* @param basisType
* @return
* @see CommonEnumUtil.BASIS_TYPE
*/
public static String getOrderColConvertType(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, int basisType) {
String name = " " + entityType.getAlias() + "." + columnName;
if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
name = " cast(" + name + " as integer)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) {
name = " cast(" + name + " as decimal)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) {
name = " cast(" + name + " as long)";
}
return name;
}
}

@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean implements Serializable {
@ApiParam("检测类型")
private Integer checkType;
@Column(name = "CUST_DELIERY_LOCATION")
@ApiParam("客户发运地")
private String custDelieryLocation;
}

@ -0,0 +1,72 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-03 15:38
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_AGV_STOP_RECORD")
@Api("MES_停机记录表")
public class MesAgvStopRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -8961182851767690154L;
@Column(name = "STOP_TYPE")
@ApiParam("停机类型")
private Integer stopType;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "STOP_START_TIME")
@ApiParam("停机开始时间")
private String stopStartTime;
@Column(name = "STOP_END_TIME")
@ApiParam("停机结束时间")
private String stopEndTime;
@Column(name = "STOP_REASON")
@ApiParam("停机原因")
private String stopReason;
}

@ -60,4 +60,8 @@ public class MesBlindHistory extends BaseBean implements Serializable {
@ApiParam("工作中心代码")
private String workCenterCode;
@Transient
@ApiParam("主队列编号")
private String orderNo;
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -62,4 +63,8 @@ public class MesBlindRule extends BaseBean implements Serializable {
@ApiParam("零件颜色")
private String partColor;
@Transient
@ApiParam("零件颜色")
private String rightKey;
}

@ -51,7 +51,7 @@ public class MesBlindTopicSetting extends BaseBean implements Serializable {
private Integer topicType;
@Column(name = "QTY")
@ApiParam("答案数量")
@ApiParam("错误答案数量")
private Integer qty;
@Column(name = "WORK_CELL_CODE")

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BOARD_WORK_CELL")
@Api("MES_看板工位信息")
public class MesBoardWorkCell extends BaseBean implements Serializable {
private static final long serialVersionUID = 6251886604848913685L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "X_AXES")
@ApiParam("横坐标")
private Double xAxes = 0d;
@Column(name = "Y_AXES")
@ApiParam("纵坐标")
private Double yAxes = 0d;
@Column(name = "WORK_CELL_IP")
@ApiParam("工位IP")
private String workCellIp;
@Transient
@ApiParam("看板工位状态")
private Boolean boardWorkCellStatus;
@JsonProperty("xAxes")
public Double getxAxes() {
return xAxes;
}
public void setxAxes(Double xAxes) {
this.xAxes = xAxes;
}
@JsonProperty("yAxes")
public Double getyAxes() {
return yAxes;
}
public void setyAxes(Double yAxes) {
this.yAxes = yAxes;
}
public double getXAxes() {
return this.xAxes == null ? 0.0d : this.xAxes;
}
public double getYAxes() {
return this.yAxes == null ? 0.0d : this.yAxes;
}
}

@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("缺陷类型")
private String defectType;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;

@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@ApiParam("原材料零件名称")
private String itemPartName;
@ApiParam("生产队列号")
private String orderNo;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable {
@Column(name = "PROCESS_LABEL_TEMPLATE")
@ApiParam("过程标签模板")
private String processLabelTemplate;
@Transient
@ApiParam("产品颜色")
private String produceColor;
@Transient
@ApiParam("Vin")
private String vinCode;
}

@ -88,6 +88,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("是否允许让步")
private Integer isConcession = 0;
@Column(name = "NUMBER_FLAG")
@ApiParam("数量标识")
private String numberFlag;
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;

@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("发运时间")
private String deliveryDate;
@Column(name = "CUST_DELIERY_LOCATION")
@ApiParam("客户发运地")
private String custDelieryLocation;
@ApiParam(value = "检测结果")
@Transient
private String reulstStatus;
@ -116,4 +120,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Transient
private String mesWorkNo;
@Transient
@ApiParam("产品条码")
private String productSn;
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save