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 9057dad..0dc81b8 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 @@ -25,7 +25,7 @@ public class BeanRelation { private static Map relations = new ConcurrentHashMap<>(); private static BeanRelation get() { - Long userId = 0l; + Long userId = 0L; BeanRelation relation = relations.get(userId); if (relation == null) { synchronized (BeanRelation.class) { @@ -383,6 +383,14 @@ public class BeanRelation { } /** + * 移除关联关系中的对象,并不会移除关联的对象的关系 + * @param bean + */ + public static void erase(BaseBean bean) { + get().caches.get(bean.getClass()).remove(bean.getId()); + } + + /** * 按指定路径,递归调用lambda表达式,当lambda表达式返回false或路径存在循环则退出递归。 * @param bean * @param fun diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java index eb35e2c..0aa3d16 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; import cn.estsh.i3plus.pojo.aps.bean.Resource; import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; +import cn.estsh.i3plus.pojo.aps.bean.WorkResource; import lombok.Data; /** @@ -23,6 +24,10 @@ public class PlanRecord { */ private Resource resource; /** + * 工作可用资源 + */ + private WorkResource workResource; + /** * 插入到目标工作计划前面 */ private WorkPlan postPlan;