From 90f4662416a828dcc04af93bcc5ab2ba395c04e2 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 17 Dec 2018 10:59:21 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8eddef9..a59084a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -832,6 +832,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); From 6821bb17cc34d4386ade3766db9f619f7da5390e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 18 Dec 2018 10:48:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b774dcb..6b96b68 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 @@ -382,7 +382,7 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), - DISABLE(2, "禁止", "fa fa-disabled cell-fa fa-times-circle"), + DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), LOCKING(3, "锁定", "fa cell-fa fa-lock"); private int value; From 1d4ab876c135c2b7ad4745e5d43ac2456e82ce1b Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 11:44:56 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/{bean => platbean}/SysLogException.java | 2 +- .../i3plus/pojo/platform/{bean => platbean}/SysLogOperate.java | 2 +- .../estsh/i3plus/pojo/platform/{bean => platbean}/SysLogSystem.java | 2 +- .../SysLogExceptionRepository.java | 4 ++-- .../SysLogOperateRepository.java | 4 ++-- .../SysLogSystemRepository.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{bean => platbean}/SysLogException.java (96%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{bean => platbean}/SysLogOperate.java (97%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{bean => platbean}/SysLogSystem.java (98%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repositorymongo => platrepositorymongo}/SysLogExceptionRepository.java (72%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repositorymongo => platrepositorymongo}/SysLogOperateRepository.java (72%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repositorymongo => platrepositorymongo}/SysLogSystemRepository.java (71%) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index c0b0e4e..04eec4b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java similarity index 97% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 77ea17d..b838fe5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java similarity index 98% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index bd6783d..cc22486 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java similarity index 72% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java index 100f739..6fe78cc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.platform.repositorymongo; +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysLogException; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; /** * @Description : 异常记录表(使用Mongodb) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java similarity index 72% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java index 6fc7766..e33b7c7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.platform.repositorymongo; +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; /** * @Description : 操作日志表(使用Mongodb) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java similarity index 71% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java index dab92ce..eddc176 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.platform.repositorymongo; +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; /** * @Description : 系统日志表 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 3833ebd..0aa94fb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -1,9 +1,9 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; -import cn.estsh.i3plus.pojo.platform.bean.SysLogException; -import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; import com.mongodb.BasicDBObject; import org.bson.conversions.Bson; From 91a438697857d2f4a8fcd3b7e8b0e02c8d738566 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 11:48:47 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=B0=83=E6=95=B4software=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 aaf9729..be9cc6b 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 @@ -21,17 +21,17 @@ public class CommonEnumUtil { WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), QMS(5, "i3qms", "质量管理软件"), - FORM(80,"block-form","智能表单"), - REPORT(81,"block-report","智能报表"), - WORKFLOW(82,"block-workflow","智能工作流"), - JOBFLOW(83,"block-jobflow","智能作业流"), - SOFTSWITCH(84,"block-softswitch","智能软件适配器"), - HARDSWITCH(85,"block-hardswitch","智能硬件适配器"), - CONSOLE(95,"impp-console","服务监控台"), - GATEWAY(96,"impp-gateway","服务网关"), - CLOUD(97,"i3cloud","微服务"), + FORM(20,"block-form","智能表单"), + REPORT(21,"block-report","智能报表"), + WORKFLOW(22,"block-workflow","智能工作流"), + JOBFLOW(23,"block-jobflow","智能作业流"), + SOFTSWITCH(24,"block-softswitch","智能软件适配器"), + HARDSWITCH(25,"block-hardswitch","智能硬件适配器"), + CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), - CENTER(99,"icloud-server","注册中心"); + CLOUD(97,"i3cloud","微服务"), + GATEWAY(96,"impp-gateway","服务网关"), + CONSOLE(95,"impp-console","服务监控台"); private int value; private String code; From fe675467680bd8120970f10158ce5810e81c1292 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 18 Dec 2018 13:45:56 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E6=89=AB=E6=8F=8F=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=20=E6=89=AB=E6=8F=8F=E7=AE=B1=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=20=E5=A4=84=E7=90=86=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 8a52ad2..4432ac7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1265,7 +1265,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_STATUS { - CREATE(1, "新建"), + CREATE(1, "创建"), FINISH(5, "待处理"), FAIL(10, "已完成"), CLOSE(90, "已关闭"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index c930713..d703238 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -42,10 +42,10 @@ public class WmsQCMaster extends BaseBean { public Integer orderType; /** - * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消 + * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消 */ @Column(name="ORDER_STATUS") - @ApiParam(value = "状态", example = "0") + @ApiParam(value = "状态", example = "1") public Integer orderStatus; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index 7177ecf..c5e5990 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -37,10 +37,10 @@ public class WmsQCTrans extends BaseBean { public String item; /** - * 状态:0=创建,10=已处理 + * 状态:1=创建,10=已处理 */ @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") + @ApiParam(value = "状态", example = "1") public Integer itemStatus; @Column(name="REMARK") From 3a86ae3980efd82a529d217d7189a49ba189fb04 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 14:24:29 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 15 ++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 96 ++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index a3b1b31..728affc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -252,4 +252,19 @@ public interface BaseRepository extends JpaReposito public boolean isExitBySql(String sql); + public double countSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double countSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + public double countAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double countAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + public double findMaxByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double findMaxByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + public double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + + public double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index c6ae550..07acd52 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1018,4 +1018,100 @@ public class BaseRepositoryImpl extends SimpleJpaRep public boolean isExitBySql(String sql) { return findBySqlCount(sql) > 0; } + + @Override + public double countSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return countSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double countSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } + + @Override + public double countAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return countAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double countAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select avg(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } + + @Override + public double findMaxByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findMaxByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select max(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } + + @Override + public double findMinByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findMinByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + } + + @Override + public double findMinByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { + StringBuffer sb = new StringBuffer("select min(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb,paramName,paramValue); + sb.append(" group by :groupByName"); + + Query query = entityManager.createQuery(sb.toString()); + query.setParameter(":sumPropertyName", sumPropertyName); + setParameter(query,paramName,paramValue); + query.setParameter(":groupByName", groupByName); + + Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult(); + return sumResult == null ? 0.0 : sumResult.doubleValue(); + }else{ + throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); + } + } } From fc2a6c515c2e799a60b4c5a233f7bd5905aac686 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 18 Dec 2018 15:09:26 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D=E8=B0=83=E6=95=B4=E4=B8=BAfind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 8 ++++---- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 728affc..cbedf52 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -252,13 +252,13 @@ public interface BaseRepository extends JpaReposito public boolean isExitBySql(String sql); - public double countSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + public double findSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double countSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + public double findSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); - public double countAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); + public double findAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); - public double countAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + public double findAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); public double findMaxByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 07acd52..21b6e96 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1020,12 +1020,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public double countSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return countSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + public double findSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override - public double countSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + public double findSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,paramName,paramValue); @@ -1044,12 +1044,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public double countAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { - return countAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); + public double findAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) { + return findAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value}); } @Override - public double countAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { + public double findAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { StringBuffer sb = new StringBuffer("select avg(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,paramName,paramValue); From 5ee989b9a537a3fb6ac79671980542059954d1e5 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 19 Dec 2018 09:41:28 +0800 Subject: [PATCH 08/11] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseResultBean.java | 29 ---------------------- 1 file changed, 29 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index d2b930a..2d7656c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import io.swagger.annotations.ApiParam; -import lombok.Getter; -import lombok.Setter; import java.util.List; import java.util.Map; @@ -108,31 +106,4 @@ public class BaseResultBean { return rs; } - - public BaseResultBean setResultList(List resultList) { - this.resultList = resultList; - return this; - } - - public BaseResultBean setResultObject(Obj resultObject) { - this.resultObject = resultObject; - return this; - } - - public BaseResultBean setResultMap(Map resultMap) { - this.resultMap = resultMap; - return this; - } - - public BaseResultBean setPager(Pager pager) { - this.pager = pager; - return this; - } - - public BaseResultBean setListPager(ListPager listPager) { - this.listPager = listPager; - this.setPager(listPager.getObjectPager()); - this.setResultList(listPager.getObjectList()); - return this; - } } From cfd1a26b36669d426fc63c679ad414d12cf887e2 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 19 Dec 2018 09:59:14 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java index c26b6a6..78b9c4b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java @@ -16,5 +16,5 @@ public class OptionModel { private String name; - private Boolean value; + private Integer value; } From 4346fe48f0a5674582dbb16cfb17849a1d07dba7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 19 Dec 2018 10:25:58 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 1f8240d..b5e519a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -27,7 +27,7 @@ import java.util.Map; public class WmsActionResponseBean { @ApiParam("进度") - public Double percent; + public String percent; @ApiParam("当前步骤") public Integer currentStep; @@ -73,7 +73,7 @@ public class WmsActionResponseBean { this.message = message; } - public WmsActionResponseBean(Double percent, String message, List informations, Obj details, Boolean codeStatus) { + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus) { this.percent = percent; this.message = message; this.informations = informations; From 201afe2cb0487aa31dd90abc3113f8c432ab6538 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 19 Dec 2018 10:29:52 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 6f0b15f..8cdf9ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.model.wms.OptionModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,7 +23,7 @@ public class WmsOperationBean extends BaseBean { public String barCode; @ApiParam("可选项的值") - public List options; + public List options; @ApiParam("设备编号") public String fixNo;