|
@@ -289,7 +289,13 @@ public class EnergyPlatformServiceImpl implements EnergyPlatformService {
|
|
|
thirdName = String.join(",", dmonMaps.get(third));
|
|
|
thirdL = EnergyUtils.getDayInfo(thirdName.replace("主机", "zj"), (day == 1 ? thisBoxDmonMapL : thisBoxDmonMap), (day == 1 ? dayOfMonth : day - 1));
|
|
|
thirdP = EnergyUtils.getPercent(third, thirdL);
|
|
|
- Levi byhxzb = Levi.by("ndlj", ndlj).set("ndljP", ndljP).set("by", by).set("byP", byP).set("jrss", jrss).set("jrssP", jrssP).set("first", first).set("firstP", firstP).set("firstName", firstName).set("second", second).set("secondP", secondP).set("secondName", secondName).set("third", third).set("thirdP", thirdP).set("thirdName", thirdName);
|
|
|
+ List<Map> byhxzb = Arrays.asList(Levi.by("name", "年度累计总用量").set("value1", ndlj).set("value2", ndljP),
|
|
|
+ Levi.by("name", "本月总用量").set("value1", by).set("value2", byP),
|
|
|
+ Levi.by("name", "今日实时用量").set("value1", jrss).set("value2", jrssP),
|
|
|
+ Levi.by("name", "业态用量第一:" + firstName).set("value1", first).set("value2", firstP),
|
|
|
+ Levi.by("name", "业态用量第二:" + secondName).set("value1", second).set("value2", secondP),
|
|
|
+ Levi.by("name", "业态用量第三:" + thirdName).set("value1", third).set("value2", thirdP)
|
|
|
+ );
|
|
|
// 计算本日用量环比
|
|
|
List<Map> dayHbList = new ArrayList<>();
|
|
|
List<Map> dataHb = flag ? (List<Map>) ((List<Map>) thisBoxDmonMap.get("data")).get(day - 1).get("data") : null;
|