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

modules/i3plus-pojo-base/pom.xml

@@ -23,6 +23,11 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
     </dependencies>
 
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -48,7 +48,7 @@ public class Pager {
             totalPages++;
         }
         currentPage = 1;
-        startRow = 1;
+        startRow = 0;
         resetEndRow();
     }
 
@@ -63,7 +63,7 @@ public class Pager {
             totalPages++;
         }
         currentPage = 1;
-        startRow = 1;
+        startRow = 0;
         resetEndRow();
     }
 
@@ -125,7 +125,7 @@ public class Pager {
 
     public void resetEndRow() {
         if (startRow + pageSize <= totalRows) {
-            endRow = startRow + pageSize - 1;
+            endRow = startRow + pageSize;
         } else {
             endRow = totalRows;
         }
@@ -133,7 +133,7 @@ public class Pager {
 
     public void first() {
         currentPage = 1;
-        startRow = 1;
+        startRow = 0;
         resetEndRow();
     }
 
@@ -142,7 +142,7 @@ public class Pager {
             return;
         }
         currentPage--;
-        startRow = (currentPage - 1) * pageSize + 1;
+        startRow = (currentPage - 1) * pageSize;
         resetEndRow();
     }
 
@@ -150,7 +150,7 @@ public class Pager {
         if (currentPage < totalPages) {
             currentPage++;
         }
-        startRow = (currentPage - 1) * pageSize + 1;
+        startRow = (currentPage - 1) * pageSize;
         resetEndRow();
     }
 
@@ -163,7 +163,7 @@ public class Pager {
         } else {
             currentPage = totalPages;
         }
-        startRow = (currentPage - 1) * pageSize + 1;
+        startRow = (currentPage - 1) * pageSize;
         resetEndRow();
     }
 
@@ -182,7 +182,7 @@ public class Pager {
         if (currentPage > totalPages) {
             last();
         } else {
-            startRow = (currentPage - 1) * pageSize + 1;
+            startRow = (currentPage - 1) * pageSize;
         }
     }
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java

@@ -58,7 +58,7 @@ public class PagerHelper {
         }
         pager.setCurrentPage(currentPage);
 
-        int startRow = (currentPage - 1) * pageSize + 1;
+        int startRow = (currentPage - 1) * pageSize;
         pager.setStartRow(startRow);
 
         int endRow = 0;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -141,7 +141,7 @@ public class CommonEnumUtil {
      * 处理标识
      */
     public enum SYS_LOCALE_RESOURCE_TYPE {
-        COMMON(1, "通用"),
+        COMMON(1, "通用"),EXCEPTION(2, "异常"),
         MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮");
 
         private int value;
@@ -285,7 +285,6 @@ public class CommonEnumUtil {
         }
     }
 
-
     /**
      * 数据状态
      *  1 启用
@@ -388,7 +387,6 @@ public class CommonEnumUtil {
         }
     }
 
-
     /**
      * 是否有效
      */
@@ -422,7 +420,6 @@ public class CommonEnumUtil {
         }
     }
 
-
     /**
      * 排序方式
      */
@@ -455,4 +452,39 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 父节点配置
+     */
+    public enum PARENT{
+
+        DEFAULT(-1L,"根节点");
+
+        private Long value = -1L;
+        private String description = null;
+
+        public Long getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private PARENT(Long value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -640,7 +640,7 @@ public class ImppEnumUtil {
      * 1.SYSTEM：系统参数
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYS_PARAM_TYPE{
+    public enum SYS_CONFIG_TYPE{
 
         SYSTEM(1,"系统参数","系统参数");
 
@@ -648,10 +648,10 @@ public class ImppEnumUtil {
         private String name;
         private String description;
 
-        SYS_PARAM_TYPE() {
+        SYS_CONFIG_TYPE() {
         }
 
-        SYS_PARAM_TYPE(int value, String name, String description) {
+        SYS_CONFIG_TYPE(int value, String name, String description) {
             this.value = value;
             this.name = name;
             this.description = description;

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

@@ -77,6 +77,12 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public void deleteByProperties(String[] propName, Object[] propValue);
 
     /**
+     * 通过 in 批量删除
+     * @param ids 熟悉值数组
+     */
+    public void deleteByIdIn(Long[] ids);
+
+    /**
      * 通过多单属性进行单个值更新
      * @param conditionName
      * @param conditionValue
@@ -112,6 +118,24 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
      */
     public int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue);
 
+    /**
+     * 根据 hqlWhere 批量修改制定字段
+     * @param hqlWhere
+     * @param propertyName  修改的字段名称
+     * @param propertyValue 修改后的值
+     * @return
+     */
+    public int updateByHqlWhere(String hqlWhere,String propertyName, Object propertyValue);
+
+    /**
+     * 批量修改数据熟悉
+     * @param hqlWhere      HQL where 语句
+     * @param propertyName  修改的字段名称
+     * @param propertyValue 修改后的值
+     * @return
+     */
+    public int updateByHqlWhere(String hqlWhere,String[] propertyName, Object[] propertyValue);
+
     public T getById(long id);
 
     public List<T> list();

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

@@ -1,14 +1,15 @@
 package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
 
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.SnowflakeIdMaker;
-import cn.estsh.i3plus.pojo.base.common.Pager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Id;
 import javax.persistence.Query;
-import javax.persistence.TypedQuery;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.*;
@@ -22,6 +23,8 @@ import java.util.*;
  **/
 public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, Serializable>
                                                             implements BaseRepository<T, Serializable> {
+    public static final Logger LOGGER = LoggerFactory.getLogger(BaseRepositoryImpl.class);
+
     /**
      * 持久化上下文
      */
@@ -141,6 +144,19 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
+    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);
+            query.setParameter("ids", Arrays.asList(ids));
+
+            query.executeUpdate();
+        }else{
+            throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids);
+        }
+    }
+
+    @Override
     public int updateByProperties(String conditionName, Object conditionValue, String propertyName, Object propertyValue) {
         return updateByProperties(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue });
     }
@@ -161,17 +177,20 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
                 && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)
                 && (conditionValue != null) && (conditionValue.length > 0)) {
             StringBuffer sb = new StringBuffer();
+
             sb.append("update " + persistentClass.getName() + " o set ");
             for (int i = 0; i < propertyName.length; i++) {
                 sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
             }
             sb.deleteCharAt(sb.length() - 1);
+
             sb.append(" where 1=1 ");
             appendQL(sb, conditionName, conditionValue);
             Query query = entityManager.createQuery(sb.toString());
             for (int i = 0; i < propertyName.length; i++) {
                 query.setParameter("p_" + propertyName[i], propertyValue[i]);
             }
+
             setParameter(query, conditionName, conditionValue);
             return query.executeUpdate();
         } else {
@@ -181,6 +200,36 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
+    public int updateByHqlWhere(String hqlWhere, String propertyName, Object propertyValue) {
+        return updateByHqlWhere(hqlWhere, new String[]{propertyName}, new Object[]{propertyValue});
+    }
+
+    @Override
+    public int updateByHqlWhere(String hqlWhere, String[] propertyName, Object[] propertyValue) {
+        if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null)
+                && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) {
+            StringBuffer sb = new StringBuffer();
+
+            sb.append("update " + persistentClass.getName() + " o set ");
+            for (int i = 0; i < propertyName.length; i++) {
+                sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
+            }
+            sb.deleteCharAt(sb.length() - 1);
+
+            sb.append(" where 1=1 ");
+            sb.append(hqlWhere);
+            Query query = entityManager.createQuery(sb.toString());
+            for (int i = 0; i < propertyName.length; i++) {
+                query.setParameter("p_" + propertyName[i], propertyValue[i]);
+            }
+
+            return query.executeUpdate();
+        } else {
+            throw new IllegalArgumentException("Method updateByProperties argument is illegal! propertyName:" + propertyName + ",propertyValue:" + propertyValue);
+        }
+    }
+
+    @Override
     public T getById(long id) {
         return this.getOne(id);
     }
@@ -292,7 +341,6 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         return queryObject.getResultList();
     }
 
-
     @Override
     public T getByProperty(String propertyName, Object value) {
         String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
@@ -338,8 +386,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public int listCount() {
-        return entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Integer.class)
+        Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class)
             .getSingleResult();
+        return count == null ? 0 : count.intValue();
     }
 
     @Override
@@ -369,14 +418,15 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             }
         }
 
-        Query queryObject = entityManager.createQuery(queryString.toString(),Integer.class);
+        Query queryObject = entityManager.createQuery(queryString.toString(),Long.class);
         for (int i = 0; i < size; i++) {
             if(values[i] != null) {
                 queryObject.setParameter(propertyNames[i], values[i]);
             }
         }
 
-        return (int) queryObject.getSingleResult();
+        Long count = (Long) queryObject.getSingleResult();
+        return count == null ? 0 : count.intValue();
     }
 
     @Override
@@ -491,7 +541,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             }
         }
 
-        return entityManager.createQuery(queryString.toString(),Integer.class).getSingleResult();
+        Long count = entityManager.createQuery(queryString.toString(),Long.class).getSingleResult();
+        return count == null ? 0 : count.intValue();
     }
 
     @Override
@@ -548,12 +599,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             queryString.append(hqlWhere);
         }
 
-        return entityManager.createQuery(queryString.toString(),Integer.class).getSingleResult();
+        Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult();
+        return count == null ? 0 : count.intValue();
     }
 
     @Override
     public int findByHqlCount(String hql) {
-        return entityManager.createQuery(hql,Integer.class).getSingleResult();
+        Long count = entityManager.createQuery(hql,Long.class).getSingleResult();
+        return count == null ? 0 : count.intValue();
     }
 
     @Override
@@ -630,7 +683,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public int findBySqlCount(String sql) {
-        return (int) entityManager.createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Integer.class).getSingleResult();
+        Long count = (Long) entityManager.createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class).getSingleResult();
+        return count == null ? 0 : count.intValue();
     }
 
     @Override

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

@@ -55,9 +55,6 @@ public class Department extends BaseBean {
         }
     }
 
-    @ApiParam(value ="子部门列表")
-    private transient List<Department> childList;
- 
     @Column(name="RED_ORGANIZATION_NAME")
     @ApiParam(value ="所属组织名称" , access ="所属组织名称")
     private String redOrganizeName;
@@ -71,4 +68,7 @@ public class Department extends BaseBean {
     @ApiParam(value ="排序" , example ="1" , access ="排序")
     private Integer departmentSort;
 
+    @ApiParam(value ="子集列表")
+    private transient List<Department> childList;
+
 }

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.text.DecimalFormat;
+import java.util.List;
 
 /**
  * @Description : 组织
@@ -71,4 +72,6 @@ public class Organize extends BaseBean {
     @ApiParam(value ="组织状态（枚举：1.正常，2.禁用）" , example ="1")
     private Integer organizeStatusId;
 
+    @ApiParam(value ="子集列表")
+    private transient List<Organize> childList;
 }

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

@@ -38,10 +38,10 @@ public class Position extends BaseBean {
     @ApiParam(value ="岗位代码" , access ="岗位代码")
     private String positionCode;
 
+    // 默认值 -1
     @Column(name="PARENT_ID")
     @ApiParam(value ="上级岗位" , example ="-1" , access ="上级岗位")
     @JsonSerialize(using = ToStringSerializer.class)
-    // 默认值 -1
     private Long parentId;
 
     public Long getParentId() {

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

@@ -29,7 +29,6 @@ import java.text.DecimalFormat;
 @Api(value="系统字典",description = "系统字典")
 public class SysDictionary extends BaseBean {
 
- 
     @Column(name="NAME")
     @ApiParam(value ="字典名称")
     private String name;
@@ -56,6 +55,10 @@ public class SysDictionary extends BaseBean {
     @ApiParam(value ="父级节点名称")
     private String redParentName;
 
+    @Column(name="RED_PARENT_CODEE")
+    @ApiParam(value ="父级节点代码")
+    private String redParentCode;
+
     @Column(name="DICTIONARY_VALUE")
     @ApiParam(value ="字典值")
     private String dictionaryValue;

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,6 +29,11 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
     private Integer resourceType;
 
+    private transient String resourceTypeTxt;
+    public String getResourceTypeTxt(){
+        return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType);
+    }
+
     @Column(name="language_code")
     @ApiParam(value = "语言编码",example = "浏览器语言编码")
     private String languageCode;

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.text.DecimalFormat;
+import java.util.List;
 
 /**
  * @Description : 系统功能
@@ -79,4 +80,7 @@ public class SysMenu extends BaseBean {
     @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
     private Integer menuStatus = 1;
 
+    @ApiParam(value ="子集列表")
+    private transient List<SysMenu> childList;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -1,10 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.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.platform.bean.*;
 
 import java.util.Arrays;
 
@@ -60,7 +57,7 @@ public class CoreHqlPack {
      * @param position
      * @return
      */
-    public static String packHqlPosition(Position position) {
+    public static String packHqlDepartment(Position position) {
         StringBuffer result = new StringBuffer();
 
         // 岗位名称
@@ -73,7 +70,6 @@ public class CoreHqlPack {
         return result.toString();
     }
 
-
     /**
      * In 参数封装
      * @param columnName
@@ -87,13 +83,12 @@ public class CoreHqlPack {
         return result.toString();
     }
 
-
     /**
      * 部门复杂查询
      * @param department
      * @return
      */
-    public static String packHqlPosition(Department department) {
+    public static String packHqlDepartment(Department department) {
         StringBuffer result = new StringBuffer();
 
         // 部门名称
@@ -107,4 +102,66 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 岗位复杂查询
+     * @param position
+     * @return
+     */
+    public static String packHqlPosition(Position position){
+        StringBuffer result = new StringBuffer();
+
+        // 查询参数封装
+        HqlPack.getNumEqualPack(position.getParentId(),"parentId",result);
+        HqlPack.getStringLikerPack(position.getName(),"name",result);
+        HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 系统参数复杂查询
+     * @param sysConfig
+     * @return
+     */
+    public static String packHqlSysConfig(SysConfig sysConfig) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(sysConfig.getName(),"name",result);
+        HqlPack.getStringLikerPack(sysConfig.getConfigCode(),"configCode",result);
+        HqlPack.getNumEqualPack(sysConfig.getConfigTypeId(),"configTypeId",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 字典信息复杂查询
+     * @param sysDictionary
+     * @return
+     */
+    public static String packHqlSysDictionary(SysDictionary sysDictionary) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(sysDictionary.getName(),"name",result);
+        HqlPack.getStringLikerPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
+        HqlPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 硬件类型复杂查询
+     * @param toolType
+     * @return
+     */
+    public static String packHqlToolType(ToolType toolType) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(toolType.getName(),"name",result);
+
+        return result.toString();
+    }
 }