Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

自定义报表代码提交

Browse Source
This commit is contained in:
hongawen
2022-10-21 09:05:55 +08:00
parent c0ebd4958e
commit b55d988c7e
14 changed files with 446 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,6 @@ package com.njcn.harmonic.pojo.dto;
import lombok.Data;
import java.math.BigDecimal;
/**
* pqs
*
@@ -13,17 +11,13 @@ import java.math.BigDecimal;
@Data
public class ReportTemplateDTO {
/**
* $HA#B#max$
* $HA[_25]#B#max#classId$
*/
private String itemName;
/**
* 对应mysql数据库中字段 HA
*/
private String name;
/**
* 对应influxdb数据库中字段 HA_25
* 对应influxdb数据库中字段
*/
private String templateName;
@@ -37,6 +31,14 @@ public class ReportTemplateDTO {
*/
private String statMethod;
/**
* 对应influxdb数据库的表名
*/
private String classId;
/**
* 填入的value值
*/
private String value;
}

13
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/ReportTemplateParam.java
View File

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.List;
/**
* pqs
@@ -18,25 +19,25 @@ import javax.validation.constraints.Pattern;
@Data
public class ReportTemplateParam {
@ApiModelProperty(name = "name",value = "模板名称",required = true)
@NotBlank(message = "模板名称不可为空")
private String name;
@ApiModelProperty(name = "docContent",value = "json内容",required = true)
@ApiModelProperty(name = "content",value = "json内容",required = true)
@NotBlank(message = "模板内容不可为空")
private String docContent;
private String content;
@ApiModelProperty(name = "deptId",value = "部门id")
private String deptId;
private List<String> deptId;
@ApiModelProperty(name = "valueTitle",value = "存取库中")
private String valueTitle;
@ApiModelProperty(name = "reportType",value = "自定义报表类型",required = true)
@NotBlank(message = "自定义报表类型不可为空")
private String reportType;
@Data
@EqualsAndHashCode(callSuper = true)
public static class UpdateReportTemplateParam extends ReportTemplateParam {

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/EleEpdPqd.java
View File

@@ -22,10 +22,10 @@ public class EleEpdPqd implements Serializable {
private String name;
private String showName;
private String otherName;
private String showName;
private Integer sort;
private String type;
@@ -41,4 +41,6 @@ public class EleEpdPqd implements Serializable {
private String classId;
private String statMethod;
private String systemType;
}

35
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ReportTemplate.java
View File

@@ -1,35 +0,0 @@
package com.njcn.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.mysql.cj.xdevapi.JsonArray;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* pqs
* 自定义报表
* @author cdf
* @date 2022/8/16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName(value = "sys_report_template")
public class ReportTemplate extends BaseEntity {
private String id;
private String name;
private String docContent;
private String deptId;
private String reportType;
private Integer active;
private Integer state;
}

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ReportTemplateVO.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,13 +17,14 @@ public class ReportTemplateVO extends BaseEntity {
private String name;
private String docContent;
private String content;
private String deptId;
private Integer active;
private Integer activation;
private Integer state;
private String deptName;
}