From 96fcb8ab4e4f6a74dbdd38f6ce65384f333b0153 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 31 Oct 2018 13:57:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/FactoryStore.java | 38 ++-------------------- 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java index e816d20..756c7ad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; @@ -15,6 +16,7 @@ import javax.persistence.Table; * @CreateDate : 2018-09-04 15:58 * @Modify: **/ +@Data @Entity @Table(name="factory_store") @Api("工厂仓库") @@ -27,40 +29,4 @@ public class FactoryStore extends BaseBean { @Column(name="store_name") @ApiParam("仓库名称") public String storeName; - - public FactoryStore() { - } - - public FactoryStore(String storeCode, String storeName) { - this.storeCode = storeCode; - this.storeName = storeName; - } - - public String getStoreCode() { - return storeCode; - } - - public void setStoreCode(String storeCode) { - this.storeCode = storeCode; - } - - public String getStoreName() { - return storeName; - } - - public void setStoreName(String storeName) { - this.storeName = storeName; - } - - @Override - public String toString() { - return "FactoryStore{" + - "storeCode='" + storeCode + '\'' + - ", storeName='" + storeName + '\'' + - ", id=" + id + - ", isValid=" + isValid + - ", createDate='" + createDatetime + '\'' + - ", modifyDate='" + modifyDatetime + '\'' + - '}'; - } } From 3f6da227e1d8cf6b67b1ff97c70b8f6691767555 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 31 Oct 2018 14:00:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java 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 new file mode 100644 index 0000000..7e424ba --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.sqlpack; + +import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.i3plus.pojo.platform.bean.Position; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import cn.estsh.i3plus.pojo.wms.bean.FactoryStore; + +/** + * @Description : 仓库管理对象封装 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-10-31 10:45 + * @Modify: + **/ +public class WmsHqlPack { + + /** + * 工厂仓库模糊分页查询 + * @param factoryStore + * @return + */ + public static String packHqlFactoryStore(FactoryStore factoryStore) { + StringBuffer result = new StringBuffer(); + + // 部门名称 + HqlPack.getStringLikerPack(factoryStore.getStoreCode(),"storeCode", result); + // 部门代码 + HqlPack.getStringLikerPack(factoryStore.getStoreName(),"storeName", result); + + return result.toString(); + } +} From e7f77d19c962b60b5f3f880b58ed7a4c8a0c44bf Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 31 Oct 2018 14:57:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java index 756c7ad..97ec3c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +20,8 @@ import javax.persistence.Table; **/ @Data @Entity +@DynamicInsert +@DynamicUpdate @Table(name="factory_store") @Api("工厂仓库") public class FactoryStore extends BaseBean { From 9bac06edaed1cb08c2ff1d89283529c894c152bc Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 31 Oct 2018 19:39:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?= =?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 --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 +- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- .../estsh/i3plus/pojo/platform/bean/Organize.java | 4 +- .../i3plus/pojo/platform/bean/SessionUser.java | 2 +- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 6 +- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 80 ++++++++++++++-------- 6 files changed, 63 insertions(+), 33 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 32b769b..431dbb7 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 @@ -80,7 +80,7 @@ public interface BaseRepository extends JpaReposito * 通过 in 批量删除 * @param ids 熟悉值数组 */ - public void deleteByIdIn(Long[] ids); + public void deleteByIdIn(long[] ids); /** * 通过多单属性进行单个值更新 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 e3eab06..d4b2aef 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 @@ -144,7 +144,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public void deleteByIdIn(Long[] ids) { + public void deleteByIdIn(long[] ids) { if(ids != null && ids.length > 0){ String hql = "delete from " + persistentClass.getName() + " o where o.id in(:ids) "; Query query = entityManager.createQuery(hql); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java index 6546740..d720653 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java @@ -42,11 +42,11 @@ public class Organize extends BaseBean { @Column(name="ORGANIZE_TYPE_ID") @ApiParam(value ="组织类型ID（枚举：1.集团，2.公司，3.工厂）" , example ="1") private Integer organizeTypeId; - + + // 默认值 -1 @Column(name="PARENT_ID") @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) - // 默认值 -1 private Long parentId; public Long getParentId() { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 5b8fb4a..fdf9dec 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -35,7 +35,7 @@ public class SessionUser implements Serializable { private SysUser user; @ApiParam("用户对象信息") - private SysUser userInfo; + private SysUserInfo userInfo; @ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合") private List roleList; 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 b7d1ac0..dfb816f 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 @@ -33,7 +33,11 @@ public class SysMenu extends BaseBean { @Column(name="NAME") @ApiParam(value ="功能名称") private String name; - + + @Column(name="MENU_CODE") + @ApiParam(value ="功能代码") + private String menuCode; + @Column(name="MENU_TYPE_ID") @ApiParam(value ="功能类型（枚举：1.模块，2.菜单，3.按钮）" , example ="-1") private Integer menuTypeId; 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 a482cfd..7885ded 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 @@ -53,33 +53,47 @@ public class CoreHqlPack { } /** + * In 参数封装 + * @param columnName + * @return + */ + public static String packHqlIds(String columnName,String[] params){ + StringBuffer result = new StringBuffer(); + + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(String.join(",",params),columnName,result); + return result.toString(); + } + + /** * 岗位复杂查询 * @param position * @return */ - public static String packHqlDepartment(Position position) { + public static String packHqlPosition(Position position){ StringBuffer result = new StringBuffer(); - // 岗位名称 - HqlPack.getStringLikerPack(position.getName(),"positionName",result); - // 岗位代码 + // 查询参数封装 + HqlPack.getNumEqualPack(position.getParentId(),"parentId",result); + HqlPack.getStringLikerPack(position.getName(),"name",result); HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); - // 父级岗位 - HqlPack.getNumEqualPack(position.getId(),"parentId",result); return result.toString(); } /** - * In 参数封装 - * @param columnName + * 组织复杂查询 + * @param organize * @return */ - public static String packHqlIds(String columnName,String[] params){ - StringBuffer result = new StringBuffer(); + public static String packHqlOrganize(Organize organize){ + StringBuffer result = new StringBuffer(); + + // 查询参数封装 + HqlPack.getNumEqualPack(organize.getParentId(),"parentId",result); + HqlPack.getStringLikerPack(organize.getName(),"name",result); + HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); - // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(String.join(",",params),columnName,result); return result.toString(); } @@ -88,33 +102,45 @@ public class CoreHqlPack { * @param department * @return */ - public static String packHqlDepartment(Department department) { + public static String packHqlDepartment(Department department){ StringBuffer result = new StringBuffer(); - // 部门名称 - HqlPack.getStringLikerPack(department.getName(),"positionName",result); - // 部门代码 - HqlPack.getStringLikerPack(department.getDepartmentCode(),"positionCode",result); - // 父级部门id - HqlPack.getNumEqualPack(department.getId(),"parentId",result); - // 所属组织id - HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); + // 查询参数封装 + HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); + HqlPack.getStringLikerPack(department.getName(),"name",result); + HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); return result.toString(); } /** - * 岗位复杂查询 - * @param position + * 系统权限复杂查询 + * @param menu * @return */ - public static String packHqlPosition(Position position){ + public static String packHqlSysMenu(SysMenu menu){ StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(position.getParentId(),"parentId",result); - HqlPack.getStringLikerPack(position.getName(),"name",result); - HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + HqlPack.getStringLikerPack(menu.getName(),"name",result); + HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + + return result.toString(); + } + + /** + * 系统角色复杂查询 + * @param role + * @return + */ + public static String packHqlSysRole(SysRole role){ + StringBuffer result = new StringBuffer(); + + // 查询参数封装 + HqlPack.getNumEqualPack(role.getRoleStatusId(),"roleStatusId",result); + HqlPack.getStringLikerPack(role.getName(),"name",result); return result.toString(); }