提交导出代码

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorCamera/controller/MonitorCameraController.java

@@ -28,6 +28,7 @@ import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.entity.Monit
 import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.service.MonitorCameraService;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 /**
@@ -146,9 +147,8 @@ public class MonitorCameraController {
     @ApiOperation("在线统计分析-导出")
     //@SaCheckPermission("/equipmentOnlineRateAssessment/monitorCamera/page")
     @GetMapping("/equipmentOnlineRateAssessment/monitorCamera/statisticalAnalysisExport")
-    public CommonResult<String> statisticalAnalysisExport() {
-        monitorCameraService.statisticalAnalysisExport();
-        return CommonResult.ok();
+    public void statisticalAnalysisExport(String fileName, HttpServletResponse response) {
+        monitorCameraService.statisticalAnalysisExport(fileName,response);
     }
 
     /**
@@ -205,9 +205,9 @@ public class MonitorCameraController {
     @ApiOperation("自动考核-导出")
     //@SaCheckPermission("/equipmentOnlineRateAssessment/monitorCamera/page")
     @GetMapping("/equipmentOnlineRateAssessment/monitorCamera/AutomatedAssessmentsExport")
-    public CommonResult<String> AutomatedAssessmentsExport() {
-        monitorCameraService.AutomatedAssessmentsExport();
-        return CommonResult.ok();
+    public void AutomatedAssessmentsExport(String fileName, HttpServletResponse response) {
+        monitorCameraService.AutomatedAssessmentsExport(fileName,response);
+
     }
 
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorCamera/service/MonitorCameraService.java

@@ -18,6 +18,7 @@ import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.entity.Monit
 import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.param.*;
 import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.vo.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -90,7 +91,7 @@ public interface MonitorCameraService extends IService<MonitorCamera> {
      * @author hjc
      * @date  2024/06/21 10:07
      */
-    void statisticalAnalysisExport();
+    void statisticalAnalysisExport(String fileName, HttpServletResponse response);
 
 
     /**
@@ -124,6 +125,6 @@ public interface MonitorCameraService extends IService<MonitorCamera> {
      * @author hjc
      * @date 2024/06/21 10:07
      */
-    void AutomatedAssessmentsExport();
+    void AutomatedAssessmentsExport(String fileName, HttpServletResponse response);
 
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorCamera/service/impl/MonitorCameraServiceImpl.java

@@ -19,10 +19,12 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.unis.basic.info.modular.orgInfo.entity.OrgInfo;
@@ -32,6 +34,7 @@ import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.param.*;
 import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.vo.*;
 import com.unis.equipmentOnlineRateAssessment.modular.monitorNvr.entity.MonitorNvr;
 import com.unis.equipmentOnlineRateAssessment.modular.monitorNvr.mapper.MonitorNvrMapper;
+import com.unis.statisticalReport.info.modular.grainTempCheck.entity.GrainTempExcel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,15 +43,15 @@ import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.entity.Monit
 import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.mapper.MonitorCameraMapper;
 import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.service.MonitorCameraService;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
 import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
+import java.time.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -215,22 +218,25 @@ public class MonitorCameraServiceImpl extends ServiceImpl<MonitorCameraMapper, M
      * @date 2024/06/21 10:07
      */
     @Override
-    public void statisticalAnalysisExport() {
-        //TODO 路径改变
-        String path = "D://";
-        File folder = new File(path);
-        if (!folder.isDirectory()) {
-            folder.mkdirs();
+    public void statisticalAnalysisExport(String fileName, HttpServletResponse response) {
+
+        try {
+            if (StringUtils.isEmpty(fileName))
+                fileName = LocalDate.now()+"在线统计分析表";
+            fileName = URLEncoder.encode(fileName, "UTF-8");
+            // 设置响应信息，让浏览器下载文件
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ExcelTypeEnum.XLSX.getValue());
+            EasyExcel.write(response.getOutputStream()) // 或, GrainTempExcel.class
+                    .head(StatisticalAnalysisVO.class) // write 中, GrainTempExcel.class 二选一
+                    .excelType(ExcelTypeEnum.XLSX)
+                    .sheet(fileName)
+                    .doWrite(orgInfoMapper.statisticalAnalysis());
+        } catch (IOException e) {
+            log.error("在线统计分析导出异常：{}",e);
+            throw new RuntimeException(e);
         }
-
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
-        String dateStr = format.format(new Date());
-        String fileName = path + dateStr + "设备在线率考核统计分析" + ".xlsx";
-
-        EasyExcel.write(fileName, StatisticalAnalysisVO.class)
-                .sheet("设备在线率考核统计分析表")
-                .doWrite(orgInfoMapper.statisticalAnalysis());
-
     }
 
     /**
@@ -344,19 +350,26 @@ public class MonitorCameraServiceImpl extends ServiceImpl<MonitorCameraMapper, M
      * @date 2024/06/21 10:07
      */
     @Override
-    public void AutomatedAssessmentsExport() {
-        String path = "D://";
-        File folder = new File(path);
-        if (!folder.isDirectory()) {
-            folder.mkdirs();
+    public void AutomatedAssessmentsExport(String fileName, HttpServletResponse response) {
+
+        try {
+            if (StringUtils.isEmpty(fileName))
+                fileName = LocalDate.now()+ "自动考核数据表";
+            fileName = URLEncoder.encode(fileName, "UTF-8");
+            // 设置响应信息，让浏览器下载文件
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ExcelTypeEnum.XLSX.getValue());
+            EasyExcel.write(response.getOutputStream()) // 或, GrainTempExcel.class
+                    .head(AutomatedAssessmentsExportVO.class) // write 中, GrainTempExcel.class 二选一
+                    .excelType(ExcelTypeEnum.XLSX)
+                    .sheet(fileName)
+                    .doWrite(this::data);
+        } catch (IOException e) {
+            log.error("自动考核导出异常：{}",e);
+            throw new RuntimeException(e);
         }
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
-        String dateStr = format.format(new Date());
-        String fileName = path + dateStr + "自动考核数据表" + ".xlsx";
 
-        EasyExcel.write(fileName, AutomatedAssessmentsExportVO.class)
-                .sheet("自动考核数据表")
-                .doWrite(this::data);
     }
 
     private List<AutomatedAssessmentsExportVO> data() {