首页

liuhaonan

2022-04-19 e11aff139734ce34e4f7468170ebf0f62ccbb50b

首页

 dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportDataMapper.java

@@ -1,10 +1,12 @@
package com.sandu.ximon.dao.mapper;

import cn.hutool.core.date.DateTime;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.time.LocalDate;
import java.util.List;

/**
@@ -40,6 +42,8 @@
     * @return
     */
    List<LightReportDataBo> listReportDataByUserid(String keyword, String deviceCode, Long userid);

    List<LightReportDataBo> reportDataList(List<String> deviceCodeList, DateTime startDate, DateTime endDate);
}



 dao/src/main/resources/mapper/LightReportDataMapper.xml

@@ -93,4 +93,7 @@
        </where>
        ORDER BY t1.light_report_data_id DESC
    </select>
    <select id="reportDataList" resultType="com.sandu.ximon.dao.bo.LightReportDataBo">

    </select>
</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java

@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.date.DateTime;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.excel.EasyExcel;
@@ -30,6 +31,7 @@

import java.io.File;
import java.sql.Wrapper;
import java.time.LocalDate;
import java.util.List;

/**
@@ -124,4 +126,8 @@

        // return list;
    }

    public List<LightReportDataBo> reportDataList(List<String> deviceCodeList, DateTime startDate, DateTime endDate) {
        return baseMapper.reportDataList(deviceCodeList, startDate, endDate);
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
@@ -31,7 +32,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.*;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -196,26 +201,43 @@
     *
     * @return
     */
    public Map controlEnergySaving() {
    public List<LightReportData> controlEnergySaving() {
        Long clientId = SecurityUtils.getClientId();
        List<LightBo> listLight = baseMapper.listLight(clientId, null);
        List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
//        List<LightBo> listLight = baseMapper.listLight(clientId, null);
//        List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
        List<String> deviceCodeList = new ArrayList<>();
        deviceCodeList.add("32313243305005ffa633ffff");
//        DateTime startDate = DateUtil.date();
//        DateTime endDate = DateUtil.offsetDay(startDate, 3);
//        if (CollectionUtil.isNotEmpty(deviceCodeList)) {
//
//            List<LightReportDataBo> reportDataList = lightReportDataService.reportDataList(deviceCodeList, startDate,  endDate);
//        }

        //获取用户最近7天的单灯数据
        List<LightReportData> reportDataList = lightReportDataService.list(Wrappers.<LightReportData>lambdaQuery()
                .in(LightReportData::getDeviceCode, deviceCodeList)
                .ge(LightReportData::getCreateTime, DateUtil.offsetDay(new Date(), -7))
                .ge(LightReportData::getCreateTime, DateUtil.offsetDay(DateUtil.yesterday(), -7))
                .orderByDesc(LightReportData::getCreateTime));


        if (CollectionUtil.isEmpty(reportDataList)) {
            throw new BusinessException("没有路灯数据");
        }
        LocalDateTime dateTime = LocalDateTime.now();
        dateTime.plusDays(7L);
        reportDataList.forEach(
                reportData -> {
                    LocalDateTime createTime = reportData.getCreateTime();
                    if(dateTime.plusDays(-1L).getDayOfMonth()==createTime.getDayOfMonth()){

                    }
                }
        );


        Map map = new HashMap();
        map.put("7", reportDataList);
        map.put("-1", null);


        return map;
        return reportDataList;
    }

    /**