From 591b785cf76754a696b5b07eab07cf587f2a4449 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期日, 24 四月 2022 11:33:21 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
index 54b4d4e..45ab8c9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
@@ -1,19 +1,26 @@
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;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.config.FileProperties;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.service.impl.BaseServiceImpl;
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.security.SecurityUtils;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
+import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.LightReportDataMapper;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
@@ -23,6 +30,8 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
+import java.sql.Wrapper;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -68,11 +77,32 @@
*/
public List<LightReportDataBo> listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
PageHelper.startPage(pageNo, pageSize);
- return baseMapper.listReportData(keyword, deviceCode);
+ //涓簄ull鐨勮瘽鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ return baseMapper.listReportData(keyword, deviceCode);
+ } else {
+ return baseMapper.listReportDataByUserid(keyword, deviceCode, SecurityUtils.getUserId());
+ }
}
@SneakyThrows
public String exportList(int pageNo, int pageSize, String keyword, String deviceCode) {
+
+ if (SecurityUtils.getClientId() != null) {
+ PoleBinding one = SpringContextHolder.getBean(PoleBindingService.class).getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode)
+ .eq(PoleBinding::getDeviceType, 0));
+ if (one == null) {
+ throw new BusinessException("鏈壘鍒扮粦瀹氬叧绯伙紒");
+ } else {
+ Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(Pole::getClientId, SecurityUtils.getUserId());
+ }));
+ if (pole == null) {
+ throw new BusinessException("缁戝畾鍏崇郴涓嶆纭紒");
+ }
+ }
+ }
+
PageHelper.startPage(pageNo, pageSize);
List<LightReportDataBo> list = baseMapper.listReportData(keyword, deviceCode);
@@ -92,8 +122,12 @@
// String url = file.getPath().replace(properties.getUploadRootPath(), "");
String url = fileUploadDto.getFileUrl();
file.delete();
- return url;
+ return url;
- // return list;
+ // return list;
+ }
+
+ public List<LightReportDataBo> reportDataList(List<String> deviceCodeList, DateTime startDate, DateTime endDate) {
+ return baseMapper.reportDataList(deviceCodeList, startDate, endDate);
}
}
--
Gitblit v1.9.3