From e45166ce382bc931142797372b468ba76ebf662d Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Mon, 2 Dec 2024 16:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=AD=97=E5=85=B8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fdr/controller/FaultRecorderController.java |  2 +-
 .../fdr/service/FaultRecorderService.java       |  2 +-
 .../service/impl/FaultRecorderServiceImpl.java  | 17 +++++------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java b/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java
index 2d5a1bdc..bb82f429 100644
--- a/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java
+++ b/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java
@@ -104,7 +104,7 @@ public class FaultRecorderController {
      * 故障字典描述导出
      */
     @PostMapping("/faultCodeDict/export")
-    public void exportSysFaultCodeDict(@RequestBody SysFaultCodeDict sysFaultCodeDict, HttpServletRequest request, HttpServletResponse response) {
+    public void exportSysFaultCodeDict(@RequestBody SysFaultCodeDict sysFaultCodeDict, HttpServletRequest request, HttpServletResponse response) throws IOException {
         faultRecorderService.exportFaultCodeDict(sysFaultCodeDict,request, response);
     }
 
diff --git a/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java b/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java
index c5a41d4c..bdc89a28 100644
--- a/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java
+++ b/das/src/main/java/com/das/modules/fdr/service/FaultRecorderService.java
@@ -33,5 +33,5 @@ public interface FaultRecorderService {
 
     List<SysFaultCodeDict> queryFaultCodeDict(String madeinfactory, String model);
 
-    void exportFaultCodeDict(SysFaultCodeDict sysFaultCodeDict, HttpServletRequest request, HttpServletResponse response);
+    void exportFaultCodeDict(SysFaultCodeDict sysFaultCodeDict, HttpServletRequest request, HttpServletResponse response) throws IOException;
 }
diff --git a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
index 69d9a56e..17c86d0f 100644
--- a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
+++ b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.das.common.config.SessionUtil;
 import com.das.common.constant.FileConstants;
 import com.das.common.exceptions.ServiceException;
+import com.das.common.utils.ExcelUtil;
 import com.das.common.utils.HuExcelUtils;
 import com.das.modules.auth.domain.vo.SysUserVo;
 import com.das.modules.curve.domain.entity.CurveItemEntity;
@@ -18,6 +19,7 @@ import com.das.modules.fdr.config.MinioProperties;
 import com.das.modules.fdr.domain.FileNode;
 import com.das.modules.fdr.domain.SysFaultCodeDict;
 import com.das.modules.fdr.domain.SysFaultRecordingDesc;
+import com.das.modules.fdr.domain.excel.SysFaultCodeDictExcel;
 import com.das.modules.fdr.domain.vo.FdrFormatVo;
 import com.das.modules.fdr.domain.vo.FileParseConfig;
 import com.das.modules.fdr.mapper.SysFaultCodeDictMapper;
@@ -136,22 +138,13 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
     }
 
     @Override
-    public void exportFaultCodeDict(SysFaultCodeDict sysFaultCodeDict, HttpServletRequest request, HttpServletResponse response) {
-        List<SheetInfoBean> exportList = new ArrayList<>();
+    public void exportFaultCodeDict(SysFaultCodeDict sysFaultCodeDict, HttpServletRequest request, HttpServletResponse response) throws IOException {
         QueryWrapper<SysFaultCodeDict> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("PARENT",sysFaultCodeDict.getId());
         queryWrapper.orderByAsc("code");
-        List<SysFaultCodeDict> sysFaultRecordingDescList = sysFaultCodeDictMapper.selectList(queryWrapper);
+        List<SysFaultCodeDict> sysFaultCodeDicts = sysFaultCodeDictMapper.selectList(queryWrapper);
         TheoreticalPowerCurveEntity theoreticalPowerCurve = theoreticalPowerCurveMapper.selectById(sysFaultCodeDict.getId());
-        LinkedHashMap<String, String> map = new LinkedHashMap<>();
-        SheetInfoBean sheetDTO = new SheetInfoBean();
-        map.put("code", "故障码");
-        map.put("description", "故障描述");
-        sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
-        sheetDTO.setFieldAndAlias(map);
-        sheetDTO.setCollection(sysFaultRecordingDescList);
-        exportList.add(sheetDTO);
-        HuExcelUtils.exportExcel(response, exportList, theoreticalPowerCurve.getMadeinfactory()+theoreticalPowerCurve.getModel()+"风机故障码字典");
+        ExcelUtil.download(response, theoreticalPowerCurve.getMadeinfactory()+theoreticalPowerCurve.getModel()+"风机故障码字典", SysFaultCodeDictExcel.class,sysFaultCodeDicts,null);
     }
 
     @Override