能耗乱七八糟的东西

src/main/java/com/ebei/screen/service/impl/EnergyPlatformServiceImpl.java

@@ -227,14 +227,13 @@ public class EnergyPlatformServiceImpl implements EnergyPlatformService {
             Double zj5 = flag ? Double.parseDouble(thisBoxDmonMap.get("zj5").toString()) : 0.0;
             Double zj6 = flag ? Double.parseDouble(thisBoxDmonMap.get("zj6").toString()) : 0.0;
             Double all = flag ? Double.parseDouble(thisBoxDmonMap.get("all").toString()) : 0.0;
-            Levi byydgc = Levi.by("zj1Name", DmonDeviceCode.ONE.getName()).set("zj1Value", EnergyUtils.getPercent(zj1, all))
-                    .set("zj2Name", DmonDeviceCode.TWO.getName()).set("zj2Value", EnergyUtils.getPercent(zj2, all))
-                    .set("zj3Name", DmonDeviceCode.THREE.getName()).set("zj3Value", EnergyUtils.getPercent(zj3, all))
-                    .set("zj4Name", DmonDeviceCode.FOUR.getName()).set("zj4Value", EnergyUtils.getPercent(zj4, all))
-                    .set("zj5Name", DmonDeviceCode.FIVE.getName()).set("zj5Value", EnergyUtils.getPercent(zj5, all))
-                    .set("zj6Name", DmonDeviceCode.SIX.getName()).set("zj6Value", EnergyUtils.getPercent(zj6, all))
-                    .set("allName", DmonDeviceCode.ALL.getName()).set("allValue", thisBoxDmonMap.get("all"));
-
+            List<Map> byydgc = Arrays.asList(Levi.by("name", DmonDeviceCode.ONE.getName()).set("value", zj1).set("percent", EnergyUtils.getPercent(zj1, all)),
+                    Levi.by("name", DmonDeviceCode.TWO.getName()).set("value", zj2).set("percent", EnergyUtils.getPercent(zj2, all)),
+                    Levi.by("name", DmonDeviceCode.THREE.getName()).set("value", zj3).set("percent", EnergyUtils.getPercent(zj3, all)),
+                    Levi.by("name", DmonDeviceCode.FOUR.getName()).set("value", zj4).set("percent", EnergyUtils.getPercent(zj4, all)),
+                    Levi.by("name", DmonDeviceCode.FIVE.getName()).set("value", zj5).set("percent", EnergyUtils.getPercent(zj5, all)),
+                    Levi.by("name", DmonDeviceCode.SIX.getName()).set("value", zj6).set("percent", EnergyUtils.getPercent(zj6, all)),
+                    Levi.by("name", DmonDeviceCode.ALL.getName()).set("value", all).set("percent", thisBoxDmonMap.get("all")));
             double ndlj = 0.0, by = 0.0, jrss = 0.0, first = 0.0, second = 0.0, third = 0.0;
             double ndljL = 0.0, byL = 0.0, jrssL = 0.0, firstL = 0.0, secondL = 0.0, thirdL = 0.0;
             String ndljP = "0%", byP = "0%", jrssP = "0%", firstP = "0%", secondP = "0%", thirdP = "0%";