代码提交

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);
 }