国网推送

2023-12-14 14:37:31 +08:00
parent 704c241ca6
commit 3761955e81
10 changed files with 265 additions and 25 deletions
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java
@@ -7,7 +7,7 @@ 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.SendParam;
+import com.njcn.harmonic.pojo.param.SendQueryParam;
 import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO;
 import com.njcn.harmonic.service.send.ConverterdetailstatisticsPOService;
 import com.njcn.web.controller.BaseController;
@@ -22,6 +22,8 @@ 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:河北国网上送接口
 *      * 2.4.1.17接收电能质量主配网监测点统计数据接口
@@ -33,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("/Converterdetail")
-@Api(tags = "电能质量主配网监测点统计数据")
+@Api(tags = "换流站指标统计明细数据")
@RequiredArgsConstructor
 public class ConverterdetailstatisticsController extends BaseController {

@@ -42,11 +44,21 @@ public class ConverterdetailstatisticsController extends BaseController {
    @PostMapping("/queryPage")
    @ApiOperation("数据查询")
    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-    public HttpResult<Page<ConverterdetailstatisticsPO>> queryPage(@Validated @RequestBody SendParam.SendPageParam param) {
+    public HttpResult<Page<ConverterdetailstatisticsPO>> queryPage(@Validated @RequestBody SendQueryParam.SendPageParam param) {
        String methodDescribe = getMethodDescribe("queryPage");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        Page<ConverterdetailstatisticsPO> list = converterdetailstatisticsPOService.queryPage(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }

+    @PostMapping("send")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("上报")
+    @ApiImplicitParam(name = "ids",value = "请求体",required = true)
+    public HttpResult<String> send(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("send");
+        String s = converterdetailstatisticsPOService.send(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+    }
+
 }
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java
@@ -7,7 +7,7 @@ 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.SendParam;
+import com.njcn.harmonic.pojo.param.SendQueryParam;
 import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO;
 import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService;
 import com.njcn.web.controller.BaseController;
@@ -22,6 +22,8 @@ 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:2.4.1.9	接收电能质量典型源荷指标统计数据接口
 * Date: 2023/12/13  14:52【需求编号】
@@ -33,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("/pqTypicalSourceCreate")
-@Api(tags = "能质量典型源荷指标统计数据")
+@Api(tags = "典型源荷指标统计数据")
@RequiredArgsConstructor
 public class PqTypicalSourceCreateController extends BaseController {
    private final PqTypicalSourceCreatePOService pqTypicalSourceCreatePOService;
@@ -42,10 +44,20 @@ public class PqTypicalSourceCreateController extends BaseController {
    @PostMapping("/queryPage")
    @ApiOperation("数据查询")
    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-    public HttpResult<Page<PqTypicalSourceCreatePO>> queryPage(@Validated @RequestBody SendParam.SendPageParam param) {
+    public HttpResult<Page<PqTypicalSourceCreatePO>> queryPage(@Validated @RequestBody SendQueryParam.SendPageParam param) {
        String methodDescribe = getMethodDescribe("queryPage");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        Page<PqTypicalSourceCreatePO> list = pqTypicalSourceCreatePOService.queryPage(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }
+
+    @PostMapping("send")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("上报")
+    @ApiImplicitParam(name = "ids",value = "请求体",required = true)
+    public HttpResult<String> send(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("send");
+        String s = pqTypicalSourceCreatePOService.send(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+    }
 }
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java
@@ -7,7 +7,7 @@ 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.SendParam;
+import com.njcn.harmonic.pojo.param.SendQueryParam;
 import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO;
 import com.njcn.harmonic.service.send.SubstationQualityStatisticsPOService;
 import com.njcn.web.controller.BaseController;
@@ -22,6 +22,8 @@ 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;
+
 /**
 *需求：
 *  * FWJK-PMS3.0-TC0013-电能质量管理两级贯通接口V1.10
@@ -35,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("/substationQuality")
-@Api(tags = "接收电能质量换流站指标统计明细数据")
+@Api(tags = "换流站指标统计明细数据")
@RequiredArgsConstructor
 public class SubstationQualityStatisticsController extends BaseController {

@@ -46,12 +48,21 @@ public class SubstationQualityStatisticsController extends BaseController {
    @PostMapping("/queryPage")
    @ApiOperation("数据查询")
    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-    public HttpResult<Page<SubstationQualityStatisticsPO>> queryPage(@Validated @RequestBody SendParam.SendPageParam param) {
+    public HttpResult<Page<SubstationQualityStatisticsPO>> queryPage(@Validated @RequestBody SendQueryParam.SendPageParam param) {
        String methodDescribe = getMethodDescribe("queryPage");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        Page<SubstationQualityStatisticsPO> list = substationQualityStatisticsPOService.queryPage(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
    }

+    @PostMapping("send")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("上报")
+    @ApiImplicitParam(name = "ids",value = "请求体",required = true)
+    public HttpResult<String> send(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("send");
+        String s = substationQualityStatisticsPOService.send(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+    }

 }