有功功率趋势区间excel导出

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/constant/Param.java

@@ -69,4 +69,6 @@ public interface Param {
 
     //DecimalFormat格式化
     String DECIMAL_FORMATSTR = "#0.0000";
+
+    String DECIMAL_FORMATTWOSTR = "#.##";
 }

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

@@ -0,0 +1,47 @@
+package com.njcn.harmonic.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 有功功率趋势区间Excel 实体类
+ * @author guofeihu
+ * @since 2024-08-20
+ */
+@Data
+public class PowerStatisticsExcelRangVO {
+
+    @Excel(name = "详情        区间")
+    private String text;
+
+    @Excel(name = "0%~10%")
+    private String minsNum0;
+
+    @Excel(name = "10%~20%")
+    private String minsNum1;
+
+    @Excel(name = "20%~30%")
+    private String minsNum2;
+
+    @Excel(name = "30%~40%")
+    private String minsNum3;
+
+    @Excel(name = "40%~50%")
+    private String minsNum4;
+
+    @Excel(name = "50%~60%")
+    private String minsNum5;
+
+    @Excel(name = "60%~70%")
+    private String minsNum6;
+
+    @Excel(name = "70%~80%")
+    private String minsNum7;
+
+    @Excel(name = "80%~90%")
+    private String minsNum8;
+
+    @Excel(name = "90%~100%")
+    private String minsNum9;
+
+}

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

@@ -30,6 +30,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("0%~10%区间是否越限")
     private Integer isOrNot0;
 
+    @ApiModelProperty("0%~10%百分比")
+    private Double proportion0 = 0.0;
+
     @ApiModelProperty("10%~20%区间时间Json")
     private String minsTime1;
 
@@ -39,6 +42,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("10%~20%区间是否越限")
     private Integer isOrNot1;
 
+    @ApiModelProperty("10%~20%百分比")
+    private Double proportion1 = 0.0;;
+
     @ApiModelProperty("20%~30%区间时间Json")
     private String minsTime2;
 
@@ -48,6 +54,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("20%~30%区间是否越限")
     private Integer isOrNot2;
 
+    @ApiModelProperty("20%~30%百分比")
+    private Double proportion2 = 0.0;;
+
     @ApiModelProperty("30%~40%区间时间Json")
     private String minsTime3;
 
@@ -57,6 +66,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("30%~40%区间是否越限")
     private Integer isOrNot3;
 
+    @ApiModelProperty("30%~40%百分比")
+    private Double proportion3 = 0.0;;
+
     @ApiModelProperty("40%~50%区间时间Json")
     private String minsTime4;
 
@@ -66,6 +78,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("40%~50%区间是否越限")
     private Integer isOrNot4;
 
+    @ApiModelProperty("40%~50%百分比")
+    private Double proportion4 = 0.0;;
+
     @ApiModelProperty("50%~60%区间时间Json")
     private String minsTime5;
 
@@ -75,6 +90,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("50%~60%区间是否越限")
     private Integer isOrNot5;
 
+    @ApiModelProperty("50%~60%百分比")
+    private Double proportion5 = 0.0;;
+
     @ApiModelProperty("60%~70%区间时间Json")
     private String minsTime6;
 
@@ -84,6 +102,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("60%~70%区间是否越限")
     private Integer isOrNot6;
 
+    @ApiModelProperty("60%~70%百分比")
+    private Double proportion6 = 0.0;;
+
     @ApiModelProperty("70%~80%区间时间Json")
     private String minsTime7;
 
@@ -93,6 +114,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("70%~80%区间是否越限")
     private Integer isOrNot7;
 
+    @ApiModelProperty("70%~80%百分比")
+    private Double proportion7 = 0.0;;
+
     @ApiModelProperty("80%~90%区间时间Json")
     private String minsTime8;
 
@@ -102,6 +126,9 @@ public class PowerStatisticsVO {
     @ApiModelProperty("80%~90%区间是否越限")
     private Integer isOrNot8;
 
+    @ApiModelProperty("80%~90%百分比")
+    private Double proportion8 = 0.0;;
+
     @ApiModelProperty("90%~100%区间时间Json")
     private String minsTime9;
 
@@ -111,4 +138,7 @@ public class PowerStatisticsVO {
     @ApiModelProperty("90%~100%区间是否越限")
     private Integer isOrNot9;
 
+    @ApiModelProperty("90%~100%百分比")
+    private Double proportion9 = 0.0;;
+
 }

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

@@ -11,6 +11,7 @@ import lombok.Data;
 public class ThdDataVO {
 
     private String anotherName;
+    private String unit;
     private Double AVGPhaseA;
     private Double AVGPhaseB;
     private Double AVGPhaseC;