fix

zhanzhiqin

2022-04-26 11cc20222a7c20b9dc436f7c879834035882f431

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java

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

import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
@@ -67,8 +68,14 @@
        if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<LightReportDataBo> list = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        return ResponseUtil.success(list);
        CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        List<LightReportDataBo> lightReportDataBos = ( List<LightReportDataBo>)commonPage.getList();

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

        return ResponseUtil.success(commonPage1);
    }

    /**

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightDataEnum.java

@@ -17,7 +17,8 @@
    //设置定时控灯参数
    LightTimer("23"),
    // 清除单灯累计数据
    LightReset("25");
    LightReset("25"),
    LIGHT_HEART_BEAT("light_heart_beat/");

    A5LightDataEnum(String code) {
        this.code = code;

 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,10 @@
import java.io.File;
import java.sql.Wrapper;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @author chenjiantian
@@ -56,6 +64,9 @@
        BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
        lightReportData.setDeviceCode(deviceName);

        //单灯数据保存到缓存里
        RedisUtils.getBean().set(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, lightReportData);

        return save(lightReportData);
    }

@@ -75,14 +86,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);
        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);
                }

                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

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

@@ -5,6 +5,7 @@
import cn.hutool.core.util.StrUtil;
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.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -470,13 +471,18 @@
    /**
     * 获取用户所有的设备码
     */
    public List<String> listDeviceCode(int start, int end) {
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize) {
        List<String> list;
        if (SecurityUtils.getClientId() != null) {
            PageHelper.startPage(start, end);
            return baseMapper.listCode(SecurityUtils.getUserId());
            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(SecurityUtils.getUserId());
        } else {

            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(null);
        }
        PageHelper.startPage(start, end);
        return baseMapper.listCode(null);

        return CommonPage.restPage(list);
    }

    public boolean setPower(List<Long> ids, Integer power1, Integer power2) {