1.代码调整

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java

@@ -164,11 +164,7 @@ public class PmsStatationStatController extends BaseController {
     public HttpResult<List<StatationStat>> getPowerInfo(@RequestBody PmsStatationStatInfoParam param) {
         String methodDescribe = getMethodDescribe("getStatationStatInfo");
         List<StatationStat> powerInfo = statationStatService.getPowerInfo(param);
-        if (CollectionUtil.isEmpty(powerInfo)) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerInfo, methodDescribe);
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerInfo, methodDescribe);
-        }
     }
 
     /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java

@@ -2,6 +2,7 @@ package com.njcn.device.pms.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.dto.SimpleDTO;
@@ -104,10 +105,11 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl<RMpDevEvaluateD
         //封装返回数据
         DecimalFormat df = new DecimalFormat("###.00");
         List<RMpDevEvaluateDetailVO> resultList = new ArrayList<>();
+        String time = time(startTime, rMpDevEvaluateDetailParam.getType());
         terminalListMapByOrgId.forEach((key, terminalListByOrg) -> {
             RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO();
 
-            rMpDevEvaluateDetailVO.setDataDate(startTime); //日期(前端传递的时间)
+            rMpDevEvaluateDetailVO.setDataDate(time); //日期(前端传递的时间)
             rMpDevEvaluateDetailVO.setOrgId(key); //单位id(字段是id实际数据是单位code)
             rMpDevEvaluateDetailVO.setOrgName(terminalListByOrg.get(0).getOrgName()); //单位名称
 
@@ -179,10 +181,11 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl<RMpDevEvaluateD
         //封装返回数据
         DecimalFormat df = new DecimalFormat("###.00");
         List<RMpDevEvaluateDetailVO> resultList = new ArrayList<>();
+        String time = time(startTime, rMpDevEvaluateDetailParam.getType());
         terminalListMapByManufacture.forEach((key, terminalListByManufacture) -> {
             RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO();
 
-            rMpDevEvaluateDetailVO.setDataDate(startTime); //日期(前端传递的时间)
+            rMpDevEvaluateDetailVO.setDataDate(time); //日期(前端传递的时间)
             rMpDevEvaluateDetailVO.setManufactureId(key); //厂商id
 
             //终端有效接入率
@@ -248,10 +251,11 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl<RMpDevEvaluateD
         //封装返回数据
         DecimalFormat df = new DecimalFormat("###.00");
         List<RMpDevEvaluateDetailVO> resultList = new ArrayList<>();
+        String time = time(startTime, rMpDevEvaluateDetailParam.getType());
         terminalListMapByModel.forEach((key, terminalListByModel) -> {
             RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO();
 
-            rMpDevEvaluateDetailVO.setDataDate(startTime); //日期(前端传递的时间)
+            rMpDevEvaluateDetailVO.setDataDate(time); //日期(前端传递的时间)
             rMpDevEvaluateDetailVO.setDeviceModel(key); //终端型号
 
             //终端有效接入率
@@ -277,6 +281,17 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl<RMpDevEvaluateD
         return resultList;
     }
 
+    private String time(String starTime,Integer type){
+        if(ObjectUtil.isNull(type)){
+            return starTime;
+        }else{
+            if(type==1){
+                return starTime.substring(0,4);
+            }else {
+                return starTime.substring(0,7);
+            }
+        }
+    }
 
 }
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PollutionVO.java

@@ -3,7 +3,9 @@ package com.njcn.harmonic.pojo.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 类的介绍：
@@ -32,4 +34,9 @@ public class PollutionVO {
     @ApiModelProperty("子级")
     private List<PollutionVO> children;
 
+    public void setChildren(List<PollutionVO> children) {
+        List<PollutionVO> listSort = children.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
+        listSort.addAll(children.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList()));
+        this.children = listSort;
+    }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -254,12 +254,13 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     subPollutionVO.add(pollutionsubVO);
                 });
                 pollutionVO.setChildren(subPollutionVO);
-
                 list.add(pollutionVO);
             }
         }
         if (!CollectionUtils.isEmpty(list)){
-            return list.stream().sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
+            List<PollutionVO> listSort = list.stream().filter(x -> x.getData() != 3.14159).sorted(Comparator.comparing(PollutionVO::getData).reversed().thenComparing(PollutionVO::getName)).collect(Collectors.toList());
+            listSort.addAll(list.stream().filter(x -> x.getData() == 3.14159).collect(Collectors.toList()));
+            return listSort;
         }
         return list;
     }