Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-26 407ea8abef30f30608a0cd933f7f6c35e97095be

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

@@ -1,13 +1,16 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.config.FileProperties;
@@ -16,7 +19,9 @@
import com.sandu.common.util.ResUtils;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightDataEnum;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.domain.Pole;
@@ -32,7 +37,8 @@
import java.io.File;
import java.sql.Wrapper;
import java.time.LocalDate;
import java.util.List;
import java.time.LocalDateTime;
import java.util.*;

/**
 * @author chenjiantian
@@ -52,9 +58,16 @@
     * @return 是否成功
     */
    public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
        LightReportData lightReportData = new LightReportData();
        LightReportData lightReportData = RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, LightReportData.class);
        if (lightReportData == null) {
            lightReportData = new LightReportData();
            lightReportData.setCreateTime(LocalDateTime.now());
        }
        BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
        lightReportData.setDeviceCode(deviceName);
        lightReportData.setUpdateTime(LocalDateTime.now());
        //单灯数据保存到缓存里
        RedisUtils.getBean().set(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, lightReportData);

        return save(lightReportData);
    }
@@ -75,14 +88,42 @@
     * @param keyword    关键词
     * @param deviceCode 设备码
     */
    public List<LightReportDataBo> listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
        PageHelper.startPage(pageNo, pageSize);
        //为null的话是超管
        if (SecurityUtils.getClientId() == null) {
            return baseMapper.listReportData(keyword, deviceCode);
        } else {
            return baseMapper.listReportDataByUserid(keyword, deviceCode, SecurityUtils.getUserId());
    public CommonPage listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {

        List<LightReportDataBo> lightReportDataBos = new ArrayList<>(pageSize);

        CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize,keyword, deviceCode);
        List<String> macList = stringCommonPage.getList();
        if (CollUtil.isEmpty(macList)) {
            return new CommonPage();
        }

        for (String macCode : macList) {
            try {
                LightReportData lightReportData
                        = JSON.parseObject(RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + macCode), LightReportData.class);

                LightReportDataBo lightReportDataBo = new LightReportDataBo();
                if (lightReportData != null) {
                    BeanUtils.copyProperties(lightReportData, lightReportDataBo);
                }
                lightReportDataBo.setDeviceCode(macCode);
                Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, macCode));
                if (pole != null) {
                    lightReportDataBo.setPoleName(pole.getPoleName());
                }
                lightReportDataBos.add(lightReportDataBo);

            } catch (Exception e) {
                e.printStackTrace();
            }
        }

        CommonPage commonPage = CommonPage.restPage(lightReportDataBos);
        commonPage.setTotal(stringCommonPage.getTotal());
        commonPage.setTotalPage(stringCommonPage.getTotalPage());

        return commonPage;
    }

    @SneakyThrows