合并代码

2022-10-18 11:17:20 +08:00
parent 1efdfa5cd6
commit 7b790e6dc2
93 changed files with 5045 additions and 555 deletions
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java
@@ -3,11 +3,13 @@ package com.njcn.harmonic.controller;
 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.param.HistoryParam;
 import com.njcn.harmonic.pojo.param.NormHistoryParam;
 import com.njcn.harmonic.pojo.vo.HistoryDataResultVO;
+import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO;
 import com.njcn.harmonic.service.HistoryResultService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -16,9 +18,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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.Date;
 import java.util.List;

 /**
@@ -55,4 +59,15 @@ public class HistoryResultController extends BaseController {
        List<HistoryDataResultVO> list = historyResultService.getHistoryLineData(normHistoryParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getHarmonicProportion")
+    @ApiOperation("获取谐波越限监测点占比")
+    @ApiImplicitParam(name = "statisticsBizBaseParam", value = "谐波越限监测点参数", required = true)
+    public HttpResult<List<StatHarmonicOrgVO>> getHistoryLineData(@RequestBody @Validated StatisticsBizBaseParam statisticsBizBaseParam) {
+        String methodDescribe = getMethodDescribe("getHarmonicProportion");
+        List<StatHarmonicOrgVO> list = historyResultService.getHarmonicProportion(statisticsBizBaseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+
+    }
 }
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/NormLimitController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/NormLimitController.java
@@ -43,7 +43,17 @@ public class NormLimitController extends BaseController {
    @ApiImplicitParam(name = "historyHarmOverLimitParam", value = "异常数据统计参数", required = true)
    public HttpResult<List<HistoryHarmOverLimitVO>> getHistoryTableData(@RequestBody @Validated HistoryHarmOverLimitParam historyHarmOverLimitParam) {
        String methodDescribe = getMethodDescribe("getHistoryTableData");
-        List<HistoryHarmOverLimitVO> list = normLimitService.getHistoryTableData(historyHarmOverLimitParam);
+        List<HistoryHarmOverLimitVO> list = normLimitService.getHistoryData(historyHarmOverLimitParam,0);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getHistoryData")
+    @ApiOperation("告警数据统计")
+    @ApiImplicitParam(name = "historyHarmOverLimitParam", value = "异常数据统计参数", required = true)
+    public HttpResult<List<HistoryHarmOverLimitVO>> getHistoryData(@RequestBody @Validated HistoryHarmOverLimitParam historyHarmOverLimitParam) {
+        String methodDescribe = getMethodDescribe("getHistoryTableData");
+        List<HistoryHarmOverLimitVO> list = normLimitService.getHistoryData(historyHarmOverLimitParam,1);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }
 }
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java
@@ -0,0 +1,56 @@
+package com.njcn.harmonic.controller;
+
+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.common.utils.LogUtil;
+import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam;
+import com.njcn.harmonic.pojo.vo.PollutionSubstationVO;
+import com.njcn.harmonic.service.PollutionSubstationService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/13  9:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/PollutionSubstation")
+@Api(tags = "变电站污染统计")
+@AllArgsConstructor
+public class PollutionSubstationController extends BaseController {
+
+    private final PollutionSubstationService pollutionSubstationService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPollutionSubstationData")
+    @ApiOperation("按变电站及指标类型展示污染")
+    @ApiImplicitParam(name = "pollutionSubstationQuryParam", value = "污染指标查询参数", required = true)
+    public HttpResult<List<PollutionSubstationVO>> getPollutionSubstationData(@RequestBody @Validated PollutionSubstationQuryParam pollutionSubstationQuryParam) {
+        String methodDescribe = getMethodDescribe ("getPollutionSubstationData");
+        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, pollutionSubstationQuryParam);
+        List<PollutionSubstationVO> list = pollutionSubstationService.getPollutionSubstationData (pollutionSubstationQuryParam);
+        return HttpResultUtil.assembleCommonResponseResult (CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+}
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java
@@ -3,9 +3,11 @@ package com.njcn.harmonic.controller;
 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.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.harmonic.pojo.vo.RMpVThdVO;
 import com.njcn.harmonic.pojo.vo.THDistortionCensusVO;
 import com.njcn.harmonic.pojo.vo.THDistortionVO;
 import com.njcn.harmonic.service.THDistortionService;
@@ -58,5 +60,15 @@ public class THDController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, censusVO, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getTHDTopTenData")
+    @ApiOperation("谐波总畸变率前十列表")
+    @ApiImplicitParam(name = "statisticsBizBaseParam", value = "业务参数", required = true)
+    public HttpResult<List<RMpVThdVO>> getTHDTopTenData(@RequestBody @Validated StatisticsBizBaseParam statisticsBizBaseParam){
+        String methodDescribe = getMethodDescribe("getTHDTopTenData");
+        List<RMpVThdVO> list = thDistortionService.getTHDTopTenData(statisticsBizBaseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+

 }