报表优化

国际化接口

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -62,6 +62,7 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="ORGANIZE_CODE")
     @ApiParam(value ="组织代码")
+    @AnnoOutputColumn(hidden = true)
     public String organizeCode;
 
     @Column(name="is_valid")
@@ -78,18 +79,22 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="create_user",updatable = false)
     @ApiParam(value = "创建用户")
+    @AnnoOutputColumn(hidden = true)
     public String createUser;
 
     @Column(name="create_date",updatable = false)
     @ApiParam(value = "创建日期")
+    @AnnoOutputColumn(hidden = true)
     public String createDatetime;
 
     @Column(name="modify_user")
     @ApiParam(value = "修改人")
+    @AnnoOutputColumn(hidden = true)
     public String modifyUser;
 
     @Column(name="modify_date")
     @ApiParam(value = "修改日期")
+    @AnnoOutputColumn(hidden = true)
     public String modifyDatetime;
 
     @Transient

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

@@ -194,7 +194,8 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_LOCALE_RESOURCE_TYPE {
         COMMON(1, "通用"),EXCEPTION(2, "异常"),
-        MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮");
+        MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"),
+        WEB(13, "前端");
 
         private int value;
         private String description;

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

@@ -365,7 +365,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public T getByProperty(String propertyName, Object value) {
         String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
         try {
-            return (T) entityManager.createQuery(queryString).setParameter(propertyName, value).getSingleResult();
+            List<T> list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList();
+            return list.size() != 0 ? list.get(0) : null;
         }catch(NoResultException ne){
             LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne);
             return null;
@@ -402,7 +403,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         try{
-            return (T) queryObject.getSingleResult();
+            List<T> list = queryObject.getResultList();
+            return list.size() != 0 ? list.get(0) : null;
         }catch(NoResultException ne){
             LOGGER.error("数据不存在",ne);
             return null;

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

@@ -11,23 +11,17 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
  **/
 public class TestInfo extends BaseBean {
 
-    /**
-     * 内存信息
-     */
-    private double ram;
 
     /**
-     * cpu信息
+     * 执行耗时
      */
-    private double cpu;
+    private long executeTime;
 
-    /**
-     * 线程id
-     */
-    private String threadId;
+    public TestInfo(){
 
-    /**
-     * 方法名
-     */
-    private String method;
+    }
+
+    public TestInfo(long executeTime){
+        this.executeTime = System.currentTimeMillis() - executeTime;
+    }
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -119,12 +119,12 @@ public class ReportHqlPack {
      * @param rowId
      * @return
      */
-    public static String packHqlBrLayoutColumnByRowIdSortBySeq(Long rowId){
+    public static String packHqlBrLayoutColumnByRowIdSort(Long rowId){
         StringBuffer result = new StringBuffer();
 
         // 查询参数封装
         HqlPack.getNumEqualPack(rowId,"layoutRowId",result);
-        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSort","modifyDatetime"},result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSort","modifyDatetime"},result);
 
         return result.toString();
     }
@@ -134,12 +134,12 @@ public class ReportHqlPack {
      * @param layoutId
      * @return
      */
-    public static String packHqlBrLayoutRowByLayoutIdSortBySeq(Long layoutId){
+    public static String packHqlBrLayoutRowByLayoutIdSort(Long layoutId){
         StringBuffer result = new StringBuffer();
 
         // 查询参数封装
         HqlPack.getNumEqualPack(layoutId,"layoutId",result);
-        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSort","modifyDatetime"},result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSort","modifyDatetime"},result);
 
         return result.toString();
     }