From 703fa5158a9845bcf7ef0aec472d1eae476a6a9e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 26 Oct 2018 21:18:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/flatform/UserModel.java | 51 ---------------------- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java deleted file mode 100644 index b686a24..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/flatform/UserModel.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.estsh.i3plus.pojo.model.flatform; - -import cn.estsh.i3plus.pojo.platform.bean.*; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; -import java.util.Set; - - -/** - * @Description : 用户封装对象 - * 
- *      用户对象        

- *      用户详细对象    

- *      角色对象        

- *      部门对象        

- *      组织对象        

- *      岗位对象        

- *
- * - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-25 16:54 - * @Modify : - **/ -@Data -public class UserModel { - - @ApiParam("用户对象信息") - private SysUser user; - - @ApiParam("用户对象信息") - private SysUserInfo userInfo; - - @ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合") - private List roles; - - @ApiParam(value = "角色信息",access = "用户所拥有岗位信息") - private SysRole role; - - @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息") - private Position position; - - @ApiParam(value = "部门信息",access = "用户所拥有部门信息") - private Department department; - - @ApiParam(value = "组织信息",access = "用户所拥有的组织信息") - private Organize organize; - -} 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 ea447ca..b5c4740 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 @@ -75,7 +75,7 @@ public class CoreHqlPack { /** - * 岗位 + * In 参数封装 * @param columnName * @return */ From f91d524cfe274709bb49b769045d59180b6dadcd Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 27 Oct 2018 18:27:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Array=20To=20String=20Bug=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b5c4740..3cf58e7 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 @@ -82,8 +82,8 @@ public class CoreHqlPack { public static String packHqlIds(String columnName,String[] params){ StringBuffer result = new StringBuffer(); - // 参数数组 - HqlPack.getInPack(Arrays.toString(params),columnName,result); + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(String.join(",",params),columnName,result); return result.toString(); } From a1bdbd827f36579566adaaf55fd6503f31a0a5cb Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 27 Oct 2018 18:31:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=20SQL=20BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 23 ++++++++++++++++------ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 4 ++-- 2 files changed, 19 insertions(+), 8 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 a6e8712..c3ca7d7 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 @@ -233,11 +233,13 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_STATUS { - NORMAL(1, "NORMAL", "正常"), - FREEZE(2, "FREEZE", "冻结"), - ABERRANT(3, "ABERRANT", "异常"), - RESIGNATION(4, "RESIGNATION", "离职"), - EXPIRE(5, "EXPIRE", "服务到期"); + NORMAL(1, "正常", "正常_NORMAL"), + FREEZE(2, "冻结", "冻结_FREEZE"), + ABERRANT(3, "异常", "异常_ABERRANT"), + RESIGNATION(4, "离职", "离职_RESIGNATION"), + EXPIRE(5, "服务到期", "服务到期_EXPIRE"), + LOCKING(6, "锁定", "fa cell-fa fa-lock"), + ENABLE(7, "启用", "fa fa-success cell-fa fa-check"); private int value; private String code; @@ -282,9 +284,18 @@ public class CommonEnumUtil { } } + + /** + * 数据状态 + * 1 启用 + * 2 禁用 + * 3 锁定 + */ @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"), locking(3, "锁定", "fa cell-fa fa-lock"); + ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(2, "禁止", "fa fa-disabled cell-fa fa-times-circle"), + LOCKING(3, "锁定", "fa cell-fa fa-lock"); private int value; private String name; 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 f978ab6..333cb8b 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 @@ -129,7 +129,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public void deleteByProperties(String[] propName, Object[] propValue) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { - StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " o where "); + StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " o where 1=1 "); appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); setParameter(query,propName,propValue); @@ -166,7 +166,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); } sb.deleteCharAt(sb.length() - 1); - sb.append(" where "); + sb.append(" where 1=1 "); appendQL(sb, conditionName, conditionValue); Query query = entityManager.createQuery(sb.toString()); for (int i = 0; i < propertyName.length; i++) {