代码调整

2023-12-18 13:53:03 +08:00
parent 6bb42dac63
commit 0246c1d480
6 changed files with 28 additions and 13 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
@@ -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<Page<UploadEvaluationDataVo>> getEvaluationData(@RequestBody UploadDataParam param) {
+    public HttpResult<Page<UploadEvaluationDataVo>> getEvaluationData(@RequestBody @Validated UploadDataParam param) {
        String methodDescribe = getMethodDescribe("getEvaluationData");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        Page<UploadEvaluationDataVo> list = evaluationDataService.getEvaluationData(param);
@@ -51,7 +50,7 @@ public class EvaluationDataController extends BaseController {
    @PostMapping("/uploadEvaluationData")
    @ApiOperation("国网上送-母线基准水平评估数据")
    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-    public HttpResult<String> uploadEvaluationData(@RequestBody UploadParam param) {
+    public HttpResult<String> uploadEvaluationData(@RequestBody @Validated UploadParam param) {
        String methodDescribe = getMethodDescribe("uploadEvaluationData");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        String result = evaluationDataService.uploadEvaluationData(param);
--- 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<Page<UploadPointStatisticalDataVo>> getPointStatisticalData(@RequestBody UploadDataParam param) {
+    public HttpResult<Page<UploadPointStatisticalDataVo>> getPointStatisticalData(@RequestBody @Validated UploadDataParam param) {
        String methodDescribe = getMethodDescribe("getPointStatisticalData");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        Page<UploadPointStatisticalDataVo> list = pointStatisticalDataService.getPointStatisticalData(param);
@@ -52,7 +51,7 @@ public class PointStatisticalDataController extends BaseController {
    @PostMapping("/uploadPointStatisticalData")
    @ApiOperation("国网上送-主配网监测点统计数据")
    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-    public HttpResult<String> uploadPointStatisticalData(@RequestBody UploadParam param) {
+    public HttpResult<String> uploadPointStatisticalData(@RequestBody @Validated UploadParam param) {
        String methodDescribe = getMethodDescribe("uploadPointStatisticalData");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        String result = pointStatisticalDataService.uploadPointStatisticalData(param);
--- 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<Page<UploadSubstationStatisticalDataVo>> getSubstationStatisticalData(@RequestBody UploadDataParam param) {
+    public HttpResult<Page<UploadSubstationStatisticalDataVo>> getSubstationStatisticalData(@RequestBody @Validated UploadDataParam param) {
        String methodDescribe = getMethodDescribe("getSubstationStatisticalData");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        Page<UploadSubstationStatisticalDataVo> list = substationStatisticalDataService.getSubstationStatisticalData(param);
@@ -52,7 +51,7 @@ public class SubstationStatisticalDataController extends BaseController {
    @PostMapping("/uploadSubstationStatisticalData")
    @ApiOperation("国网上送-变电站监测统计数据")
    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-    public HttpResult<String> uploadSubstationStatisticalData(@RequestBody UploadParam param) {
+    public HttpResult<String> uploadSubstationStatisticalData(@RequestBody @Validated UploadParam param) {
        String methodDescribe = getMethodDescribe("uploadSubstationStatisticalData");
        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
        String result = substationStatisticalDataService.uploadSubstationStatisticalData(param);
--- 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<RUploadPointSta
        LambdaQueryWrapper<RUploadPointStatisticalDataD> lambdaQueryWrapper = new LambdaQueryWrapper<>();

        switch (list.size()) {
-            //国、省
+            //国
            case 1:
                List<Dept> 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<RUploadPointSta
                        .between(RUploadPointStatisticalDataD::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime())
                        .eq(!Objects.isNull(param.getSearchState()),RUploadPointStatisticalDataD::getUploadStatus,param.getSearchState());
                break;
+            //省
            case 2:
                lambdaQueryWrapper.eq(RUploadPointStatisticalDataD::getProvinceId,param.getOrgId())
                        .between(RUploadPointStatisticalDataD::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime())
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
@@ -56,7 +56,22 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
        lambdaQueryWrapper.orderByDesc(RUploadEvaluationDataD::getProvinceName);
        Page<RUploadEvaluationDataD> page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper);
        List<UploadEvaluationDataVo> 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<UploadEvaluationDataVo> pageVo = new Page<>();
        pageVo.setTotal(page.getTotal());
        pageVo.setPages(page.getPages());
@@ -128,7 +143,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
        LambdaQueryWrapper<RUploadEvaluationDataD> lambdaQueryWrapper = new LambdaQueryWrapper<>();

        switch (list.size()) {
-            //国、省
+            //国
            case 1:
                List<Dept> 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<RUploadEvaluationDat
                        .between(RUploadEvaluationDataD::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime())
                        .eq(!Objects.isNull(param.getSearchState()),RUploadEvaluationDataD::getUploadStatus,param.getSearchState());
                break;
+            //省
            case 2:
                lambdaQueryWrapper.eq(RUploadEvaluationDataD::getProvinceId,param.getOrgId())
                        .between(RUploadEvaluationDataD::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime())
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
@@ -109,7 +109,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
        LambdaQueryWrapper<RUploadSubstationStatisticalDataD> lambdaQueryWrapper = new LambdaQueryWrapper<>();

        switch (list.size()) {
-            //国、省
+            //国
            case 1:
                List<Dept> 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<RUploadSu
                        .between(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime())
                        .eq(!Objects.isNull(param.getSearchState()),RUploadSubstationStatisticalDataD::getUploadStatus,param.getSearchState());
                break;
+            //省
            case 2:
                lambdaQueryWrapper.eq(RUploadSubstationStatisticalDataD::getProvinceId,param.getOrgId())
                        .between(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime())