From b42da4cb47c13d280b01cf397280a2cf66496439 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Wed, 18 Oct 2023 13:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../web/controller/broad/ApiController.java | 11 ++++-----
.../haiwei/manage/domain/RecordRaramData.java | 24 +++++++++++++------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
index 7ff79c8..6865b00 100644
--- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
+++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
@@ -71,15 +71,14 @@ public class ApiController {
System.out.println(beginTime.toString());
return success(iApiService.queryPramList(beginTime, endTime));
}
- /* @PostMapping("/home/exportParamList")
+ @PostMapping("/home/exportParamList")
@ResponseBody
public AjaxResult export(Date beginTime, Date endTime)
{
- List<RecordRaramData> recordRaramData = iApiService.queryPramList(beginTime, endTime);
- List<BaseDeviceInfo> list = baseDeviceInfoService.selectBaseDeviceInfoList(baseDeviceInfo);
- ExcelUtil<BaseDeviceInfo> util = new ExcelUtil<BaseDeviceInfo>(BaseDeviceInfo.class);
- return util.exportExcel(list, "base_device_info");
- }*/
+ List<RecordRaramData> list = iApiService.queryPramList(beginTime, endTime);
+ ExcelUtil<RecordRaramData> util = new ExcelUtil(RecordRaramData.class);
+ return util.exportExcel(list, "数据记录");
+ }
@ApiOperation(tags = {"60脱水机"}, value = "设备介绍")
@GetMapping("/home/deviceInfo")
public AjaxResult deviceInfo() {
diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.java b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.java
index 79498b0..c963577 100644
--- a/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.java
+++ b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordRaramData.java
@@ -1,17 +1,27 @@
package com.haiwei.manage.domain;
+import com.haiwei.common.annotation.Excel;
+
/**
* @author wanghao
* @date 2023/8/31 14:01
*/
public class RecordRaramData {
- private String time,
- 一体机A转速,
- 一体机A电流,
- 一体机A切刀转速,
- 一体机A切刀电流,
- 一体机A机头温度,
- 一体机A机头压力;
+
+ @Excel(name = "采集时间")
+ private String time;
+ @Excel(name = "一体机A转速")
+ private String 一体机A转速;
+ @Excel(name = "一体机A电流")
+ private String 一体机A电流;
+ @Excel(name = "切刀转速")
+ private String 一体机A切刀转速;
+ @Excel(name = "切刀电流")
+ private String 一体机A切刀电流;
+ @Excel(name = "机头温度")
+ private String 一体机A机头温度;
+ @Excel(name = "机头压力")
+ private String 一体机A机头压力;
public String getTime() {
return time;