代码调整

2022-11-07 09:11:09 +08:00
parent c53cd9b2dc
commit 0e5f9cc8df
51 changed files with 1469 additions and 851 deletions
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataExceptionController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataExceptionController.java
@@ -1,51 +0,0 @@
-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.harmonic.pojo.param.AlgorithmSearchParam;
-import com.njcn.harmonic.service.DataExceptionService;
-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;
-
-/**
- * @author qijian
- * @date 2022/10/26
- * 数据是否异常
- */
-@Validated
-@Slf4j
-@RestController
-@RequestMapping("/dataException")
-@Api(tags = "数据是否异常")
-@AllArgsConstructor
-public class DataExceptionController extends BaseController {
-
-    private final DataExceptionService dataExceptionService;
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/lineDataException")
-    @ApiOperation("监测点数据是否异常")
-    @ApiImplicitParam(name = "algorithmSearchParam", value = "算法通用查询参数", required = true)
-    public HttpResult<Boolean> lineDataException(@RequestBody @Validated AlgorithmSearchParam algorithmSearchParam) {
-        String methodDescribe = getMethodDescribe("lineDataException");
-        boolean res = dataExceptionService.lineDataException(algorithmSearchParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-        }
-
-    }
-}
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataIntegrityRateController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/DataIntegrityRateController.java
@@ -1,51 +0,0 @@
-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.harmonic.pojo.param.AlgorithmSearchParam;
-import com.njcn.harmonic.service.DataIntegrityRateService;
-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;
-
-/**
- * @author qijian
- * @date 2022/10/26
- * 数据完整率算法
- */
-@Validated
-@Slf4j
-@RestController
-@RequestMapping("/dataIntegrityRate")
-@Api(tags = "数据完整率算法")
-@AllArgsConstructor
-public class DataIntegrityRateController extends BaseController {
-
-    private final DataIntegrityRateService dataIntegrityRateService;
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/lineDataIntegrityRate")
-    @ApiOperation("监测点日数据完整率")
-    @ApiImplicitParam(name = "algorithmSearchParam", value = "算法通用查询参数", required = true)
-    public HttpResult<Boolean> lineDataIntegrityRate(@RequestBody @Validated AlgorithmSearchParam algorithmSearchParam) {
-        String methodDescribe = getMethodDescribe("lineDataIntegrityRate");
-        boolean res = dataIntegrityRateService.lineDataIntegrityRate(algorithmSearchParam);
-        if(res){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, 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
@@ -6,8 +6,13 @@ 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.device.pq.pojo.dto.PollutionLineDTO;
+import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
+import com.njcn.harmonic.pojo.param.HarmonicPublicParam;
 import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam;
 import com.njcn.harmonic.pojo.vo.PollutionSubstationVO;
+import com.njcn.harmonic.pojo.vo.PollutionVO;
+import com.njcn.harmonic.service.IPollutionService;
 import com.njcn.harmonic.service.PollutionSubstationService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -41,6 +46,9 @@ public class PollutionSubstationController extends BaseController {

    private final PollutionSubstationService pollutionSubstationService;

+    private final IPollutionService pollutionService;
+
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/getPollutionSubstationData")
    @ApiOperation("按变电站及指标类型展示污染")
@@ -52,5 +60,37 @@ public class PollutionSubstationController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult (CommonResponseEnum.SUCCESS, list, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deptSubstationRelations")
+    @ApiOperation("污区图-部门变电站关系")
+    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
+    public HttpResult<List<PollutionVO>> deptSubstationRelations(@RequestBody HarmonicPublicParam param) {
+        String methodDescribe = getMethodDescribe("deptSubstationRelations");
+        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
+        List<PollutionVO> list = pollutionSubstationService.getDeptSubstationRelations(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getSubstationInfoById")
+    @ApiOperation("污区图-根据部门获取变电站详情")
+    @ApiImplicitParam(name = "param", value = "部门参数", required = true)
+    public HttpResult<List<PollutionSubstationDTO>> getSubstationInfoById(@RequestBody HarmonicPublicParam param) {
+        String methodDescribe = getMethodDescribe("getSubstationInfoById");
+        LogUtil.njcnDebug(log, "{}，部门参数：{}", methodDescribe, param);
+        List<PollutionSubstationDTO> list = pollutionSubstationService.getSubstationInfoById(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLineInfoById")
+    @ApiOperation("污区图-根据变电站获取监测点详情")
+    @ApiImplicitParam(name = "param", value = "变电站参数", required = true)
+    public HttpResult<List<PollutionLineDTO>> getLineInfoById(@RequestBody HarmonicPublicParam param) {
+        String methodDescribe = getMethodDescribe("getLineInfoById");
+        LogUtil.njcnDebug(log, "{}，变电站参数：{}", methodDescribe, param);
+        List<PollutionLineDTO> list = pollutionSubstationService.getLineInfoById(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }

 }