修改 导出工具

haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java

@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -67,20 +69,34 @@ public class ApiController {
     public AjaxResult queryPramList(Date beginTime, Date endTime) {
         return success(iApiService.queryPramList(beginTime, endTime));
     }
+
     @ApiOperation(tags = {"60脱水机"}, value = "导出数据记录")
     @PostMapping("/home/exportParamList")
     @ResponseBody
-    public AjaxResult export(String name ,String type,String colms,Date beginTime, Date endTime)
-    {
-
-        System.out.println(name);
-        System.out.println(type);
-        System.out.println(colms);
+    public AjaxResult export(String name, String type, String colms, Date beginTime, Date endTime) {
+        System.out.println("显示列："+colms);
         List<RecordRaramData> list = iApiService.queryPramList(beginTime, endTime);
         ExcelUtil_2<RecordRaramData> util = new ExcelUtil_2(RecordRaramData.class);
-        util.hideColumn("time");
-        return util.exportExcel(list, "数据记录","12312");
+        if (colms != null) {
+            List<String> tags = Arrays.asList(colms.split(","));
+            List<String> tagsF = new ArrayList<>(Arrays.asList(
+                    "采集时间", "一体机A转速", "一体机A电流",
+                    "一体机A切刀转速", "一体机A切刀电流",
+                    "一体机A机头温度", "一体机A机头压力"));
+            for (String s : tags) {
+                tagsF.remove(s);
+            }
+            if (!tagsF.isEmpty()) {
+                String[] columnsArray = tagsF.toArray(new String[tagsF.size()]);
+                util.hideColumn(columnsArray);
+            }
+
+        }
+
+
+        return util.exportExcel(list, "数据记录", name + "," + type);
     }
+
     @ApiOperation(tags = {"60脱水机"}, value = "设备介绍")
     @GetMapping("/home/deviceInfo")
     public AjaxResult deviceInfo() {

haiwei-admin/src/main/resources/static/board/board.css

@@ -120,7 +120,7 @@ body {
 }
 
 .status {
-    background-image: url("../../board/img/warnBg.png");
+    /*background-image: url("../../board/img/warnBg.png");*/
     background-size: 100% 100%;
     background-repeat: no-repeat;
     position: absolute;

haiwei-common/src/main/java/com/haiwei/common/utils/poi/ExcelUtil_2.java

@@ -537,19 +537,19 @@ public class ExcelUtil_2<T> {
             // 设置列宽
             sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
         }
-       /* if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
-        {
-            if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
-            {
-                // 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到
-                setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
-            }
-            else
-            {
-                // 提示信息或只能选择不能输入的列内容.
-                setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
-            }
-        }*/
+//        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
+//        {
+//            if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
+//            {
+//                // 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到
+//                setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+//            }
+//            else
+//            {
+//                // 提示信息或只能选择不能输入的列内容.
+//                setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+//            }
+//        }
     }
 
     /**

haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.java

@@ -14,13 +14,13 @@ public class RecordRaramData {
     private String 一体机A转速;
     @Excel(name = "一体机A电流")
     private String 一体机A电流;
-    @Excel(name = "切刀转速")
+    @Excel(name = "一体机A切刀转速")
     private String 一体机A切刀转速;
-    @Excel(name = "切刀电流")
+    @Excel(name = "一体机A切刀电流")
     private String 一体机A切刀电流;
-    @Excel(name = "机头温度")
+    @Excel(name = "一体机A机头温度")
     private String 一体机A机头温度;
-    @Excel(name = "机头压力")
+    @Excel(name = "一体机A机头压力")
     private String 一体机A机头压力;
 
     public String getTime() {