河北超高压算法调整

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

@@ -16,6 +16,8 @@ import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD;
 import com.njcn.harmonic.pojo.po.upload.RUploadPointStatisticalDataD;
 import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
 import com.njcn.harmonic.service.upload.IEvaluationDataService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.enums.GWSendEnum;
@@ -48,6 +50,7 @@ import java.util.stream.Collectors;
 public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDataDMapper, RUploadEvaluationDataD> implements IEvaluationDataService {
 
     private final DeptFeignClient deptFeignClient;
+    private final DicDataFeignClient dicDataFeignClient;
 
     @Override
     public Page<UploadEvaluationDataVo> getEvaluationData(UploadDataParam param) {
@@ -116,9 +119,13 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
                 if (Objects.equals(item.getStandardDeviation(),3.1415926)){
                     item.setStandardDeviation(0d);
                 }
+                if (Objects.equals(item.getHarmonicNum(),0)){
+                    item.setHarmonicNum(null);
+                }
                 BigDecimal four = BigDecimal.valueOf(item.getMonitorBusRate());
                 double value = four.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue();
                 item.setMonitorBusRate(value);
+                item.setVoltageLevel(getVoltage(item.getVoltageLevel()));
             }).collect(Collectors.toList());
             //组装数据
             SendParam sp = new SendParam();
@@ -219,4 +226,16 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
         this.update(lambdaUpdateWrapper);
     }
 
+    /**
+     * 电压等级转换
+     */
+    public String getVoltage(String voltage) {
+        DictData dictData = dicDataFeignClient.getDicDataById(voltage).getData();
+        Integer code = dictData.getAlgoDescribe();
+        if (Objects.isNull(code)){
+            return "99";
+        }
+        return (code < 10) ? "0" + code : String.valueOf(code);
+    }
+
 }