代码提交

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

@@ -0,0 +1,129 @@
+package com.njcn.harmonic.pojo.dto;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/11/29 9:36
+ */
+@Data
+public class LineDataDto {
+
+    private LocalDate time;
+
+    private String lineId;
+
+    private Double rms;
+
+    private Double vUnbalance;
+
+    private Double pst;
+
+    private Double vThd;
+
+    private Double v1;
+
+    private Double v2;
+
+    private Double v3;
+
+    private Double v4;
+
+    private Double v5;
+
+    private Double v6;
+
+    private Double v7;
+
+    private Double v8;
+
+    private Double v9;
+
+    private Double v10;
+
+    private Double v11;
+
+    private Double v12;
+
+    private Double v13;
+
+    private Double v14;
+
+    private Double v15;
+
+    private Double v16;
+
+    private Double v17;
+
+    private Double v18;
+
+    private Double v19;
+
+    private Double v20;
+
+    private Double v21;
+
+    private Double v22;
+
+    private Double v23;
+
+    private Double v24;
+
+    private Double v25;
+
+    private Double v26;
+
+    private Double v27;
+
+    private Double v28;
+
+    private Double v29;
+
+    private Double v30;
+
+    private Double v31;
+
+    private Double v32;
+
+    private Double v33;
+
+    private Double v34;
+
+    private Double v35;
+
+    private Double v36;
+
+    private Double v37;
+
+    private Double v38;
+
+    private Double v39;
+
+    private Double v40;
+
+    private Double v41;
+
+    private Double v42;
+
+    private Double v43;
+
+    private Double v44;
+
+    private Double v45;
+
+    private Double v46;
+
+    private Double v47;
+
+    private Double v48;
+
+    private Double v49;
+
+    private Double v50;
+
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalD.java

@@ -57,8 +57,6 @@ public class RDimBusGlobalD {
     private Float stationLimitAvgRate;
 
 
-    private Integer state;
-
 
 
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalM.java

@@ -20,7 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("r_dim_bus_global_m")
-public class RDimBusGlobalM extends BaseEntity {
+public class RDimBusGlobalM{
 
     private static final long serialVersionUID = 1L;
 
@@ -37,9 +37,6 @@ public class RDimBusGlobalM extends BaseEntity {
 
     private Float stationLimitAvgRate;
 
-    private Integer state;
-
-
 
 
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalD.java

@@ -19,7 +19,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_global_d")
-public class RDimObjGlobalD extends BaseEntity {
+public class RDimObjGlobalD {
 
     private static final long serialVersionUID = 1L;
     @MppMultiId(value = "Org_Id")

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalM.java

@@ -20,7 +20,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_global_m")
-public class RDimObjGlobalM extends BaseEntity {
+public class RDimObjGlobalM {
 
     private static final long serialVersionUID = 1L;
 
@@ -35,11 +35,6 @@ public class RDimObjGlobalM extends BaseEntity {
     @MppMultiId(value = "Object_Type")
     private String objectType;
 
-//
-//    /**
-//     * **源荷对象监测率（%）
-//     */
-//    private Double monitorRate;
 
     /**
      * **源荷对象超标占比（%）

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalY.java

@@ -20,7 +20,7 @@ import java.time.LocalDate;
 @Getter
 @Setter
 @TableName("r_dim_obj_global_y")
-public class RDimObjGlobalY extends BaseEntity {
+public class RDimObjGlobalY {
 
     private static final long serialVersionUID = 1L;
 
@@ -35,12 +35,6 @@ public class RDimObjGlobalY extends BaseEntity {
     @MppMultiId(value = "Object_Type")
     private String objectType;
 
-//
-//    /**
-//     * **源荷对象监测率（%）
-//     */
-//    private Double monitorRate;
-
     /**
      * **源荷对象超标占比（%）
      */

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

@@ -1,5 +1,6 @@
 package com.njcn.harmonic.pojo.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -13,11 +14,18 @@ import java.math.BigDecimal;
 @Data
 public class DimGlobalDataVO {
 
+    @ApiModelProperty(name = "orgId",value = "单位code")
     private String orgId;
 
+    @ApiModelProperty(name = "orgName",value = "单位名称")
     private String orgName;
 
+    @ApiModelProperty(name = "type",value = "一类大类型，电压等级/源荷")
     private String type;
 
+    @ApiModelProperty(name = "secondType",value = "二类类型，稳态指标/暂态指标/")
+    private String secondType;
+
+    @ApiModelProperty(name = "value",value = "单位code")
     private BigDecimal value;
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dim/DimGlobalDealController.java

@@ -47,9 +47,9 @@ public class DimGlobalDealController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("pms电能质量指标综合")
     @ApiImplicitParam(name = "dimGlobalDataParam", value = "条件参数", required = true)
-    public HttpResult<Page<DimGlobalDataVO>> dealGlobalData(@RequestBody @Validated DimGlobalDataParam dimGlobalDataParam){
+    public HttpResult<List<DimGlobalDataVO>> dealGlobalData(@RequestBody @Validated DimGlobalDataParam dimGlobalDataParam){
         String methodDescribe = getMethodDescribe("dealGlobalData");
-        Page<DimGlobalDataVO> result = dimGlobalDealService.dealGlobalData(dimGlobalDataParam);
+        List<DimGlobalDataVO> result = dimGlobalDealService.dealGlobalData(dimGlobalDataParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageDMapper.java

@@ -0,0 +1,23 @@
+package com.njcn.harmonic.mapper.dim;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.harmonic.pojo.dto.LineDataDto;
+import com.njcn.harmonic.pojo.po.dim.RDimVoltageD;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 母线不同电压等级指标数据-日表 Mapper 接口
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-11-27
+ */
+public interface RDimVoltageDMapper extends MppBaseMapper<RDimVoltageD> {
+
+    List<LineDataDto> getLineData(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("collection") Set<String> list);
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageMMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper.dim;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.harmonic.pojo.po.dim.RDimVoltageM;
+
+/**
+ * <p>
+ * 区域母线**电压等级**指标标准差、平均值-月表 Mapper 接口
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-11-29
+ */
+public interface RDimVoltageMMapper extends MppBaseMapper<RDimVoltageM> {
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageYMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.harmonic.mapper.dim;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.harmonic.pojo.po.dim.RDimVoltageY;
+
+/**
+ * <p>
+ * 区域母线**电压等级**指标标准差、平均值-年表 Mapper 接口
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-11-29
+ */
+public interface RDimVoltageYMapper extends MppBaseMapper<RDimVoltageY> {
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/DimGlobalDealService.java

@@ -20,5 +20,5 @@ public interface DimGlobalDealService {
      * @author cdf
      * @date 2023/11/27
      */
-    public Page<DimGlobalDataVO> dealGlobalData(DimGlobalDataParam dimGlobalDataParam);
+    List<DimGlobalDataVO> dealGlobalData(DimGlobalDataParam dimGlobalDataParam);
 }