app功能合并

cs-report/cs-report-api/src/main/java/com/njcn/csreport/pojo/po/CsAppReport.java

@@ -0,0 +1,61 @@
+package com.njcn.csreport.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xy
+ * @since 2026-03-19
+ */
+@Getter
+@Setter
+@TableName("cs_app_report")
+public class CsAppReport extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告id
+     */
+    private String id;
+
+    /**
+     * 监测点id
+     */
+    private String lineId;
+
+    /**
+     * 事件id集合，用,分割 (仅暂态报告有此数据)
+     */
+    private String eventList;
+
+    /**
+     * 报表起始时间
+     */
+    private LocalDate startTime;
+
+    /**
+     * 报表结束时间
+     */
+    private LocalDate endTime;
+
+    /**
+     * 报告(报表)类型 (0:稳态报表 1:暂态报告)
+     */
+    private Integer reportType;
+
+    /**
+     * 报表路径
+     */
+    private String filePath;
+
+}

cs-report/cs-report-api/src/main/java/com/njcn/csreport/pojo/po/CsAppReportRecord.java

@@ -0,0 +1,39 @@
+package com.njcn.csreport.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xy
+ * @since 2026-03-23
+ */
+@Getter
+@Setter
+@TableName("cs_app_report_record")
+public class CsAppReportRecord extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 暂态事件id集合
+     */
+    private String eventList;
+
+    /**
+     * 是否完成(0:未完成 1:已完成)
+     */
+    private Integer isComplete;
+}

cs-report/cs-report-api/src/main/java/com/njcn/csreport/pojo/vo/ReportEventVO.java

@@ -0,0 +1,47 @@
+package com.njcn.csreport.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author xy
+ */
+@Data
+public class ReportEventVO implements Serializable {
+
+    @ApiModelProperty("事件id")
+    private String eventId;
+
+    @ApiModelProperty("申请时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime time;
+
+    @ApiModelProperty("申请人")
+    private String applyUser;
+
+    @ApiModelProperty("报告事件数量")
+    private Integer eventNums;
+
+    @ApiModelProperty("是否完成 0:未完成 1:完成")
+    private Integer isComplete;
+
+    @ApiModelProperty("文件路径")
+    private String filePath;
+
+    @ApiModelProperty("工程名称")
+    private String engineeringName;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("设备名称")
+    private String deviceName;
+
+    @ApiModelProperty("监测点名称")
+    private String lineName;
+
+}

cs-report/cs-report-api/src/main/java/com/njcn/csreport/pojo/vo/ReportHarmonicVO.java

@@ -0,0 +1,29 @@
+package com.njcn.csreport.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class ReportHarmonicVO implements Serializable {
+
+    @ApiModelProperty(value = "监测点id")
+    private String lineId;
+
+    @ApiModelProperty(value = "监测点名称")
+    private String lineName;
+
+    @ApiModelProperty(value = "起始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "越限描述")
+    private String overLimitDesc;
+
+}