From c00a73b74e67dbeb508865c3da4ed8d57c8631db Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 14:16:12 +0800
Subject: [PATCH] fix admin LIST
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 98 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 90 insertions(+), 8 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 5a79a77..f26d49c 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,14 +1,35 @@
package com.sandu.ximon.admin.service;
+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.ximon.admin.dto.LightDataDto;
+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;
import org.springframework.beans.BeanUtils;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.sql.Wrapper;
import java.util.List;
/**
@@ -17,7 +38,11 @@
* 鐏笂鎶ユ暟鎹� service
*/
@Service
+@AllArgsConstructor
public class LightReportDataService extends BaseServiceImpl<LightReportDataMapper, LightReportData> {
+
+ private final FileProperties properties;
+ private final AliOssFileServiceImpl fileService;
/**
* 淇濆瓨涓婃姤鐨勭伅蹇冭烦鏁版嵁
@@ -25,21 +50,78 @@
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
-
LightReportData lightReportData = new LightReportData();
BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
- lightReportData.setDeviceMac(deviceName);
+ lightReportData.setDeviceCode(deviceName);
return save(lightReportData);
}
/**
- * 鑾峰彇璺伅鍒楄〃
- * @return 杩斿洖缁勫悎鏁版嵁dto
+ * 鑾峰彇鎸囧畾璁惧鐮佹渶鏂扮殑涓�澶╀笂鎶ユ暟鎹�
+ *
+ * @param deviceCodeList 璁惧鐮佸垪琛�
+ * @return 涓婃姤鏁版嵁
*/
- public List<LightDataDto> listLight(int pageNo, int pageSize, String keyword) {
- PageHelper.startPage(pageNo,pageSize);
+ public List<LightReportData> getNewestReportByDeviceCode(List<String> deviceCodeList) {
+ return baseMapper.getNewestReportByDeviceCode(deviceCodeList);
+ }
- return null;
+ /**
+ * 鑾峰彇涓婃姤鏁版嵁
+ *
+ * @param keyword 鍏抽敭璇�
+ * @param deviceCode 璁惧鐮�
+ */
+ public List<LightReportDataBo> listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
+ PageHelper.startPage(pageNo, pageSize);
+ //涓簄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);
+
+ File file = new File("./" + RandomUtil.randomString(12) + ".xlsx");
+// File file = new File(properties.getUploadRootPath() + "export" + File.separator + RandomUtil.randomString(12) + ".xlsx");
+// ClassPathResource cpr = new ClassPathResource("public/exportOrder.xlsx");
+// FileUtil.mkParentDirs(file);
+//
+// ExcelWriter excelWriter = EasyExcel.write(file).withTemplate(cpr.getInputStream()).build();
+// WriteSheet writeSheet = EasyExcel.writerSheet().build();
+// excelWriter.fill(list, writeSheet);
+// excelWriter.finish();
+
+ EasyExcel.write(file, LightReportDataBo.class).sheet("妯＄増").doWrite(list);
+
+ FileUploadDto fileUploadDto = fileService.uploadFile(file);
+// String url = file.getPath().replace(properties.getUploadRootPath(), "");
+ String url = fileUploadDto.getFileUrl();
+ file.delete();
+ return url;
+
+ // return list;
}
}
--
Gitblit v1.9.3