2021与蓝度共同重构项目,服务端
liuhaonan
2022-06-01 a53950ffd0c8194e473d1357d633331eab376a64
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java
@@ -27,31 +27,23 @@
@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);
            //获取该天用户的能耗/节能率任务list
            List<LightEnergyData> list = lightEnergyDataMapper.getEnergyList(userId, format);
            BigDecimal[] energyAll = {new BigDecimal(0.00)};
            BigDecimal[] energySavingAll = {new BigDecimal(0.00)};
            list.forEach(