From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java | 48 +++++++-----------------------------------------
1 files changed, 7 insertions(+), 41 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 1e16d26..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;
@@ -27,61 +24,30 @@
@AllArgsConstructor
public class LightEnergyDataService extends BaseServiceImpl<LightEnergyDataMapper, LightEnergyData> {
+ private final LightEnergyDataMapper lightEnergyDataMapper;
public List energy(int flag) {
Long userId = null;
if (SecurityUtils.getClientId() != null) {
userId = SecurityUtils.getUserId();
}
- LambdaQueryWrapper<LightEnergyData> lightEnergyDataLambdaQueryWrapper = Wrappers.lambdaQuery(LightEnergyData.class);
- if (userId != null) {
- Long finalUserId = userId;
- lightEnergyDataLambdaQueryWrapper.eq(LightEnergyData::getUserId, finalUserId).or(w -> {
- w.eq(LightEnergyData::getClientId, finalUserId);
- });
- }
+ LambdaQueryWrapper<LightEnergyData> lightEnergyDataLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
LocalDateTime now = LocalDateTime.now();
List<Map> listResult = new ArrayList<>();
for (int i = 1; i < 8; i++) {
-
String format = now.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-
-
- lightEnergyDataLambdaQueryWrapper.eq(LightEnergyData::getYtdTime, format);
- List<LightEnergyData> list = list(lightEnergyDataLambdaQueryWrapper);
-
+ //鑾峰彇璇ュぉ鐢ㄦ埛鐨勮兘鑰�/鑺傝兘鐜囦换鍔ist
+ List<LightEnergyData> list = lightEnergyDataMapper.getEnergyList(userId, format);
BigDecimal[] energyAll = {new BigDecimal(0.00)};
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