补充功率因数

storage/src/main/java/com/njcn/gather/storage/service/impl/SimAndDigNonHarmonicServiceImpl.java

@@ -104,7 +104,6 @@ public class SimAndDigNonHarmonicServiceImpl extends ServiceImpl<SimAndDigNonHar
 
         Map<String, List<RawResultDataVO>> info = new LinkedHashMap<>(2);
         Map<String, SimAndDigNonHarmonicResult> adTypeMap = SimAndDigHarmonicResults.stream()
-                                                    .sorted(Comparator.comparing(SimAndDigNonHarmonicResult::getResultFlag))
                                                     .collect(Collectors.toMap(SimAndDigNonHarmonicResult::getAdType, Function.identity(), (a, b) -> a, LinkedHashMap::new));
         List<DictTree> dictTreeById = dictTreeService.getDictTreeById(new ArrayList<>(adTypeMap.keySet()));
         Map<String, DictTree> dictTreeByName = dictTreeById.stream().collect(Collectors.toMap(DictTree::getId, Function.identity()));

storage/src/main/java/com/njcn/gather/util/StorageUtil.java

@@ -90,10 +90,14 @@ public class StorageUtil {
              */
             case "P":
             case "W":
-            case "VARW":
-            case "VAW":
                 unit = "W";
                 break;
+            case "VARW":
+                unit = "Var";
+                break;
+            case "VAW":
+                unit = "VA";
+                break;
             /**
              * 闪变
              */