Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -80,7 +80,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
      * 通过 in 批量删除
      * @param ids 熟悉值数组
      */
-    public void deleteByIdIn(Long[] ids);
+    public void deleteByIdIn(long[] ids);
 
     /**
      * 通过多单属性进行单个值更新

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -144,7 +144,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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);

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java

@@ -43,10 +43,10 @@ public class Organize extends BaseBean {
     @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() {

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<SysRole> roleList;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -34,6 +34,10 @@ public class SysMenu extends BaseBean {
     @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;

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){
+    public static String packHqlOrganize(Organize organize){
-        StringBuffer result =  new StringBuffer();
+        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.getNumEqualPack(department.getParentId(),"parentId",result);
-        // 部门代码
+        HqlPack.getStringLikerPack(department.getName(),"name",result);
-        HqlPack.getStringLikerPack(department.getDepartmentCode(),"positionCode",result);
+        HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
-        // 父级部门id
-        HqlPack.getNumEqualPack(department.getId(),"parentId",result);
-        // 所属组织id
-        HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",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.getNumEqualPack(menu.getParentId(),"parentId",result);
-        HqlPack.getStringLikerPack(position.getName(),"name",result);
+        HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
-        HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",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();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java

@@ -3,6 +3,9 @@ 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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -15,7 +18,10 @@ import javax.persistence.Table;
  * @CreateDate : 2018-09-04 15:58
  * @Modify:
  **/
+@Data
 @Entity
+@DynamicInsert
+@DynamicUpdate
 @Table(name="factory_store")
 @Api("工厂仓库")
 public class FactoryStore extends BaseBean {
@@ -27,40 +33,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 + '\'' +
-                '}';
-    }
 }

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();
+    }
+}