From d521e0c2560f8135535ac26f07ef605b8db4b598 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Fri, 27 Mar 2020 21:43:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9pom?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-api/pom.xml | 3 ++- modules/i3plus-core-apiservice/pom.xml | 3 ++- pom.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index df3df70..97c0e9a 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -12,6 +12,7 @@ i3plus-core-api jar + 1.0-${profileActive}-SNAPSHOT i3plus.pojo @@ -62,6 +63,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 73c0d0d..1fce4c8 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -12,6 +12,7 @@ i3plus-core-apiservice jar + 1.0-${profileActive}-SNAPSHOT @@ -243,7 +244,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} diff --git a/pom.xml b/pom.xml index 36ab16f..8413be4 100644 --- a/pom.xml +++ b/pom.xml @@ -344,7 +344,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} From 929c0ad79e0018a09dbebd5cd51c3612c103a384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Mar 2020 15:16:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?MAVEN=20=E7=89=88=E6=9C=AC=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-api/pom.xml | 2 +- modules/i3plus-core-apiservice/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 97c0e9a..7bf8cf9 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 1fce4c8..9fad5b8 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 8413be4..3d1f5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-core-api modules/i3plus-core-apiservice From 9b949f7719e299a2c9d1d1fcb28fb98d54b5d56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Mar 2020 19:36:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/serviceimpl/busi/SysConfigService.java | 5 +++-- .../core/apiservice/serviceimpl/busi/SysFileServiceImpl.java | 5 +++-- .../apiservice/serviceimpl/busi/SysOrderNoRuleService.java | 5 +++-- .../core/apiservice/serviceimpl/busi/SysTaskPlanService.java | 8 +++----- .../core/apiservice/serviceimpl/busi/SysTaskService.java | 11 ++++++----- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java index 212954c..25ce846 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -74,9 +75,9 @@ public class SysConfigService implements ISysConfigService { pager = PagerHelper.getPager(pager, SysConfigRDao.listCount()); return new ListPager(SysConfigRDao.listPager(pager),pager); }else { - String hqlPack = CoreHqlPack.packHqlSysConfig(sysConfig); + DdlPackBean hqlPack = CoreHqlPack.packHqlSysConfig(sysConfig); pager = PagerHelper.getPager(pager, SysConfigRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(SysConfigRDao.findByHqlWherePage(hqlPack + sysConfig.orderBy(),pager),pager); + return new ListPager(SysConfigRDao.findByHqlWherePage(hqlPack, pager), pager); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index 2007466..20385a5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.BeanCopyTool; import cn.estsh.i3plus.platform.common.tool.FileTool; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -121,9 +122,9 @@ public class SysFileServiceImpl implements ISysFileService { pager = PagerHelper.getPager(pager, sysFileRDao.listCount()); return new ListPager(sysFileRDao.listPager(pager), pager); } else { - String hqlPack = CoreHqlPack.packHqlSysFile(sysFile); + DdlPackBean hqlPack = CoreHqlPack.packHqlSysFile(sysFile); pager = PagerHelper.getPager(pager, sysFileRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysFileRDao.findByHqlWherePage(hqlPack + sysFile.orderBy(), pager), pager); + return new ListPager(sysFileRDao.findByHqlWherePage(hqlPack, pager), pager); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java index 274cd74..0cda5d2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService; import cn.estsh.i3plus.core.apiservice.util.OrderNoMakeUtil; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -81,9 +82,9 @@ public class SysOrderNoRuleService implements ISysOrderNoRuleService { pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.listCount()); return new ListPager(sysOrderNoRuleRDao.listPager(pager), pager); } else { - String hqlPack = CoreHqlPack.packHqlSysOrderNoRule(sysOrderNoRule); + DdlPackBean hqlPack = CoreHqlPack.packHqlSysOrderNoRule(sysOrderNoRule); pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysOrderNoRuleRDao.findByHqlWherePage(hqlPack + sysOrderNoRule.orderBy(), pager), pager); + return new ListPager(sysOrderNoRuleRDao.findByHqlWherePage(hqlPack, pager), pager); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java index 9021245..dd17af5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -11,11 +11,9 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysRefTaskCyclePlan; import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; -import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository; import cn.estsh.i3plus.pojo.platform.repository.SysRefTaskCyclePlanRepository; import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; -import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -160,9 +158,9 @@ public class SysTaskPlanService implements ISysTaskPlanService { pager = PagerHelper.getPager(pager, sysTaskPlanRDao.listCount()); return new ListPager(sysTaskPlanRDao.listPager(pager), pager); } else { - String hqlPack = CoreHqlPack.packHqlSysTaskPlan(sysTaskPlan); + DdlPackBean hqlPack = CoreHqlPack.packHqlSysTaskPlan(sysTaskPlan); pager = PagerHelper.getPager(pager, sysTaskPlanRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysTaskPlanRDao.findByHqlWherePage(hqlPack + sysTaskPlan.orderBy(), pager), pager); + return new ListPager(sysTaskPlanRDao.findByHqlWherePage(hqlPack, pager), pager); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java index 5110f43..181178e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -126,13 +127,13 @@ public class SysTaskService implements ISysTaskService { @Override @ApiOperation(value = "任务管理复杂查询，分页，排序",notes = "任务管理复杂查询，分页，排序") public ListPager querySysTaskByPager(SysTask sysTask, Pager pager) { - if(sysTask == null) { + if (sysTask == null) { pager = PagerHelper.getPager(pager, sysTaskRDao.listCount()); - return new ListPager(sysTaskRDao.listPager(pager),pager); - }else { - String hqlPack = CoreHqlPack.packHqlSysTask(sysTask); + return new ListPager(sysTaskRDao.listPager(pager), pager); + } else { + DdlPackBean hqlPack = CoreHqlPack.packHqlSysTask(sysTask); pager = PagerHelper.getPager(pager, sysTaskRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysTaskRDao.findByHqlWherePage(hqlPack + sysTask.orderBy(),pager),pager); + return new ListPager(sysTaskRDao.findByHqlWherePage(hqlPack, pager), pager); } } From 69e6a1a4ad446fde1acaf416cf69e8bb0ad0e89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 1 Apr 2020 14:07:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-api/pom.xml | 2 +- modules/i3plus-core-apiservice/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 7bf8cf9..97c0e9a 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 9fad5b8..1fce4c8 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0