From f2d7279e941338e79a68e0295d6f662deefb321a Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 20 Dec 2018 18:00:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A1=E7=AE=97bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 47 ++++++++++++---------- 1 file changed, 26 insertions(+), 21 deletions(-) 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 2d9652a..6762066 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 @@ -1035,7 +1035,6 @@ public class BaseRepositoryImpl extends SimpleJpaRep double sumResult = 0.0; List objList = query.getResultList(); -// query.getSingleResult() if(objList.size() > 0){ sumResult = Double.parseDouble(objList.iterator().next().toString()); } @@ -1053,17 +1052,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override 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 "); + StringBuffer sb = new StringBuffer("select avg(model."+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,paramName,paramValue); - sb.append(" group by :groupByName"); + sb.append(" group by model." + 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(); + double sumResult = 0.0; + List objList = query.getResultList(); + if(objList.size() > 0){ + sumResult = Double.parseDouble(objList.iterator().next().toString()); + } + return sumResult; }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1077,17 +1078,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep @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"); + StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb, paramName, paramValue); + sb.append(" group by model." + 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(); + double sumResult = 0.0; + List objList = query.getResultList(); + if(objList.size() > 0){ + sumResult = Double.parseDouble(objList.iterator().next().toString()); + } + return sumResult; }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1101,17 +1104,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep @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"); + StringBuffer sb = new StringBuffer("select min(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + appendQL(sb, paramName, paramValue); + sb.append(" group by model." + 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(); + double sumResult = 0.0; + List objList = query.getResultList(); + if(objList.size() > 0){ + sumResult = Double.parseDouble(objList.iterator().next().toString()); + } + return sumResult; }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } From 43bf2d2dba759e7215ed7f54ef110767697c2a8e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 20 Dec 2018 18:40:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A6=96=E5=AD=97=E6=AF=8D=E7=BC=A9=E5=86=99=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2=E9=80=92=E5=BD=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index b78d1de..fd5393e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -37,6 +37,10 @@ public class SysMenu extends BaseBean { @ApiParam(value ="功能名称") private String name; + @Column(name="NAME_ZH_SHORTENING") + @ApiParam(value ="功能名称中文简写") + private String nameZhShortening; + @Column(name="MENU_CODE") @ApiParam(value ="功能代码") private String menuCode; @@ -65,7 +69,7 @@ public class SysMenu extends BaseBean { @Column(name="MENU_SORT") @ApiParam(value ="资源排序", example = "0") - private String menuSort; + private Integer menuSort; @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index f77920e..1d8de14 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -133,12 +133,12 @@ public class CoreHqlPack { public static String packHqlSysDepartment(SysDepartment department){ StringBuffer result = new StringBuffer(); - if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ - department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - } +// if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ +// department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); +// } HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); +// HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); From 5a5ed8220180ca8d97c5bf90072b47f9f20e5e96 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 20 Dec 2018 21:37:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Cloud=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=BB=84=E7=BB=87=E6=88=96=E8=80=85=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E7=9A=84=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/SysRefUserDepartment.java | 10 +++++++++- .../i3plus/pojo/platform/bean/SysUserInfo.java | 6 +++++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 21 +++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java index fd618e5..c312892 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java @@ -45,11 +45,19 @@ public class SysRefUserDepartment extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long departmentId; - @Column(name="DEPARTMENT_NAME_RDD") @ApiParam(value ="部门名称") private String departmentNameRdd; + @Column(name="ORGANIZE_ID") + @ApiParam(value ="组织ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long organizeId; + + @Column(name="ORGANIZE_NAME_RDD") + @ApiParam(value ="组织名称") + private String organizeNameRdd; + public SysRefUserDepartment() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 84d5d02..28742da 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -122,7 +122,7 @@ public class SysUserInfo extends BaseBean { private List departmentList; @Transient - @ApiParam("用户的部门ID信息") + @ApiParam("用户的部门ID信息集合") private List departmentIdList; @Transient @@ -138,6 +138,10 @@ public class SysUserInfo extends BaseBean { private List organizeList; @Transient + @ApiParam("用户的组织ID信息集合") + private List organizeIdList; + + @Transient @ApiParam(value ="用户岗位信息") private SysDepartment department; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 1d8de14..c3dbd1b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -390,6 +390,27 @@ public class CoreHqlPack { } /** + * 用户信息 复杂查询拼接 + * @param userInfo + * @return + */ + public static String packHqlSysUserInfo(SysUserInfo userInfo,List idList){ + StringBuffer result = new StringBuffer(); + + // And + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + if(idList != null && idList.size() > 0){ + HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); + } + + // Like + HqlPack.getStringLikerPack(userInfo.getName(),"name",result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + + return result.toString(); + } + + /** * 查询语言代码是否重复 * @param localeLanguage * @return From 08d8281fd5f835a48e746808a2bd545d0af8d0e4 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 21 Dec 2018 00:31:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20dash?= =?UTF-8?q?board?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysLogTaskTime.java} | 51 ++++++++++------------ .../SysLogTaskTimeRepository.java | 14 ++++++ .../repository/SysTaskTimeRecordingRepository.java | 4 +- 3 files changed, 39 insertions(+), 30 deletions(-) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{bean/SysTaskTimeRecording.java => platbean/SysLogTaskTime.java} (61%) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java similarity index 61% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index bf5520e..a865858 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.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; @@ -26,46 +26,41 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_TASK_TIME_RECORDING") -@Api(value="定时任务执行记录",description = "定时任务执行记录") -public class SysTaskTimeRecording extends BaseBean { +@Table(name="SYS_LOG_TASK_TIME") +@Api(value="定时任务执行日志",description = "定时任务执行记录") +public class SysLogTaskTime extends BaseBean { @Column(name="NAME") @ApiParam(value ="任务名称") private String name; - + + @Column(name="GROUP_NAME") + @ApiParam(value ="任务组名称") + private String groupName; + @Column(name="TIME_TASK_ID") @ApiParam(value ="任务编号" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long timeTaskId; - @Column(name="TIME_ID") - @ApiParam(value ="时间表达式ID" , example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long timeId; + @Column(name="TIME_EXPRESSION_NAME_Rdd") + @ApiParam(value ="时间表达式名称") + private String timeExpressionNameRdd; - @Column(name="TIME_EXPRESSION_RDD") + @Column(name="TIME_EXPRESSION_CONTENT_RDD") @ApiParam(value ="时间表达式") - private String timeExpressionRdd; - - @Column(name="TASK_START_DATE_TIME") - @ApiParam(value ="任务开始时间") - private String taskStartDateTime; - - @Column(name="TASK_END_DATE_TIME") - @ApiParam(value ="任务结束时间") - private String taskEndDateTime; - - @Column(name="TASK_STATUS_ID") + private String timeExpressionContentRdd; + + @Column(name="EXECUTE_TIME") + @ApiParam(value ="执行耗时") + @JsonSerialize(using = ToStringSerializer.class) + private Long executeTime; + + @Column(name="TASK_STATUS") @ApiParam(value ="任务完成情况(枚举：1正常，2失败)") - private Integer taskStatusId; - - @Column(name="TASK_LOG") - @ApiParam(value ="任务日志") - private String taskLog; - + private Integer taskStatus; + @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; - } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java new file mode 100644 index 0000000..1ce1eef --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.platrepositorymongo; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-12-20 22:35 + * @Modify: + **/ +public interface SysLogTaskTimeRepository extends BaseMongoRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java index 67c93ae..749dd25 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; /** * @Description : 定时任务执行记录 @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording; * @Date : 2018-10-22 12:03:01.409 * @Modify : **/ -public interface SysTaskTimeRecordingRepository extends BaseRepository { +public interface SysTaskTimeRecordingRepository extends BaseRepository { }