From 0246c1d4801e2e5c6901005707d98298a47ec349 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 18 Dec 2023 13:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upload/EvaluationDataController.java | 5 ++--- .../PointStatisticalDataController.java | 5 ++--- .../SubstationStatisticalDataController.java | 5 ++--- .../impl/PointStatisticalDataServiceImpl.java | 3 ++- .../impl/REvaluationDataServiceImpl.java | 20 +++++++++++++++++-- ...RSubstationStatisticalDataServiceImpl.java | 3 ++- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git 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 index e51b34470..58693432a 100644 --- 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 @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*; * @version 1.0.0 * @createTime 2023/12/7 9:05 */ -@Validated @Slf4j @RestController @RequestMapping("/upload") @@ -40,7 +39,7 @@ public class EvaluationDataController extends BaseController { @PostMapping("/getEvaluationData") @ApiOperation("查询母线基准水平评估数据") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult> getEvaluationData(@RequestBody UploadDataParam param) { + public HttpResult> getEvaluationData(@RequestBody @Validated UploadDataParam param) { String methodDescribe = getMethodDescribe("getEvaluationData"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); Page list = evaluationDataService.getEvaluationData(param); @@ -51,7 +50,7 @@ public class EvaluationDataController extends BaseController { @PostMapping("/uploadEvaluationData") @ApiOperation("国网上送-母线基准水平评估数据") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult uploadEvaluationData(@RequestBody UploadParam param) { + public HttpResult uploadEvaluationData(@RequestBody @Validated UploadParam param) { String methodDescribe = getMethodDescribe("uploadEvaluationData"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); String result = evaluationDataService.uploadEvaluationData(param); diff --git 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 index 4e2281c3b..fd6196091 100644 --- 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 @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*; * @version 1.0.0 * @createTime 2023/12/7 9:05 */ -@Validated @Slf4j @RestController @RequestMapping("/upload") @@ -41,7 +40,7 @@ public class PointStatisticalDataController extends BaseController { @PostMapping("/getPointStatisticalData") @ApiOperation("查询主配网监测点统计数据") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult> getPointStatisticalData(@RequestBody UploadDataParam param) { + public HttpResult> getPointStatisticalData(@RequestBody @Validated UploadDataParam param) { String methodDescribe = getMethodDescribe("getPointStatisticalData"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); Page list = pointStatisticalDataService.getPointStatisticalData(param); @@ -52,7 +51,7 @@ public class PointStatisticalDataController extends BaseController { @PostMapping("/uploadPointStatisticalData") @ApiOperation("国网上送-主配网监测点统计数据") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult uploadPointStatisticalData(@RequestBody UploadParam param) { + public HttpResult uploadPointStatisticalData(@RequestBody @Validated UploadParam param) { String methodDescribe = getMethodDescribe("uploadPointStatisticalData"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); String result = pointStatisticalDataService.uploadPointStatisticalData(param); diff --git 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 index e8083e73a..2fdc42abe 100644 --- 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 @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*; * @version 1.0.0 * @createTime 2023/12/7 9:05 */ -@Validated @Slf4j @RestController @RequestMapping("/upload") @@ -41,7 +40,7 @@ public class SubstationStatisticalDataController extends BaseController { @PostMapping("/getSubstationStatisticalData") @ApiOperation("查询变电站监测统计数据") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult> getSubstationStatisticalData(@RequestBody UploadDataParam param) { + public HttpResult> getSubstationStatisticalData(@RequestBody @Validated UploadDataParam param) { String methodDescribe = getMethodDescribe("getSubstationStatisticalData"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); Page list = substationStatisticalDataService.getSubstationStatisticalData(param); @@ -52,7 +51,7 @@ public class SubstationStatisticalDataController extends BaseController { @PostMapping("/uploadSubstationStatisticalData") @ApiOperation("国网上送-变电站监测统计数据") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult uploadSubstationStatisticalData(@RequestBody UploadParam param) { + public HttpResult uploadSubstationStatisticalData(@RequestBody @Validated UploadParam param) { String methodDescribe = getMethodDescribe("uploadSubstationStatisticalData"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); String result = substationStatisticalDataService.uploadSubstationStatisticalData(param); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java index 8ed1c53a5..b305f8d97 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java @@ -104,7 +104,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); switch (list.size()) { - //国、省 + //国 case 1: List l1 = deptFeignClient.getDirectSonSelf(dept.getId()).getData(); String orgId = l1.stream().filter(o->!Objects.equals(o.getId(),dept.getId())).findFirst().orElse(null).getCode(); @@ -112,6 +112,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper); List voList = BeanUtil.copyToList(page.getRecords(), UploadEvaluationDataVo.class); - + if (CollectionUtil.isNotEmpty(voList)){ + voList = voList.stream().peek(item->{ + if (!Objects.equals(item.getAvgValue(),3.1415926)){ + BigDecimal four = BigDecimal.valueOf(item.getAvgValue()); + double value = four.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); + item.setAvgValue(value); + } else if (!Objects.equals(item.getStandardDeviation(),3.1415926)){ + BigDecimal four = BigDecimal.valueOf(item.getStandardDeviation()); + double value = four.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); + item.setStandardDeviation(value); + } + BigDecimal four = BigDecimal.valueOf(item.getMonitorBusRate()); + double value = four.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); + item.setMonitorBusRate(value); + }).collect(Collectors.toList()); + } Page pageVo = new Page<>(); pageVo.setTotal(page.getTotal()); pageVo.setPages(page.getPages()); @@ -128,7 +143,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); switch (list.size()) { - //国、省 + //国 case 1: List l1 = deptFeignClient.getDirectSonSelf(dept.getId()).getData(); String orgId = l1.stream().filter(o->!Objects.equals(o.getId(),dept.getId())).findFirst().orElse(null).getCode(); @@ -136,6 +151,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); switch (list.size()) { - //国、省 + //国 case 1: List l1 = deptFeignClient.getDirectSonSelf(dept.getId()).getData(); String orgId = l1.stream().filter(o->!Objects.equals(o.getId(),dept.getId())).findFirst().orElse(null).getCode(); @@ -117,6 +117,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl