From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java
index c25d62d..11d0cbe 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java
@@ -1,12 +1,9 @@
package com.sandu.ximon.admin.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LightEnergyData;
-import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.mapper.LightEnergyDataMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -48,32 +45,9 @@
BigDecimal[] energySavingAll = {new BigDecimal(0.00)};
list.forEach(
bean -> {
- int lightSize = SpringContextHolder.getBean(LightTaskPoleRelationService.class)
- .list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .eq(LightTaskPoleRelation::getTaskId, bean.getTaskId()).eq(LightTaskPoleRelation::getIssueStatus, 0)).size();
+ energyAll[0] = energyAll[0].add(bean.getEnergy());
+ energySavingAll[0] = energySavingAll[0].add(bean.getEnergySaving());
- BigDecimal energy;
- BigDecimal energySaving;
- if (lightSize == 0) {
- energy = new BigDecimal(0);
- energySaving = new BigDecimal(1);
- } else {
- if (bean.getEnergy().equals(0.00)) {
- energy = new BigDecimal(0);
- energySaving = new BigDecimal(1);
- } else if (bean.getEnergySaving().equals(0.00)) {
- energy = new BigDecimal(0);
- energySaving = new BigDecimal(1);
- } else {
-
- energy = bean.getEnergy().multiply(new BigDecimal(lightSize)).setScale(2, BigDecimal.ROUND_HALF_UP);
- energySaving = bean.getEnergySaving().divide(new BigDecimal(lightSize)).setScale(2, BigDecimal.ROUND_HALF_UP);
- }
-
- }
-
- energyAll[0] = energyAll[0].add(energy);
- energySavingAll[0] = energySavingAll[0].add(energySaving);
});
Map map = new LinkedHashMap();
--
Gitblit v1.9.3