8、16、19国网接口-数据查询、上送接口

2023-12-14 16:24:10 +08:00
parent 5bb7adc5b6
commit c5e31075a5
29 changed files with 1355 additions and 95 deletions
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDataController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDataController.java
@@ -0,0 +1,60 @@
+package com.njcn.harmonic.controller.upload;
+
+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.common.utils.LogUtil;
+import com.njcn.harmonic.pojo.param.UploadParam;
+import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
+import com.njcn.harmonic.service.upload.IEvaluationDataService;
+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.*;
+
+/**
+ * 类的介绍：国网指标数据上送
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/12/7 9:05
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/upload")
+@Api(tags = "国网指标数据上送")
+@AllArgsConstructor
+public class EvaluationDataController extends BaseController {
+    private final IEvaluationDataService evaluationDataService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEvaluationData")
+    @ApiOperation("查询母线基准水平评估数据")
+    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
+    public HttpResult<Page<UploadEvaluationDataVo>> getEvaluationData(@RequestBody UploadParam param) {
+        String methodDescribe = getMethodDescribe("getEvaluationData");
+        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
+        Page<UploadEvaluationDataVo> list = evaluationDataService.getEvaluationData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/uploadEvaluationData")
+    @ApiOperation("国网上送-母线基准水平评估数据")
+    @ApiImplicitParam(name = "time", value = "时间", required = true)
+    public HttpResult<String> uploadEvaluationData(@RequestParam("time") String time) {
+        String methodDescribe = getMethodDescribe("uploadEvaluationData");
+        LogUtil.njcnDebug(log, "{}，时间：{}", methodDescribe, time);
+        String result = evaluationDataService.uploadEvaluationData(time);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+}
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PointStatisticalDataController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PointStatisticalDataController.java
@@ -1,12 +1,15 @@
 package com.njcn.harmonic.controller.upload;

+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.common.utils.LogUtil;
-import com.njcn.harmonic.service.upload.PointStatisticalDataService;
+import com.njcn.harmonic.pojo.param.UploadParam;
+import com.njcn.harmonic.pojo.vo.upload.UploadPointStatisticalDataVo;
+import com.njcn.harmonic.service.upload.IPointStatisticalDataService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,10 +17,7 @@ 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 org.springframework.web.bind.annotation.*;

 /**
 * 类的介绍：国网指标数据上送
@@ -34,18 +34,28 @@ import org.springframework.web.bind.annotation.RestController;
@AllArgsConstructor
 public class PointStatisticalDataController extends BaseController {

-    private final PointStatisticalDataService pointStatisticalDataService;
+    private final IPointStatisticalDataService pointStatisticalDataService;

    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/statisticalCreate")
-    @ApiOperation("主配网监测点统计数据(2.4.1.17)")
+    @PostMapping("/getPointStatisticalData")
+    @ApiOperation("查询主配网监测点统计数据")
    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-    public HttpResult<Object> statisticalCreate(@RequestBody Object param) {
-        String methodDescribe = getMethodDescribe("statisticalCreate");
+    public HttpResult<Page<UploadPointStatisticalDataVo>> getPointStatisticalData(@RequestBody UploadParam param) {
+        String methodDescribe = getMethodDescribe("getPointStatisticalData");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-        pointStatisticalDataService.getPointStatisticalData(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        Page<UploadPointStatisticalDataVo> list = pointStatisticalDataService.getPointStatisticalData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/uploadPointStatisticalData")
+    @ApiOperation("国网上送-主配网监测点统计数据")
+    @ApiImplicitParam(name = "time", value = "时间", required = true)
+    public HttpResult<String> uploadPointStatisticalData(@RequestParam("time") String time) {
+        String methodDescribe = getMethodDescribe("uploadPointStatisticalData");
+        LogUtil.njcnDebug(log, "{}，时间：{}", methodDescribe, time);
+        String result = pointStatisticalDataService.uploadPointStatisticalData(time);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }

 }
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/SubstationStatisticalDataController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/SubstationStatisticalDataController.java
@@ -0,0 +1,60 @@
+package com.njcn.harmonic.controller.upload;
+
+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.common.utils.LogUtil;
+import com.njcn.harmonic.pojo.param.UploadParam;
+import com.njcn.harmonic.pojo.vo.upload.UploadSubstationStatisticalDataVo;
+import com.njcn.harmonic.service.upload.ISubstationStatisticalDataService;
+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.*;
+
+/**
+ * 类的介绍：国网指标数据上送
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/12/7 9:05
+ */
+@Validated
+@Slf4j
+@RestController
+@RequestMapping("/upload")
+@Api(tags = "国网指标数据上送")
+@AllArgsConstructor
+public class SubstationStatisticalDataController extends BaseController {
+
+    private final ISubstationStatisticalDataService substationStatisticalDataService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getSubstationStatisticalData")
+    @ApiOperation("查询变电站监测统计数据")
+    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
+    public HttpResult<Page<UploadSubstationStatisticalDataVo>> getSubstationStatisticalData(@RequestBody UploadParam param) {
+        String methodDescribe = getMethodDescribe("getSubstationStatisticalData");
+        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
+        Page<UploadSubstationStatisticalDataVo> list = substationStatisticalDataService.getSubstationStatisticalData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/uploadSubstationStatisticalData")
+    @ApiOperation("国网上送-变电站监测统计数据")
+    @ApiImplicitParam(name = "time", value = "时间", required = true)
+    public HttpResult<String> uploadSubstationStatisticalData(@RequestParam("time") String time) {
+        String methodDescribe = getMethodDescribe("uploadSubstationStatisticalData");
+        LogUtil.njcnDebug(log, "{}，时间：{}", methodDescribe, time);
+        String result = substationStatisticalDataService.uploadSubstationStatisticalData(time);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+}