合并代码

2022-12-07 10:52:13 +08:00
parent cdf75aaea1
commit 60c2779fe0
156 changed files with 6242 additions and 644 deletions
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java
@@ -219,9 +219,9 @@ public class CustomReportController extends BaseController {
    @PostMapping("/getCustomReport")
    @ApiOperation("获取报表")
    @ApiImplicitParam(name = "reportSearchParam", value = "查询体", required = false)
-    public HttpResult<String> getCustomReport(@RequestBody ReportSearchParam reportSearchParam){
+    public HttpResult<List<String>> getCustomReport(@RequestBody ReportSearchParam reportSearchParam){
        String methodDescribe = getMethodDescribe("getCustomReport");
-        String res = customReportService.getCustomReport(reportSearchParam);
+        List<String> res = customReportService.getCustomReport(reportSearchParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
    }

--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/DistributedPvOverviewController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/DistributedPvOverviewController.java
@@ -0,0 +1,92 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.vo.RStatOrgPvVO;
+import com.njcn.harmonic.service.specialanalysis.DistributedPvOverviewService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 专项分析-分布式光伏-分布式光伏总览
+ *
+ * @author yzh
+ * @date 2022/11/24
+ */
+
+@RestController
+@RequestMapping("/distributedPvOverview")
+@Slf4j
+@Api(tags = "专项分析-分布式光伏")
+@RequiredArgsConstructor
+public class DistributedPvOverviewController extends BaseController {
+
+    private final DistributedPvOverviewService distributedPvOverviewService;
+
+    /**
+     * 按区域获取分布式光伏总览
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO>>
+     * @author yzh
+     * @date 2022/11/24
+     */
+    @PostMapping("/getDistributedPvOverviewArea")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("按区域获取分布式光伏总览")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<RStatOrgPvVO> getDistributedPvOverviewArea(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getDistributedPvOverviewArea");
+        RStatOrgPvVO list = distributedPvOverviewService.getDistributedPvOverviewArea(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 按电压等级获取分布式光伏总览
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO>>
+     * @author yzh
+     * @date 2022/11/24
+     */
+    @PostMapping("/getDistributedPvOverviewVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("按电压等级获取分布式光伏总览")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<RStatOrgPvVO> getDistributedPvOverviewVoltage(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getDistributedPvOverviewVoltage");
+        RStatOrgPvVO list = distributedPvOverviewService.getDistributedPvOverviewVoltage(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 按监测点类型获取分布式光伏总览
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO>>
+     * @author yzh
+     * @date 2022/11/24
+     */
+    @PostMapping("/getDistributedPvOverviewLineSort")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("按监测点类型获取分布式光伏总览")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<RStatOrgPvVO> getDistributedPvOverviewLineSort(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getDistributedPvOverviewLineSort");
+        RStatOrgPvVO list = distributedPvOverviewService.getDistributedPvOverviewLineSort(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/DistributedPvVolOverController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/DistributedPvVolOverController.java
@@ -0,0 +1,56 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO;
+import com.njcn.harmonic.service.specialanalysis.DistributedPvVolOverService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 专项分析-分布式光伏-电压越限分析
+ *
+ * @author yzh
+ * @date 2022/11/15
+ */
+@RestController
+@RequestMapping("/distributedPvVolOver")
+@Slf4j
+@Api(tags = "专项分析-分布式光伏")
+@RequiredArgsConstructor
+public class DistributedPvVolOverController extends BaseController {
+
+    private final DistributedPvVolOverService distributedPvVolOverService;
+
+    /**
+     * 获取电压越限分析
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < ?>>
+     * @author yzh
+     * @date 2022/11/22
+     */
+    @PostMapping("/getVoltageOutOfLimitAnalysis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取分布式光伏电压越限分析")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RMpPvPowerDetailVO>> getVoltageOutOfLimitAnalysis(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getVoltageOutOfLimitAnalysis");
+        List<RMpPvPowerDetailVO> list = distributedPvVolOverService.getVoltageOutOfLimitAnalysis(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java
@@ -0,0 +1,69 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.PowerQualityParam;
+import com.njcn.harmonic.pojo.vo.RStatOrgPvDetailVO;
+import com.njcn.harmonic.pojo.vo.RStatOrgPvPowerStreamVO;
+import com.njcn.harmonic.service.specialanalysis.RStatOrgPvPowerQualityService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <专项分析-分布式光伏>
+ *
+ * @author wr
+ * @createTime: 2022-11-25
+ */
+@RestController
+@RequestMapping("/distributedPvVolOver")
+@Api(tags = "专项分析-分布式光伏")
+@RequiredArgsConstructor
+public class RStatOrgPvPowerQualityController extends BaseController {
+
+    private final RStatOrgPvPowerQualityService rStatOrgPvPowerQualityService;
+
+
+    /**
+     * 低功率因数统计
+     * @param param
+     * @return
+     */
+    @PostMapping("/getPowerQualityStream")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("低功率因数统计")
+    @ApiImplicitParam(name = "param", value = "分页查询参数", required = true)
+    public HttpResult<Page<RStatOrgPvPowerStreamVO>> getPowerQualityStream(@RequestBody PowerQualityParam param) {
+        String methodDescribe = getMethodDescribe("getPowerQualityStream");
+        Page<RStatOrgPvPowerStreamVO> powerQualityStream = rStatOrgPvPowerQualityService.getPowerQualityStream(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerQualityStream, methodDescribe);
+    }
+
+    /**
+     * 详细数据表分页查询
+     * @param param
+     * @return
+     */
+    @PostMapping("/getPowerQualityInfo")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("详细数据表分页查询")
+    @ApiImplicitParam(name = "param", value = "分页查询参数", required = true)
+    public HttpResult<Page<RStatOrgPvDetailVO>> getPowerQualityInfo(@RequestBody PowerQualityParam.PowerQualityDetailInfoParam param) {
+        String methodDescribe = getMethodDescribe("getPowerQualityInfo");
+        Page<RStatOrgPvDetailVO> powerQualityInfo = rStatOrgPvPowerQualityService.getPowerQualityInfo(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerQualityInfo, methodDescribe);
+    }
+
+}
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java
@@ -0,0 +1,26 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 专项分析-风电站-详细数据
+ * </p>
+ *
+ * @author wr
+ * @since 2022-11-30
+ */
+@RestController
+@Api(tags = "专项分析-风电场")
+@RequiredArgsConstructor
+@RequestMapping("/windFarm")
+public class WindFarmController extends BaseController {
+
+}
+