自定义报表初步处理

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ReportTemplateDTO.java

@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public class ReportTemplateDTO {
     /**
-     * $HA[_25]#B#max#classId$
+     * $HA[_25]#B#max#classId#resourceId$
      */
     private String itemName;
 
@@ -21,6 +21,11 @@ public class ReportTemplateDTO {
      */
     private String templateName;
 
+    /**
+     * 对应限值字段
+     */
+    private String limitName;
+
     /**
      * 相别
      */
@@ -36,6 +41,13 @@ public class ReportTemplateDTO {
      */
     private String classId;
 
+    /**
+     * 对应mysql数据库的表名
+     */
+    private String resourceId;
+
+    private Integer overLimitFlag;
+
     /**
      * 填入的value值
      */

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/ReportSearchParam.java

@@ -33,4 +33,6 @@ public class ReportSearchParam {
     @ApiModelProperty(name = "deptId",value = "部门ID")
     private String deptId;
 
+    private Integer resourceType = 1;
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataFlickerDPO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
+import org.influxdb.annotation.Measurement;
 
 import java.io.Serializable;
 import java.util.Date;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ReportTreeVO.java

@@ -1,5 +1,6 @@
 package com.njcn.harmonic.pojo.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -12,12 +13,17 @@ import java.util.List;
  */
 @Data
 public class ReportTreeVO {
+
+    @ApiModelProperty(name = "id",value = "模板索引")
     private String id;
 
+    @ApiModelProperty(name = "name",value = "模板字段名")
     private String name;
 
+    @ApiModelProperty(name = "showName",value = "模板中文展示名")
     private String showName;
 
+    @ApiModelProperty(name = "flag",value = "用于标识最底层对象 1.表示已经没有子级")
     private Integer flag;
 
     private List<ReportTreeVO> children;