diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java new file mode 100644 index 0000000..000001d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间与副资源相关的配置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_ASSIST_RESOURCE_SET_TIME") +@Api("副资源设置时间") +public class AssistResourceSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java new file mode 100644 index 0000000..60a6f84 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间设置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_DYNAMIC_SET_TIME") +@Api("动态设置时间") +public class DynamicSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java new file mode 100644 index 0000000..0d0a2fa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :炉资源计划信息，用来关联组在一起的工作计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_FURNACE_PLAN") +@Api("炉资源计划") +public class FurnacePlan extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java new file mode 100644 index 0000000..7ec01f9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间与物料相关的配置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_MATERIAL_SET_TIME") +@Api("物料设置时间") +public class MaterialSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 4957a0e..483dac0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -35,9 +35,9 @@ public class OperResource extends BaseAPS { @ApiParam(value ="前设置时间") private String prevTime; - @Column(name="MANUF_TIME") + @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - private String manufTime; + private String produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @@ -47,9 +47,9 @@ public class OperResource extends BaseAPS { @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 5949b15..2a95d89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS; +import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; import io.swagger.annotations.Api; @@ -48,37 +49,37 @@ public class Resource extends BaseCode { @ApiParam(value ="后缓冲时间") private String postBuffer; - @Column(name="MAX_MANUF_BATCH") + @Column(name="MAX_PRODUCE_BATCH") @ApiParam(value ="最大生产批量") - private Double maxManufBatch; + private Double maxProduceBatch; - @Column(name="MANUF_ADJ_UNIT_TM") - @ApiParam(value ="生产时间尾数调整") - private String manufAdjUnitTm; + @Column(name="TIME_TAIL_ADJUST") + @ApiParam(value ="时间尾数调整") + private String timeTailAdjust; - @Column(name="MANUF_ADJ_UNIT") - @ApiParam(value ="生产时刻尾数调整") - private String manufAdjUnit; + @Column(name="TIME_ADJUST") + @ApiParam(value ="时间调整") + private String timeAdjust; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; @Column(name="ROUND_TYPE") - @ApiParam(value ="时间圆整类型") + @ApiParam(value ="时间与时间尾数圆整类型") private TIME_ROUND_TYPE roundType; - @Column(name="MANUF_EFFECT") - @ApiParam(value ="生产效率影响") - private Integer manufEffect; + @Column(name="EFFICIENCY_EFFECT") + @ApiParam(value ="效率影响类型") + private Integer EfficiencyEffect; @Column(name="TIME_ROUND") @ApiParam(value ="时间圆整影响") @@ -88,4 +89,11 @@ public class Resource extends BaseCode { @ApiParam(value ="时间尾数影响") private Integer timeTailRound; + @Column(name="LOCK_TYPE") + @ApiParam(value ="锁定类型") + private RESOURCE_LOCK_TYPE lockType; + + @Column(name="LOCK_TIME") + @ApiParam(value ="锁定时间长度") + private String lockTime; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 546b590..08be72e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -5,14 +5,17 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; 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.util.Date; +import java.util.List; /** * @Description :工作计划 @@ -29,24 +32,70 @@ import java.util.Date; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { - private Date prevSetStart; + @Column(name="PREV_SET_BEGIN") + @ApiParam(value ="前设置开始时间") + private Date prevSetBegin; + + @Column(name="PREV_SET_END") + @ApiParam(value ="前设置结束时间") private Date prevSetEnd; - private String prevSetTime; - private Date produceStart; + + @Column(name="PREV_SET_TIME") + @ApiParam(value ="前设置时间") + private Long prevSetTime; + + @Column(name="PRODUCE_BEGIN") + @ApiParam(value ="生产开始时间") + private Date produceBegin; + + @Column(name="PRODUCE_END") + @ApiParam(value ="生产结束时间") private Date produceEnd; - private String produceTime; - private Date postSetStart; + + @Column(name="PRODUCE_TIME") + @ApiParam(value ="生产时间") + private Long produceTime; + + @Column(name="POST_SET_BEGIN") + @ApiParam(value ="后设置开始时间") + private Date postSetBegin; + + @Column(name="POST_SET_END") + @ApiParam(value ="后设置结束时间") private Date postSetEnd; - private String postSetTime; - private Date lockStart; + + @Column(name="POST_SET_TIME") + @ApiParam(value ="后设置时间") + private Long postSetTime; + + @Column(name="LOCK_BEGIN") + @ApiParam(value ="锁定开始时间") + private Date lockBegin; + + @Column(name="LOCK_END") + @ApiParam(value ="锁定结束时间") private Date lockEnd; - private String lockTime; - private Date edgeTime; + @Column(name="LOCK_TIME") + @ApiParam(value ="锁定时间") + private Long lockTime; + @Column(name="WORK_ID") + @ApiParam(value ="工作对象id") private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源对象id") private Long resourceId; + @Column(name="WORK_RESOURCE_ID") + @ApiParam(value ="工作资源对象id") + private Long workResourceId; + + @Column(name="MAIN_PLAN_ID") + @ApiParam(value ="主计划对象id") + private Long mainPlanId; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { @@ -60,4 +109,20 @@ public class WorkPlan extends BaseAPS { this.resourceId = resource != null ? resource.getId() : 0l; BeanRelation.set(this, EWorkPlan.Resource, resource); } + + public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); } + + public void setWorkResource(WorkResource workResource) { + this.workResourceId = workResource != null ? workResource.getId() : 0l; + BeanRelation.set(this, EWorkPlan.WorkResource, workResource); + } + + public WorkPlan getMainPlan() { return BeanRelation.get(this, EWorkPlan.MainPlan); } + + public void setMainPlan(WorkPlan plan) { + this.mainPlanId = plan != null ? plan.getId() : 0l; + BeanRelation.set(this, EWorkPlan.MainPlan, plan); + } + + public List getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index d500003..f4266ec 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -34,9 +34,9 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="前设置时间") private Long prevTime; - @Column(name="MANUF_TIME") + @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") - private Long manufTime; + private Long produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @@ -50,9 +50,9 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大制造中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 6c7e206..86df02c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -69,6 +69,13 @@ public class BeanRelation { return temp; } + /** + * 获取关联对象 + * @param bean 实体对象 + * @param holder 关联路径 + * @param 返回关联对象的实体类型 + * @return 若存在多个关联则只取第一个。 + */ public static T get(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null || beans.isEmpty()) { @@ -77,10 +84,27 @@ public class BeanRelation { return beans.get(0); } + /** + * 获取关联对象 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 若存在多个关联则只取第一个。 + */ public static T get(BaseBean bean, Enum holder, Enum... args) { return get(bean, null, holder, args); } + /** + * 根据筛选条件获取关联对象 + * @param bean 实体对象 + * @param pred Lambda表达式，用来筛选关联对象，返回true则符合筛选条件 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 只找第一个符合筛选条件的关联对象。 + */ public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { List nextBeans = list(bean, holder); for (BaseBean nextEntity : nextBeans) { @@ -111,6 +135,13 @@ public class BeanRelation { return null; } + /** + * 获取关联对象集合 + * @param bean 实体对象 + * @param holder 关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合非拷贝的，外界不能对其修改。 + */ public static List list(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null) { @@ -119,10 +150,27 @@ public class BeanRelation { return beans; } + /** + * 获取关联对象集合 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ public static List list(BaseBean bean, Enum holder, Enum... args) { return list(bean, null, holder, args); } + /** + * 获取符合筛选条件的关联对象集合 + * @param bean 实体对象 + * @param pred Lambda筛选表达式，返回true为筛选出来的对象。 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ public static List list(BaseBean bean, Predicate pred, Enum holder, Enum... args) { List result = new ArrayList<>(); List nextBeans = list(bean, holder); @@ -157,6 +205,38 @@ public class BeanRelation { } } + public static List lastList(BaseBean entity, Enum... args) { + List result = new ArrayList(); + lastListImpl(result, entity, null, args, 0); + return result; + } + + public static List lastList(BaseBean entity, Predicate filter, Enum... args) { + List result = new ArrayList(); + lastListImpl(result, entity, filter, args, 0); + return result; + } + + @SuppressWarnings("unchecked") + private final static boolean lastListImpl(List result, BaseBean entity, Predicate filter, + Enum[] args, int index) { + if (index >= args.length) { + index = 0; + } + + boolean bNotLast = true; + List relaEntities = list(entity, args[index]); + for (BaseBean relaEntity : relaEntities) { + if (lastListImpl(result, relaEntity, filter, args, index + 1)) { + result.add((T)relaEntity); + bNotLast = false; + } + } + return index == 0 && bNotLast; + } + + + /** * 设值两个对象之间的关联 * @@ -282,4 +362,42 @@ public class BeanRelation { } } } + + /** + * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 + * @param bean + * @param fun + * @param holders + * @param + */ + public static void recursion(BaseBean bean, Predicate fun, Enum... holders) { + if (holders.length == 0) { + return; + } + recursionImpl(bean, fun, holders, 0); + } + + /** + * 按指定路径，递归调用实现。采用广度优先搜索。 + * @param bean + * @param fun + * @param holders + * @param index + * @param + */ + @SuppressWarnings("unchecked") + private final static void recursionImpl(BaseBean bean, Predicate fun, + Enum[] holders, int index) { + if (index >= holders.length) { + if (!fun.test((T) bean)) { + return; + } + index = 0; + } + + List relaBeans = list(bean, holders[index]); + for (BaseBean relaBean : relaBeans) { + recursionImpl(relaBean, fun, holders, index + 1); + } + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java new file mode 100644 index 0000000..acf8ac8 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum DYNAMIC_SET_CALC { + MIN, // 取最小值 + MAX, // 取最大值 + SUM // 求和 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java new file mode 100644 index 0000000..0453942 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum DYNAMIC_SET_TYPE { + PREV_SET, // 只对前设置影响 + POST_SET, // 只对后设置影响 + ALL // 对前后设置都产生影响 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java new file mode 100644 index 0000000..40f73ba --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum EFFICIENCY_EFFECT { + NONE(0), + PREV_SET(1), + PRODUCE(2), + POST_SET(4); + + private int _value; + + EFFICIENCY_EFFECT(int value){ + _value = value; + } + + public int value() { + return this._value; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java new file mode 100644 index 0000000..cb37621 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum RESOURCE_LOCK_TYPE { + NONE, // 不锁定 + PRODUCE_BEGIN, // 与后工序生产开始时刻有关 + PRODUCE_END // 与后工序生产结束时刻有关 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java index b9d7cc3..0233691 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java @@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums; * @Modify: **/ public enum TIME_ROUND_TYPE { - NONE, // 不圆整 UP, // 向上 DOWN, // 向下 ROUNDING // 四舍五入 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java index 99a6d77..bdaa913 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -15,7 +15,6 @@ public enum WORK_SORT_RULE { ORDER_COUNT, // 订单数量 ORDER_RECEIVE_DATE,// 订单接单日期 ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差 - ORDER_PRESSURE, // 订单紧迫程度 ORDER_SURPLUS, // 订单余裕度 NOPLAN_OPERATION_SIZE,// 残留工序数 REMAIN_PRODUCE_TIME, // 残留生产时间 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java new file mode 100644 index 0000000..098fa63 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EFurnacePlan { + WorkPlans +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index f288a42..490bddc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -3,5 +3,10 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWorkPlan { Work, Resource, - AssPlans // 关联的为副资源的工作计划 + WorkResource, + MainPlan, // 关联的为主资源的工作计划 + AssPlans, // 关联的为副资源的工作计划 + PrevPlan, + PostPlan, + FurnacePlan, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java new file mode 100644 index 0000000..090a521 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.AssistResourceSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AssistResourceSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java new file mode 100644 index 0000000..3a6d491 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.DynamicSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DynamicSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java new file mode 100644 index 0000000..b86b0c3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface FurnacePlanRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java new file mode 100644 index 0000000..6a7bb51 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.MaterialSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MaterialSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml new file mode 100644 index 0000000..49f17bd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index bd8ea37..ef8abd5 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -12,6 +12,8 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 219bf07..7569fa1 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -1,9 +1,11 @@ - - - + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 0294208..8f92da4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -31,7 +31,7 @@ public class CommonEnumUtil { JOBFLOW(23,"block-jobflow","智能作业流"), SOFTSWITCH(24,"block-softswitch","软件适配器"), HARDSWITCH(25,"block-hardswitch","硬件适配器"), - LAC(26,"link-connect","连接适配器"), + LAC(26,"lac","连接适配器"), ANDON(27,"andon","安灯"), CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3681eb6..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-lac jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java new file mode 100644 index 0000000..4a864be --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_RECORD") +@Api(value="适配记录",description = "适配记录") +public class LacCommandStackRecord extends BaseBean { + + private static final long serialVersionUID = -2775980024345181459L; + + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_NAME_RDD") + @ApiParam(value ="指令集名称") + private String commandStackNameRdd; + + @Column(name="COMMAND_STACK_CODE_RDD") + @ApiParam(value ="指令集代码") + private String commandStackCodeRdd; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_INDEX") + @ApiParam(value ="当前步骤") + private Integer stepIndex; + + @Column(name="STEP_NUM") + @ApiParam(value ="步骤总数") + private Integer stepNum; + + @Column(name="TASK_COMPLETE_NUM") + @ApiParam(value ="任务完成数量") + private Integer taskCompleteNum; + + @Column(name="TASK_NUM") + @ApiParam(value ="任务总数") + private Integer taskNum; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="执行入参") + private String inputParameter; + + @Column(name="STACK_START_TIME") + @ApiParam(value ="执行开始时间") + private String stackStartTime; + + @Column(name="STACK_END_TIME") + @ApiParam(value ="执行结束时间") + private String stackEndTime; + + @Column(name="STACK_SPEND") + @ApiParam(value ="执行耗时") + private Integer stackSpend; + + @Column(name="STACK_STATUS") + @ApiParam(value ="执行状态") + private Integer stackStatus; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java new file mode 100644 index 0000000..431e878 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.lac.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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午3:29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_INSTRUCTION_TYPE") +@Api(value="指令集类型",description = "指令集类型") +public class LacCommandStackType extends BaseBean { + + + @Column(name="TYPE_NAME") + @ApiParam(value ="类型名称") + private String typeName; + + @Column(name="TYPE_REF_NUM") + @ApiParam(value ="适配器使用数量") + private Integer typeRefNum; + + @Column(name="TYPE_DESCRIPTION") + @ApiParam(value ="类型描述") + private String typeDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java new file mode 100644 index 0000000..daab86e --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_LOG_TASK") +@Api(value="适配任务记录",description = "适配任务记录") +public class LacLogTask extends BaseBean { + + private static final long serialVersionUID = 674009105885048131L; + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_NAME_RDD") + @ApiParam(value ="指令集名称") + private String commandStackNameRdd; + + @Column(name="COMMAND_STACK_CODE_RDD") + @ApiParam(value ="指令集代码") + private String commandStackCodeRdd; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="STEP_NAME_RDD") + @ApiParam(value ="步骤名称") + private String stepNameRdd; + + @Column(name="STEP_SEQUENCE") + @ApiParam(value ="步骤顺序") + private String stepSequence; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_NAME_TYPE") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskNameType; + + @Column(name="adapterId") + @ApiParam(value ="适配器ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long adapterId; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="任务入参") + private String inputParameter; + + @Column(name="TASK_START_TIME") + @ApiParam(value ="任务开始时间") + private String taskStartTime; + + @Column(name="TASK_END_TIME") + @ApiParam(value ="任务结束时间") + private String taskEndTime; + + @Column(name="TASK_SPEND") + @ApiParam(value ="任务耗时") + private Integer taskSpend; + + @Column(name="TASK_STATUS") + @ApiParam(value ="任务状态") + private Integer taskStatus; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java new file mode 100644 index 0000000..3a3f05e --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_LOG_TASK_DETAIL") +@Api(value="适配任务记录明细",description = "适配任务记录明细") +public class LacLogTaskDetail extends BaseBean { + + + private static final long serialVersionUID = -4918694502072594064L; + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_TYPE") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskNameType; + + @Column(name="adapterId") + @ApiParam(value ="适配器ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long adapterId; + + @Column(name="TASK_START_TIME") + @ApiParam(value ="任务开始时间") + private String taskStartTime; + + @Column(name="TASK_END_TIME") + @ApiParam(value ="任务结束时间") + private String taskEndTime; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="任务入参") + private String inputParameter; + + @Lob + @Column(name="INPUT_PARAMETER_BODY") + @ApiParam(value ="任务入参处理完成后") + private String inputParameterBody; + + @Lob + @Column(name="OUTPUT_PARAMETER") + @ApiParam(value ="任务出参") + private String outputParameter; + + @Lob + @Column(name="OUTPUT_PARAMETER_BODY") + @ApiParam(value ="任务出参处理后") + private String outputParameterBody; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java new file mode 100644 index 0000000..688f8ec --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.lac.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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午3:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_TASK_TYPE") +@Api(value="任务类型",description = "任务类型") +public class LacTaskType extends BaseBean { + + @Column(name="TASK_NAME") + @ApiParam(value ="类型名称") + private String taskName; + + @Column(name="TASK_REF_NUM") + @ApiParam(value ="适配器使用数量") + private Integer taskRefNum; + + @Column(name="TASK_DESCRIPTION") + @ApiParam(value ="类型描述") + private String taskDescription; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java new file mode 100644 index 0000000..f19b6af --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + **/ +public interface LacCommandStackRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java new file mode 100644 index 0000000..fc85fd6 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacCommandStackTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java new file mode 100644 index 0000000..cd6e570 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacLogTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java new file mode 100644 index 0000000..846acec --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacLogTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java new file mode 100644 index 0000000..9cddec2 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacTaskTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java new file mode 100644 index 0000000..2c5dbff --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.lac.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.lac.bean.*; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:34 + * @Modify: + **/ +public class LacHqlPack { + + private LacHqlPack() { + } + + public static DdlPackBean packHqlLacTaskType(LacTaskType bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacLogTask(LacLogTask bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } +}