导出修改

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

@@ -19,6 +19,9 @@ import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.param.*;
 import com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.hibernate.validator.constraints.URL;
+import org.mapstruct.Context;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +31,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.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
@@ -46,6 +50,8 @@ public class MonitorCameraController {
     @Resource
     private MonitorCameraService monitorCameraService;
 
+
+
     /**
      * 设备接入管理-分页
      *
@@ -137,19 +143,19 @@ public class MonitorCameraController {
         return CommonResult.data(monitorCameraService.statisticalAnalysisPage(pageParam));
     }
 
-    /**
+   /* *//**
      * 在线统计分析-导出
      *
      * @author hjc
      * @date 2024/06/21 10:07
-     */
+     *//*
     @ApiOperationSupport(order = 4)
     @ApiOperation("在线统计分析-导出")
     //@SaCheckPermission("/equipmentOnlineRateAssessment/monitorCamera/page")
     @GetMapping("/equipmentOnlineRateAssessment/monitorCamera/statisticalAnalysisExport")
     public void statisticalAnalysisExport(String fileName, HttpServletResponse response) {
         monitorCameraService.statisticalAnalysisExport(fileName,response);
-    }
+    }*/
 
     /**
      * 在线巡检-分页
@@ -205,8 +211,8 @@ public class MonitorCameraController {
     @ApiOperation("自动考核-导出")
     //@SaCheckPermission("/equipmentOnlineRateAssessment/monitorCamera/page")
     @GetMapping("/equipmentOnlineRateAssessment/monitorCamera/AutomatedAssessmentsExport")
-    public void AutomatedAssessmentsExport(AutomatedAssessmentsExportParam param) {
-        monitorCameraService.AutomatedAssessmentsExport(param.getFileName(), param.getResponse());
+    public void AutomatedAssessmentsExport(AutomatedAssessmentsExportParam param ,HttpServletRequest request,HttpServletResponse response) {
+        monitorCameraService.AutomatedAssessmentsExport(param,request,response);
 
     }
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorCamera/param/AutomatedAssessmentsExportParam.java

@@ -1,21 +1,52 @@
 package com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.param;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 
 /**
  * @author hjc
  * @date 2024/6/24 17:07
  */
 @Data
-public class AutomatedAssessmentsExportParam{
+@NoArgsConstructor
+@AllArgsConstructor
+public class AutomatedAssessmentsExportParam {
 
+    /** 文件名 */
+    @ApiModelProperty(value = "文件名", position = 1)
     private String fileName;
 
-    private HttpServletResponse response;
+    /** 摄像头总数量 */
+    @ApiModelProperty(value = "摄像头总数量", position = 1)
+    private Integer cameraAllNum;
+
+    /** 摄像头在线数量 */
+    @ApiModelProperty(value = "摄像头在线数量", position = 2)
+    private Integer cameraOnlineNum;
+
+    /** 摄像头离线数量 */
+    @ApiModelProperty(value = "摄像头离线数量", position = 3)
+    private Integer cameraOfflineNum;
+
+    /** 摄像头在线率 */
+    @ApiModelProperty(value = "摄像头在线率(%)", position = 4)
+    private BigDecimal cameraOnlineRate;
+
+    /** 摄像头在线率 */
+    @ApiModelProperty(value = "摄像头离线率(%)", position = 5)
+    private BigDecimal cameraOfflineRate;
+
+    /** NVR总数量 */
+    @ApiModelProperty(value = "NVR总数量", position = 6)
+    private Integer nvrAllNum;
+
 
 }

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.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -125,6 +126,6 @@ public interface MonitorCameraService extends IService<MonitorCamera> {
      * @author hjc
      * @date 2024/06/21 10:07
      */
-    void AutomatedAssessmentsExport(String fileName, HttpServletResponse response);
+    void AutomatedAssessmentsExport(AutomatedAssessmentsExportParam param , HttpServletRequest request , HttpServletResponse response);
 
 }

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

@@ -15,26 +15,18 @@ package com.unis.equipmentOnlineRateAssessment.modular.monitorCamera.service.imp
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
-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;
 import com.unis.basic.info.modular.orgInfo.mapper.OrgInfoMapper;
-import com.unis.common.page.CommonPageRequest;
 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;
@@ -43,19 +35,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.HttpServletRequest;
 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.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 摄像头基本信息表Service接口实现类
@@ -75,6 +63,7 @@ public class MonitorCameraServiceImpl extends ServiceImpl<MonitorCameraMapper, M
     @Autowired
     private MonitorNvrMapper monitorNvrMapper;
 
+
     @Override
     public Page<CameraAndNvrVO> page(MonitorCameraPageParam pageParam) {
 
@@ -350,21 +339,22 @@ public class MonitorCameraServiceImpl extends ServiceImpl<MonitorCameraMapper, M
      * @date 2024/06/21 10:07
      */
     @Override
-    public void AutomatedAssessmentsExport(String fileName, HttpServletResponse response) {
-
+    public void AutomatedAssessmentsExport(AutomatedAssessmentsExportParam param , HttpServletRequest request, HttpServletResponse response) {
         try {
-            if (StringUtils.isEmpty(fileName))
-                fileName = LocalDate.now().toString();
+            String fileName = param.getFileName();
+            if (StringUtils.isEmpty(fileName));
+            fileName = LocalDate.now().toString();
             fileName = URLEncoder.encode(fileName, "UTF-8");
             // 设置响应信息，让浏览器下载文件
-            response.setContentType("application/vnd.ms-excel");
+            response.setContentType("application/xml");
             response.setCharacterEncoding("utf-8");
-            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ExcelTypeEnum.XLSX.getValue());
+            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);
+                    .doWrite(this.getData(param));
 
         } catch (IOException e) {
             log.error("自动考核导出异常：{}", e);
@@ -373,7 +363,18 @@ public class MonitorCameraServiceImpl extends ServiceImpl<MonitorCameraMapper, M
 
     }
 
-    private List<AutomatedAssessmentsExportVO> data() {
+
+    private List<AutomatedAssessmentsExportVO> getData(AutomatedAssessmentsExportParam param){
+        AutomatedAssessmentsExportVO vo = new AutomatedAssessmentsExportVO();
+        List<AutomatedAssessmentsExportVO> list = new ArrayList<>();
+        BeanUtil.copyProperties(param,vo);
+        list.add(vo);
+
+        return list;
+    }
+
+
+/*    private List<AutomatedAssessmentsExportVO> data() {
         AutomatedAssessmentsExportVO vo = new AutomatedAssessmentsExportVO();
         //获取摄像头总数量
         Integer cameraAllNum = monitorCameraMapper.selectAll(null);
@@ -409,6 +410,6 @@ public class MonitorCameraServiceImpl extends ServiceImpl<MonitorCameraMapper, M
         list.add(vo);
 
         return list;
-    }
+    }*/
 
 }