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

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;

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

@@ -386,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
@@ -417,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
@@ -539,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
@@ -602,7 +605,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @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
@@ -679,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/Organize.java

@@ -68,9 +68,9 @@ public class Organize extends BaseBean {
     @ApiParam(value ="排序" , example ="1")
     private Integer organizeSort;
  
-    @Column(name="ORGANIZE_STATUS")
+    @Column(name="ORGANIZE_STATUS_ID")
     @ApiParam(value ="组织状态（枚举：1.正常，2.禁用）" , example ="1")
-    private Integer organizeStatus;
+    private Integer organizeStatusId;
 
     @ApiParam(value ="子集列表")
     private transient List<Organize> childList;

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

@@ -69,7 +69,7 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量")
     private Integer redMenuNumber;
 
-    @Column(name="ROLE_STATUS")
+    @Column(name="ROLE_STATUS_ID")
     @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1")
     private Integer roleStatusId;
 

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

@@ -61,27 +61,27 @@ public class TaskTimeRecording extends BaseBean {
     }
  
     @Column(name="RED_TIME_EXPRESSION")
-    @ApiParam(value ="时间表达式" , access ="时间表达式")
+    @ApiParam(value ="时间表达式")
     private String redTimeExpression;
  
     @Column(name="TASK_START_DATE_TIME")
-    @ApiParam(value ="任务开始时间" , access ="任务开始时间")
+    @ApiParam(value ="任务开始时间")
     private String taskStartDateTime;
  
     @Column(name="TASK_END_DATE_TIME")
-    @ApiParam(value ="任务结束时间" , access ="任务结束时间")
+    @ApiParam(value ="任务结束时间")
     private String taskEndDateTime;
  
-    @Column(name="TASK_STATUS")
-    @ApiParam(value ="任务完成情况" , access ="任务完成情况")
-    private String taskStatus;
+    @Column(name="TASK_STATUS_ID")
+    @ApiParam(value ="任务完成情况(枚举：1正常，2失败)")
+    private Integer taskStatusId;
  
     @Column(name="TASK_LOG")
-    @ApiParam(value ="任务日志" , access ="任务日志")
+    @ApiParam(value ="任务日志")
     private String taskLog;
  
     @Column(name="TASK_LOG_ERROR")
-    @ApiParam(value ="任务异常日志" , access ="任务异常日志")
+    @ApiParam(value ="任务异常日志")
     private String taskLogError;
 
 }