From b4221650825fdd0b232f8d902e3e4326cf8e0e03 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 17 Apr 2019 17:38:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?MES=20Repository=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java index f6ddd2f..e02f10c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesKeyData; +import org.springframework.stereotype.Repository; /** * @Description: @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesKeyData; * @CreateDate:2019-04-17-17:03 * @Modify: **/ +@Repository public interface MesKeyDataRepository extends BaseRepository { } From 8402877d9a4a1884832cb210a43177c860af7261 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 17 Apr 2019 17:44:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfRefButtonMethod.java | 3 +- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 33 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index dd5388c..69eac9f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -46,7 +46,8 @@ public class BfRefButtonMethod extends BaseBean { @Column(name="BUTTON_POSITION_REF_ID") @ApiParam(value ="按钮位置关联id") - private String buttonPositionRefId; + @JsonSerialize(using = ToStringSerializer.class) + private Long buttonPositionRefId; @Column(name="BUTTON_POSITION_REF_NAME_RDD") @ApiParam(value ="按钮位置关联名称") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index d1d0f75..804c605 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -247,4 +247,37 @@ public final class FormHqlPack { return ddlPackBean; } + + /** + * 拦截器明细查询条件 + * @param bfInterceptDetail 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) { + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptType(), "interceptType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptProcessResult(), "interceptProcessResult", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptPosition(), "interceptPosition", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getIsDeleted(), "isDeleted", ddlPackBean); + + ddlPackBean.setOrderByStr(bfInterceptDetail.orderBy()); + + return ddlPackBean; + } + + /** + * 根据id数组查询按钮功能关系 + * @return + */ + public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) { + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); + + return ddlPackBean; + } } From a85cc69e1417fe2038113b7e9b0f3e2f3b64d233 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Wed, 17 Apr 2019 18:18:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=20Object=20?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 6f16869..b06b867 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; @@ -41,4 +42,7 @@ public class EngineRulePersistence extends BaseBean { // 规则的描述，包含规则的用法，参数说明等 @Column(name = "RULE_REMARK", length = 2000) private String ruleRemark; + // 加载好的规则引擎对象 + @Transient + private transient Object kieSession; }